diff --git a/_submodules/TypeScript b/_submodules/TypeScript index 050a6f8127..bf40cd8606 160000 --- a/_submodules/TypeScript +++ b/_submodules/TypeScript @@ -1 +1 @@ -Subproject commit 050a6f8127f54ce64c79ee992b9f0e27d0d712a2 +Subproject commit bf40cd86065cde495ec5333d61411668756bb159 diff --git a/internal/ast/ast.go b/internal/ast/ast.go index 2971ef562d..4c15abd4fe 100644 --- a/internal/ast/ast.go +++ b/internal/ast/ast.go @@ -2353,9 +2353,6 @@ func IsArrayLiteralOrObjectLiteralDestructuringPattern(node *Node) bool { func accessKind(node *Node) AccessKind { parent := node.Parent - if parent == nil { - return AccessKindRead - } switch parent.Kind { case KindParenthesizedExpression: return accessKind(parent) @@ -2407,9 +2404,8 @@ func accessKind(node *Node) AccessKind { return AccessKindWrite } return AccessKindRead - default: - return AccessKindRead } + return AccessKindRead } func reverseAccessKind(a AccessKind) AccessKind { diff --git a/internal/ast/utilities.go b/internal/ast/utilities.go index 7c9471b73a..f491127d22 100644 --- a/internal/ast/utilities.go +++ b/internal/ast/utilities.go @@ -571,7 +571,7 @@ func IsClassElement(node *Node) bool { return false } -func IsMethodOrAccessor(node *Node) bool { +func isMethodOrAccessor(node *Node) bool { switch node.Kind { case KindMethodDeclaration, KindGetAccessor, KindSetAccessor: return true @@ -580,7 +580,7 @@ func IsMethodOrAccessor(node *Node) bool { } func IsPrivateIdentifierClassElementDeclaration(node *Node) bool { - return (IsPropertyDeclaration(node) || IsMethodOrAccessor(node)) && IsPrivateIdentifier(node.Name()) + return (IsPropertyDeclaration(node) || isMethodOrAccessor(node)) && IsPrivateIdentifier(node.Name()) } func IsObjectLiteralOrClassExpressionMethodOrAccessor(node *Node) bool { diff --git a/internal/checker/checker.go b/internal/checker/checker.go index 4def9ddbc6..8c68eafb19 100644 --- a/internal/checker/checker.go +++ b/internal/checker/checker.go @@ -19101,9 +19101,11 @@ func (c *Checker) getSignaturesOfSymbol(symbol *ast.Symbol) []*Signature { } // If this is a function or method declaration, get the signature from the @type tag for the sake of optional parameters. // Exclude contextually-typed kinds because we already apply the @type tag to the context, plus applying it here to the initializer would suppress checks that the two are compatible. - if sig := c.getSignatureOfFullSignatureType(decl); sig != nil { - result = append(result, sig) - continue + if ast.IsFunctionExpressionOrArrowFunction(decl) || ast.IsObjectLiteralMethod(decl) { + if sig := c.getSignatureOfFullSignatureType(decl); sig != nil { + result = append(result, sig) + continue + } } result = append(result, c.getSignatureFromDeclaration(decl)) } @@ -19121,14 +19123,6 @@ func (c *Checker) getSignatureFromDeclaration(declaration *ast.Node) *Signature minArgumentCount := 0 hasThisParameter := false iife := ast.GetImmediatelyInvokedFunctionExpression(declaration) - isUntypedSignatureInJSFile := iife == nil && - ast.IsInJSFile(declaration) && - (ast.IsFunctionExpression(declaration) || ast.IsArrowFunction(declaration) || ast.IsMethodOrAccessor(declaration) || ast.IsFunctionDeclaration(declaration) || ast.IsConstructorDeclaration(declaration)) && - core.Every(declaration.Parameters(), func(param *ast.Node) bool { return param.Type() == nil }) && - c.getContextualType(declaration, ContextFlagsSignature) == nil - if isUntypedSignatureInJSFile { - flags |= SignatureFlagsIsUntypedSignatureInJSFile - } for i, param := range declaration.Parameters() { paramSymbol := param.Symbol() typeNode := param.Type() @@ -19349,7 +19343,7 @@ func (c *Checker) getReturnTypeFromAnnotation(declaration *ast.Node) *Type { } func (c *Checker) getSignatureOfFullSignatureType(node *ast.Node) *Signature { - if ast.IsInJSFile(node) && (ast.IsFunctionDeclaration(node) || ast.IsMethodDeclaration(node) || ast.IsFunctionExpressionOrArrowFunction(node)) && node.FunctionLikeData().FullSignature != nil { + if ast.IsInJSFile(node) && ast.IsFunctionLike(node) && node.FunctionLikeData().FullSignature != nil { return c.getSingleCallSignature(c.getTypeFromTypeNode(node.FunctionLikeData().FullSignature)) } return nil diff --git a/internal/checker/emitresolver.go b/internal/checker/emitresolver.go index 14d9ecd2bc..71c1a60955 100644 --- a/internal/checker/emitresolver.go +++ b/internal/checker/emitresolver.go @@ -458,20 +458,13 @@ func (r *emitResolver) IsImplementationOfOverload(node *ast.SignatureDeclaration // function foo(a: any) { // This is implementation of the overloads // return a; // } - if len(signaturesOfSymbol) > 1 { - return true - } - // If there is single signature for the symbol, it is overload if that signature isn't coming from the node - // e.g.: function foo(a: string): string; - // function foo(a: any) { // This is implementation of the overloads - // return a; - // } - if len(signaturesOfSymbol) == 1 { - declaration := signaturesOfSymbol[0].declaration - if declaration != node && declaration.Flags&ast.NodeFlagsJSDoc == 0 { - return true - } - } + return len(signaturesOfSymbol) > 1 || + // If there is single signature for the symbol, it is overload if that signature isn't coming from the node + // e.g.: function foo(a: string): string; + // function foo(a: any) { // This is implementation of the overloads + // return a; + // } + (len(signaturesOfSymbol) == 1 && signaturesOfSymbol[0].declaration != node) } return false } diff --git a/internal/core/compileroptions.go b/internal/core/compileroptions.go index aae6fed160..ab1936ca76 100644 --- a/internal/core/compileroptions.go +++ b/internal/core/compileroptions.go @@ -200,26 +200,30 @@ func (options *CompilerOptions) GetEmitScriptTarget() ScriptTarget { } func (options *CompilerOptions) GetEmitModuleKind() ModuleKind { - if options.Module != ModuleKindNone { + switch options.Module { + case ModuleKindNone, ModuleKindAMD, ModuleKindUMD, ModuleKindSystem: + if options.Target >= ScriptTargetES2015 { + return ModuleKindES2015 + } + return ModuleKindCommonJS + default: return options.Module } - if options.Target >= ScriptTargetES2015 { - return ModuleKindES2015 - } - return ModuleKindCommonJS } func (options *CompilerOptions) GetModuleResolutionKind() ModuleResolutionKind { - if options.ModuleResolution != ModuleResolutionKindUnknown { - return options.ModuleResolution - } - switch options.GetEmitModuleKind() { - case ModuleKindNode16, ModuleKindNode18, ModuleKindNode20: - return ModuleResolutionKindNode16 - case ModuleKindNodeNext: - return ModuleResolutionKindNodeNext + switch options.ModuleResolution { + case ModuleResolutionKindUnknown, ModuleResolutionKindClassic, ModuleResolutionKindNode10: + switch options.GetEmitModuleKind() { + case ModuleKindNode16, ModuleKindNode18, ModuleKindNode20: + return ModuleResolutionKindNode16 + case ModuleKindNodeNext: + return ModuleResolutionKindNodeNext + default: + return ModuleResolutionKindBundler + } default: - return ModuleResolutionKindBundler + return options.ModuleResolution } } @@ -251,24 +255,14 @@ func (options *CompilerOptions) AllowImportingTsExtensionsFrom(fileName string) return options.GetAllowImportingTsExtensions() || tspath.IsDeclarationFileName(fileName) } +// Deprecated: always returns true func (options *CompilerOptions) GetESModuleInterop() bool { - if options.ESModuleInterop != TSUnknown { - return options.ESModuleInterop == TSTrue - } - switch options.GetEmitModuleKind() { - case ModuleKindNode16, ModuleKindNode18, ModuleKindNode20, ModuleKindNodeNext, ModuleKindPreserve: - return true - } - return false + return true } +// Deprecated: always returns true func (options *CompilerOptions) GetAllowSyntheticDefaultImports() bool { - if options.AllowSyntheticDefaultImports != TSUnknown { - return options.AllowSyntheticDefaultImports == TSTrue - } - return options.GetESModuleInterop() || - options.GetEmitModuleKind() == ModuleKindSystem || - options.GetModuleResolutionKind() == ModuleResolutionKindBundler + return true } func (options *CompilerOptions) GetResolveJsonModule() bool { @@ -401,6 +395,7 @@ const ( type ModuleKind int32 const ( + // Deprecated: Do not use outside of options parsing and validation. ModuleKindNone ModuleKind = 0 ModuleKindCommonJS ModuleKind = 1 // Deprecated: Do not use outside of options parsing and validation. @@ -447,6 +442,10 @@ type ModuleResolutionKind int32 const ( ModuleResolutionKindUnknown ModuleResolutionKind = 0 + // Deprecated: Do not use outside of options parsing and validation. + ModuleResolutionKindClassic ModuleResolutionKind = 1 + // Deprecated: Do not use outside of options parsing and validation. + ModuleResolutionKindNode10 ModuleResolutionKind = 2 // Starting with node16, node's module resolver has significant departures from traditional cjs resolution // to better support ECMAScript modules and their use within node - however more features are still being added. // TypeScript's Node ESM support was introduced after Node 12 went end-of-life, and Node 14 is the earliest stable diff --git a/internal/diagnostics/diagnostics_generated.go b/internal/diagnostics/diagnostics_generated.go index c40232cb15..9c9757528d 100644 --- a/internal/diagnostics/diagnostics_generated.go +++ b/internal/diagnostics/diagnostics_generated.go @@ -2354,6 +2354,8 @@ var Option_moduleResolution_must_be_set_to_0_or_left_unspecified_when_option_mod var Option_module_must_be_set_to_0_when_option_moduleResolution_is_set_to_1 = &Message{code: 5110, category: CategoryError, key: "Option_module_must_be_set_to_0_when_option_moduleResolution_is_set_to_1_5110", text: "Option 'module' must be set to '{0}' when option 'moduleResolution' is set to '{1}'."} +var Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information = &Message{code: 5111, category: CategoryMessage, key: "Visit_https_Colon_Slash_Slashaka_ms_Slashts6_for_migration_information_5111", text: "Visit https://aka.ms/ts6 for migration information."} + var Generates_a_sourcemap_for_each_corresponding_d_ts_file = &Message{code: 6000, category: CategoryMessage, key: "Generates_a_sourcemap_for_each_corresponding_d_ts_file_6000", text: "Generates a sourcemap for each corresponding '.d.ts' file."} var Concatenate_and_emit_output_to_single_file = &Message{code: 6001, category: CategoryMessage, key: "Concatenate_and_emit_output_to_single_file_6001", text: "Concatenate and emit output to single file."} @@ -3732,7 +3734,7 @@ var Deferred_imports_are_only_supported_when_the_module_flag_is_set_to_esnext_or var X_0_is_not_a_valid_meta_property_for_keyword_import_Did_you_mean_meta_or_defer = &Message{code: 18061, category: CategoryError, key: "_0_is_not_a_valid_meta_property_for_keyword_import_Did_you_mean_meta_or_defer_18061", text: "'{0}' is not a valid meta-property for keyword 'import'. Did you mean 'meta' or 'defer'?"} -var X_module_AMD_or_UMD_or_System_or_ES6_then_Classic_Otherwise_Node = &Message{code: 69010, category: CategoryMessage, key: "module_AMD_or_UMD_or_System_or_ES6_then_Classic_Otherwise_Node_69010", text: "module === `AMD` or `UMD` or `System` or `ES6`, then `Classic`, Otherwise `Node`"} +var X_nodenext_if_module_is_nodenext_node16_if_module_is_node16_or_node18_otherwise_bundler = &Message{code: 69010, category: CategoryMessage, key: "nodenext_if_module_is_nodenext_node16_if_module_is_node16_or_node18_otherwise_bundler_69010", text: "`nodenext` if `module` is `nodenext`; `node16` if `module` is `node16` or `node18`; otherwise, `bundler`."} var File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module = &Message{code: 80001, category: CategorySuggestion, key: "File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module_80001", text: "File is a CommonJS module; it may be converted to an ES module."} diff --git a/internal/fourslash/_scripts/failingTests.txt b/internal/fourslash/_scripts/failingTests.txt index 3596e01173..f2ad135364 100644 --- a/internal/fourslash/_scripts/failingTests.txt +++ b/internal/fourslash/_scripts/failingTests.txt @@ -92,12 +92,10 @@ TestCompletionInJsDoc TestCompletionInUncheckedJSFile TestCompletionListBuilderLocations_VariableDeclarations TestCompletionListForDerivedType1 -TestCompletionListForTransitivelyExportedMembers04 TestCompletionListFunctionExpression TestCompletionListInArrowFunctionInUnclosedCallSite01 TestCompletionListInClassExpressionWithTypeParameter TestCompletionListInClassStaticBlocks -TestCompletionListInImportClause01 TestCompletionListInImportClause05 TestCompletionListInImportClause06 TestCompletionListInNamedClassExpression @@ -138,7 +136,6 @@ TestCompletionOfAwaitPromise6 TestCompletionOfAwaitPromise7 TestCompletionOfInterfaceAndVar TestCompletionPreferredSuggestions1 -TestCompletionPropertyShorthandForObjectLiteral5 TestCompletionWithConditionalOperatorMissingColon TestCompletionsAfterJSDoc TestCompletionsBeforeRestArg1 @@ -149,13 +146,12 @@ TestCompletionsClassMemberImportTypeNodeParameter4 TestCompletionsElementAccessNumeric TestCompletionsExportImport TestCompletionsGenericTypeWithMultipleBases1 -TestCompletionsImportBaseUrl TestCompletionsImportOrExportSpecifier TestCompletionsImport_default_alreadyExistedWithRename TestCompletionsImport_default_anonymous -TestCompletionsImport_default_didNotExistBefore -TestCompletionsImport_default_exportDefaultIdentifier +TestCompletionsImport_default_symbolName TestCompletionsImport_details_withMisspelledName +TestCompletionsImport_exportEquals TestCompletionsImport_exportEquals_anonymous TestCompletionsImport_exportEquals_global TestCompletionsImport_filteredByInvalidPackageJson_direct @@ -167,21 +163,18 @@ TestCompletionsImport_filteredByPackageJson_typesOnly TestCompletionsImport_importType TestCompletionsImport_jsxOpeningTagImportDefault TestCompletionsImport_mergedReExport -TestCompletionsImport_multipleWithSameName TestCompletionsImport_named_didNotExistBefore -TestCompletionsImport_named_exportEqualsNamespace TestCompletionsImport_named_namespaceImportExists TestCompletionsImport_noSemicolons -TestCompletionsImport_ofAlias_preferShortPath TestCompletionsImport_packageJsonImportsPreference TestCompletionsImport_quoteStyle -TestCompletionsImport_reExportDefault TestCompletionsImport_reExportDefault2 TestCompletionsImport_reExport_wrongName TestCompletionsImport_require_addToExisting TestCompletionsImport_typeOnly TestCompletionsImport_umdDefaultNoCrash1 TestCompletionsImport_uriStyleNodeCoreModules2 +TestCompletionsImport_weirdDefaultSynthesis TestCompletionsImport_windowsPathsProjectRelative TestCompletionsInExport TestCompletionsInExport_moduleBlock @@ -280,7 +273,6 @@ TestImportCompletions_importsMap3 TestImportCompletions_importsMap4 TestImportCompletions_importsMap5 TestImportNameCodeFixExportAsDefault -TestImportSuggestionsCache_exportUndefined TestImportTypeCompletions1 TestImportTypeCompletions3 TestImportTypeCompletions4 diff --git a/internal/fourslash/tests/documentHighlightReferenceDirective_test.go b/internal/fourslash/tests/documentHighlightReferenceDirective_test.go deleted file mode 100644 index c6ac898aa4..0000000000 --- a/internal/fourslash/tests/documentHighlightReferenceDirective_test.go +++ /dev/null @@ -1,24 +0,0 @@ -package fourslash_test - -import ( - "testing" - - "github.com/microsoft/typescript-go/internal/fourslash" - "github.com/microsoft/typescript-go/internal/testutil" -) - -func TestDocumentHighlightReferenceDirective(t *testing.T) { - t.Parallel() - - defer testutil.RecoverAndFail(t, "Panic on fourslash test") - const content = `// @Filename: /a.ts -/// - -const x = 1; - -// @filename: b.ts -export type Foo = number; -` - f := fourslash.NewFourslash(t, nil /*capabilities*/, content) - f.VerifyBaselineDocumentHighlights(t, nil /*preferences*/, f.Ranges()[0]) -} diff --git a/internal/fourslash/tests/gen/completionListForTransitivelyExportedMembers04_test.go b/internal/fourslash/tests/gen/completionListForTransitivelyExportedMembers04_test.go index 0061cd86a6..695a4b7f53 100644 --- a/internal/fourslash/tests/gen/completionListForTransitivelyExportedMembers04_test.go +++ b/internal/fourslash/tests/gen/completionListForTransitivelyExportedMembers04_test.go @@ -10,10 +10,9 @@ import ( func TestCompletionListForTransitivelyExportedMembers04(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") - const content = `// @ModuleResolution: classic -// @Filename: A.ts + const content = `// @Filename: A.ts export interface I1 { one: number } export interface I2 { two: string } export type I1_OR_I2 = I1 | I2; @@ -35,10 +34,10 @@ export module Inner { export var bVar = "bee!"; // @Filename: C.ts export var cVar = "see!"; -export * from "A"; -export * from "B" +export * from "./A"; +export * from "./B" // @Filename: D.ts -import * as c from "C"; +import * as c from "./C"; var x: c.Inner./**/` f := fourslash.NewFourslash(t, nil /*capabilities*/, content) f.VerifyCompletions(t, "", &fourslash.CompletionsExpectedList{ diff --git a/internal/fourslash/tests/gen/completionListInImportClause01_test.go b/internal/fourslash/tests/gen/completionListInImportClause01_test.go index baf14e33e1..a991772673 100644 --- a/internal/fourslash/tests/gen/completionListInImportClause01_test.go +++ b/internal/fourslash/tests/gen/completionListInImportClause01_test.go @@ -10,21 +10,20 @@ import ( func TestCompletionListInImportClause01(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") - const content = `// @ModuleResolution: classic -// @Filename: m1.ts + const content = `// @Filename: m1.ts export var foo: number = 1; export function bar() { return 10; } export function baz() { return 10; } // @Filename: m2.ts -import {/*1*/, /*2*/ from "m1" -import {/*3*/} from "m1" -import {foo,/*4*/ from "m1" -import {bar as /*5*/, /*6*/ from "m1" -import {foo, bar, baz as b,/*7*/} from "m1" -import { type /*8*/ } from "m1"; -import { type b/*9*/ } from "m1";` +import {/*1*/, /*2*/ from "./m1" +import {/*3*/} from "./m1" +import {foo,/*4*/ from "./m1" +import {bar as /*5*/, /*6*/ from "./m1" +import {foo, bar, baz as b,/*7*/} from "./m1" +import { type /*8*/ } from "./m1"; +import { type b/*9*/ } from "./m1";` f := fourslash.NewFourslash(t, nil /*capabilities*/, content) f.VerifyCompletions(t, []string{"8", "9"}, &fourslash.CompletionsExpectedList{ IsIncomplete: false, diff --git a/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral5_test.go b/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral5_test.go index ed5e08c7ff..be134f1c72 100644 --- a/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral5_test.go +++ b/internal/fourslash/tests/gen/completionPropertyShorthandForObjectLiteral5_test.go @@ -12,7 +12,7 @@ import ( func TestCompletionPropertyShorthandForObjectLiteral5(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: esnext // @Filename: /a.ts @@ -33,7 +33,7 @@ const obj = { exp/**/` Label: "exportedConstant", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/a", + ModuleSpecifier: "./a", }, })), AdditionalTextEdits: fourslash.AnyTextEdits, diff --git a/internal/fourslash/tests/gen/completionsImportBaseUrl_test.go b/internal/fourslash/tests/gen/completionsImportBaseUrl_test.go index e73fae4069..524919274b 100644 --- a/internal/fourslash/tests/gen/completionsImportBaseUrl_test.go +++ b/internal/fourslash/tests/gen/completionsImportBaseUrl_test.go @@ -12,7 +12,7 @@ import ( func TestCompletionsImportBaseUrl(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @Filename: /tsconfig.json { @@ -38,7 +38,7 @@ fo/**/` Label: "foo", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/src/a", + ModuleSpecifier: "./a", }, })), Detail: PtrTo("const foo: 0"), diff --git a/internal/fourslash/tests/gen/completionsImport_default_anonymous_test.go b/internal/fourslash/tests/gen/completionsImport_default_anonymous_test.go index fce12a0932..fc96c437da 100644 --- a/internal/fourslash/tests/gen/completionsImport_default_anonymous_test.go +++ b/internal/fourslash/tests/gen/completionsImport_default_anonymous_test.go @@ -46,7 +46,7 @@ fooB/*1*/` Label: "fooBar", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/src/foo-bar", + ModuleSpecifier: "./foo-bar", }, })), Detail: PtrTo("(property) default: 0"), @@ -59,7 +59,7 @@ fooB/*1*/` }) f.VerifyApplyCodeActionFromCompletion(t, PtrTo("1"), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "fooBar", - Source: "/src/foo-bar", + Source: "./foo-bar", Description: "Add import from \"./foo-bar\"", NewFileContent: PtrTo(`import fooBar from "./foo-bar" diff --git a/internal/fourslash/tests/gen/completionsImport_default_didNotExistBefore_test.go b/internal/fourslash/tests/gen/completionsImport_default_didNotExistBefore_test.go index 26576cab49..7e641a338e 100644 --- a/internal/fourslash/tests/gen/completionsImport_default_didNotExistBefore_test.go +++ b/internal/fourslash/tests/gen/completionsImport_default_didNotExistBefore_test.go @@ -12,7 +12,7 @@ import ( func TestCompletionsImport_default_didNotExistBefore(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: esnext // @Filename: /a.ts @@ -32,7 +32,7 @@ f/**/;` Label: "foo", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/a", + ModuleSpecifier: "./a", }, })), Detail: PtrTo("function foo(): void"), @@ -45,7 +45,7 @@ f/**/;` }) f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "foo", - Source: "/a", + Source: "./a", Description: "Add import from \"./a\"", NewFileContent: PtrTo(`import foo from "./a"; diff --git a/internal/fourslash/tests/gen/completionsImport_default_exportDefaultIdentifier_test.go b/internal/fourslash/tests/gen/completionsImport_default_exportDefaultIdentifier_test.go index ae41e12f86..8af15aaa3f 100644 --- a/internal/fourslash/tests/gen/completionsImport_default_exportDefaultIdentifier_test.go +++ b/internal/fourslash/tests/gen/completionsImport_default_exportDefaultIdentifier_test.go @@ -12,7 +12,7 @@ import ( func TestCompletionsImport_default_exportDefaultIdentifier(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: esnext // @Filename: /a.ts @@ -34,7 +34,7 @@ f/**/;` Label: "foo", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/a", + ModuleSpecifier: "./a", }, })), Detail: PtrTo("(alias) const foo: 0\nexport default foo"), @@ -47,7 +47,7 @@ f/**/;` }) f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "foo", - Source: "/a", + Source: "./a", Description: "Add import from \"./a\"", NewFileContent: PtrTo(`import foo from "./a"; diff --git a/internal/fourslash/tests/gen/completionsImport_default_symbolName_test.go b/internal/fourslash/tests/gen/completionsImport_default_symbolName_test.go index bae20c6a6d..4145b4d095 100644 --- a/internal/fourslash/tests/gen/completionsImport_default_symbolName_test.go +++ b/internal/fourslash/tests/gen/completionsImport_default_symbolName_test.go @@ -12,7 +12,7 @@ import ( func TestCompletionsImport_default_symbolName(t *testing.T) { t.Parallel() - + t.Skip() defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: commonjs // @esModuleInterop: false diff --git a/internal/fourslash/tests/gen/completionsImport_exportEquals_anonymous_test.go b/internal/fourslash/tests/gen/completionsImport_exportEquals_anonymous_test.go index f3b7805d04..40d012f3b6 100644 --- a/internal/fourslash/tests/gen/completionsImport_exportEquals_anonymous_test.go +++ b/internal/fourslash/tests/gen/completionsImport_exportEquals_anonymous_test.go @@ -60,7 +60,7 @@ fooB/*1*/` }, true), }, }) - f.VerifyApplyCodeActionFromCompletion(t, PtrTo("0"), &fourslash.ApplyCodeActionFromCompletionOptions{ + f.VerifyApplyCodeActionFromCompletion(t, PtrTo("1"), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "fooBar", Source: "./foo-bar", Description: "Add import from \"./foo-bar\"", diff --git a/internal/fourslash/tests/gen/completionsImport_exportEquals_test.go b/internal/fourslash/tests/gen/completionsImport_exportEquals_test.go index 5a1ef9edd0..071fb88853 100644 --- a/internal/fourslash/tests/gen/completionsImport_exportEquals_test.go +++ b/internal/fourslash/tests/gen/completionsImport_exportEquals_test.go @@ -12,7 +12,7 @@ import ( func TestCompletionsImport_exportEquals(t *testing.T) { t.Parallel() - + t.Skip() defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: commonjs // @esModuleInterop: false diff --git a/internal/fourslash/tests/gen/completionsImport_multipleWithSameName_test.go b/internal/fourslash/tests/gen/completionsImport_multipleWithSameName_test.go index 5d5285e010..f455288f50 100644 --- a/internal/fourslash/tests/gen/completionsImport_multipleWithSameName_test.go +++ b/internal/fourslash/tests/gen/completionsImport_multipleWithSameName_test.go @@ -12,7 +12,7 @@ import ( func TestCompletionsImport_multipleWithSameName(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: esnext // @noLib: true @@ -45,7 +45,7 @@ fo/**/` Label: "foo", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/a", + ModuleSpecifier: "./a", }, })), Detail: PtrTo("const foo: 0"), @@ -57,7 +57,7 @@ fo/**/` Label: "foo", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/b", + ModuleSpecifier: "./b", }, })), Detail: PtrTo("const foo: 1"), @@ -70,7 +70,7 @@ fo/**/` }) f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "foo", - Source: "/b", + Source: "./b", Description: "Add import from \"./b\"", NewFileContent: PtrTo(`import { foo } from "./b"; diff --git a/internal/fourslash/tests/gen/completionsImport_named_exportEqualsNamespace_test.go b/internal/fourslash/tests/gen/completionsImport_named_exportEqualsNamespace_test.go index 17317b5fe3..19df35a031 100644 --- a/internal/fourslash/tests/gen/completionsImport_named_exportEqualsNamespace_test.go +++ b/internal/fourslash/tests/gen/completionsImport_named_exportEqualsNamespace_test.go @@ -12,7 +12,7 @@ import ( func TestCompletionsImport_named_exportEqualsNamespace(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: esnext // @Filename: /a.d.ts @@ -35,7 +35,7 @@ f/**/;` Label: "foo", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/a", + ModuleSpecifier: "./a", }, })), Detail: PtrTo("const N.foo: 0"), @@ -48,7 +48,7 @@ f/**/;` }) f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "foo", - Source: "/a", + Source: "./a", Description: "Add import from \"./a\"", NewFileContent: PtrTo(`import { foo } from "./a"; diff --git a/internal/fourslash/tests/gen/completionsImport_ofAlias_preferShortPath_test.go b/internal/fourslash/tests/gen/completionsImport_ofAlias_preferShortPath_test.go index 3c6b93f2c4..008ee6d8c3 100644 --- a/internal/fourslash/tests/gen/completionsImport_ofAlias_preferShortPath_test.go +++ b/internal/fourslash/tests/gen/completionsImport_ofAlias_preferShortPath_test.go @@ -12,10 +12,9 @@ import ( func TestCompletionsImport_ofAlias_preferShortPath(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") - const content = `// @moduleResolution: node10 -// @module: commonJs + const content = `// @module: commonJs // @noLib: true // @Filename: /foo/index.ts export { foo } from "./lib/foo"; @@ -37,10 +36,10 @@ fo/**/` Label: "foo", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/foo/lib/foo", + ModuleSpecifier: "./foo", }, })), - Detail: PtrTo("const foo: 0"), + Detail: PtrTo("(alias) const foo: 0\nexport foo"), Kind: PtrTo(lsproto.CompletionItemKindVariable), AdditionalTextEdits: fourslash.AnyTextEdits, SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)), @@ -50,7 +49,7 @@ fo/**/` }) f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "foo", - Source: "/foo/lib/foo", + Source: "./foo", Description: "Add import from \"./foo\"", NewFileContent: PtrTo(`import { foo } from "./foo"; diff --git a/internal/fourslash/tests/gen/completionsImport_quoteStyle_test.go b/internal/fourslash/tests/gen/completionsImport_quoteStyle_test.go index 8be7bbd0e0..dd7412d400 100644 --- a/internal/fourslash/tests/gen/completionsImport_quoteStyle_test.go +++ b/internal/fourslash/tests/gen/completionsImport_quoteStyle_test.go @@ -21,7 +21,7 @@ fo/**/` f.GoToMarker(t, "") f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "foo", - Source: "/a", + Source: "./a", Description: "Add import from \"./a\"", NewFileContent: PtrTo(`import { foo } from './a'; diff --git a/internal/fourslash/tests/gen/completionsImport_reExportDefault_test.go b/internal/fourslash/tests/gen/completionsImport_reExportDefault_test.go index f6e4129652..97f460b0e1 100644 --- a/internal/fourslash/tests/gen/completionsImport_reExportDefault_test.go +++ b/internal/fourslash/tests/gen/completionsImport_reExportDefault_test.go @@ -12,10 +12,9 @@ import ( func TestCompletionsImport_reExportDefault(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: esnext -// @moduleResolution: node10 // @Filename: /a/b/impl.ts export default function foo() {} // @Filename: /a/index.ts @@ -36,11 +35,11 @@ fo/**/` Label: "foo", Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/a/b/impl", + ModuleSpecifier: "./a", }, })), - Detail: PtrTo("function foo(): void"), - Kind: PtrTo(lsproto.CompletionItemKindFunction), + Detail: PtrTo("(alias) function foo(): void\nexport foo"), + Kind: PtrTo(lsproto.CompletionItemKindVariable), AdditionalTextEdits: fourslash.AnyTextEdits, SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)), }, @@ -49,7 +48,7 @@ fo/**/` }) f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "foo", - Source: "/a/b/impl", + Source: "./a", Description: "Add import from \"./a\"", NewFileContent: PtrTo(`import { foo } from "./a"; diff --git a/internal/fourslash/tests/gen/completionsImport_weirdDefaultSynthesis_test.go b/internal/fourslash/tests/gen/completionsImport_weirdDefaultSynthesis_test.go index 5514308ba0..463ea288be 100644 --- a/internal/fourslash/tests/gen/completionsImport_weirdDefaultSynthesis_test.go +++ b/internal/fourslash/tests/gen/completionsImport_weirdDefaultSynthesis_test.go @@ -10,7 +10,7 @@ import ( func TestCompletionsImport_weirdDefaultSynthesis(t *testing.T) { t.Parallel() - + t.Skip() defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @module: commonjs // @esModuleInterop: false diff --git a/internal/fourslash/tests/gen/completionsUniqueSymbol_import_test.go b/internal/fourslash/tests/gen/completionsUniqueSymbol_import_test.go index acdd1674ab..cf8f74f548 100644 --- a/internal/fourslash/tests/gen/completionsUniqueSymbol_import_test.go +++ b/internal/fourslash/tests/gen/completionsUniqueSymbol_import_test.go @@ -45,7 +45,7 @@ i[|./**/|];` InsertText: PtrTo("[publicSym]"), Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/a", + ModuleSpecifier: "./a", }, })), SortText: PtrTo(string(ls.SortTextGlobalsOrKeywords)), @@ -62,7 +62,7 @@ i[|./**/|];` }) f.VerifyApplyCodeActionFromCompletion(t, PtrTo(""), &fourslash.ApplyCodeActionFromCompletionOptions{ Name: "publicSym", - Source: "/a", + Source: "./a", Description: "Update import from \"./a\"", NewFileContent: PtrTo(`import { i, publicSym } from "./a"; i.;`), diff --git a/internal/fourslash/tests/gen/importSuggestionsCache_exportUndefined_test.go b/internal/fourslash/tests/gen/importSuggestionsCache_exportUndefined_test.go index 33022ac27d..ede6bfef6d 100644 --- a/internal/fourslash/tests/gen/importSuggestionsCache_exportUndefined_test.go +++ b/internal/fourslash/tests/gen/importSuggestionsCache_exportUndefined_test.go @@ -12,7 +12,7 @@ import ( func TestImportSuggestionsCache_exportUndefined(t *testing.T) { t.Parallel() - t.Skip() + defer testutil.RecoverAndFail(t, "Panic on fourslash test") const content = `// @Filename: /home/src/workspaces/project/tsconfig.json { "compilerOptions": { "module": "esnext" } } @@ -39,7 +39,7 @@ export = x; SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)), Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/home/src/workspaces/project/undefinedAlias", + ModuleSpecifier: "./undefinedAlias", }, })), }, @@ -60,7 +60,7 @@ export = x; SortText: PtrTo(string(ls.SortTextAutoImportSuggestions)), Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ - ModuleSpecifier: "/home/src/workspaces/project/undefinedAlias", + ModuleSpecifier: "./undefinedAlias", }, })), }, diff --git a/internal/fourslash/tests/gen/importTypeCompletions7_test.go b/internal/fourslash/tests/gen/importTypeCompletions7_test.go index e927da63ff..1e2a29b9b5 100644 --- a/internal/fourslash/tests/gen/importTypeCompletions7_test.go +++ b/internal/fourslash/tests/gen/importTypeCompletions7_test.go @@ -33,7 +33,7 @@ export = Foo; Exact: []fourslash.CompletionsExpectedItem{ &lsproto.CompletionItem{ Label: "Foo", - InsertText: PtrTo("import * as Foo from \"./foo\";"), + InsertText: PtrTo("import Foo from \"./foo\";"), Data: PtrTo(any(&ls.CompletionItemData{ AutoImport: &ls.AutoImportData{ ModuleSpecifier: "./foo", diff --git a/internal/ls/documenthighlights.go b/internal/ls/documenthighlights.go index 65d7039666..bab0f63b61 100644 --- a/internal/ls/documenthighlights.go +++ b/internal/ls/documenthighlights.go @@ -56,13 +56,14 @@ func (l *LanguageService) getSemanticDocumentHighlights(ctx context.Context, pos if referenceEntries == nil { return nil } - var highlights []*lsproto.DocumentHighlight for _, entry := range referenceEntries { for _, ref := range entry.references { - fileName, highlight := l.toDocumentHighlight(ref) - if fileName == sourceFile.FileName() { - highlights = append(highlights, highlight) + if ref.node != nil { + fileName, highlight := l.toDocumentHighlight(ref) + if fileName == sourceFile.FileName() { + highlights = append(highlights, highlight) + } } } } diff --git a/internal/ls/findallreferences.go b/internal/ls/findallreferences.go index e5df1d9d9d..4b937d094e 100644 --- a/internal/ls/findallreferences.go +++ b/internal/ls/findallreferences.go @@ -625,7 +625,7 @@ func (l *LanguageService) getReferencedSymbolsForNode(ctx context.Context, posit } if moduleSymbol := checker.GetMergedSymbol(resolvedRef.file.Symbol); moduleSymbol != nil { - return l.getReferencedSymbolsForModule(ctx, program, moduleSymbol /*excludeImportTypeOfExportEquals*/, false, sourceFiles, sourceFilesSet) + return getReferencedSymbolsForModule(ctx, program, moduleSymbol /*excludeImportTypeOfExportEquals*/, false, sourceFiles, sourceFilesSet) } // !!! not implemented @@ -673,7 +673,7 @@ func (l *LanguageService) getReferencedSymbolsForNode(ctx context.Context, posit } if symbol.Name == ast.InternalSymbolNameExportEquals { - return l.getReferencedSymbolsForModule(ctx, program, symbol.Parent, false /*excludeImportTypeOfExportEquals*/, sourceFiles, sourceFilesSet) + return getReferencedSymbolsForModule(ctx, program, symbol.Parent, false /*excludeImportTypeOfExportEquals*/, sourceFiles, sourceFilesSet) } moduleReferences := l.getReferencedSymbolsForModuleIfDeclaredBySourceFile(ctx, symbol, program, sourceFiles, checker, options, sourceFilesSet) // !!! cancellationToken @@ -700,7 +700,7 @@ func (l *LanguageService) getReferencedSymbolsForModuleIfDeclaredBySourceFile(ct } exportEquals := symbol.Exports[ast.InternalSymbolNameExportEquals] // If exportEquals != nil, we're about to add references to `import("mod")` anyway, so don't double-count them. - moduleReferences := l.getReferencedSymbolsForModule(ctx, program, symbol, exportEquals != nil, sourceFiles, sourceFilesSet) + moduleReferences := getReferencedSymbolsForModule(ctx, program, symbol, exportEquals != nil, sourceFiles, sourceFilesSet) if exportEquals == nil || !sourceFilesSet.Has(moduleSourceFileName) { return moduleReferences } @@ -1021,7 +1021,7 @@ func getMergedAliasedSymbolOfNamespaceExportDeclaration(node *ast.Node, symbol * return nil } -func (l *LanguageService) getReferencedSymbolsForModule(ctx context.Context, program *compiler.Program, symbol *ast.Symbol, excludeImportTypeOfExportEquals bool, sourceFiles []*ast.SourceFile, sourceFilesSet *collections.Set[string]) []*SymbolAndEntries { +func getReferencedSymbolsForModule(ctx context.Context, program *compiler.Program, symbol *ast.Symbol, excludeImportTypeOfExportEquals bool, sourceFiles []*ast.SourceFile, sourceFilesSet *collections.Set[string]) []*SymbolAndEntries { debug.Assert(symbol.ValueDeclaration != nil) checker, done := program.GetTypeChecker(ctx) @@ -1062,11 +1062,10 @@ func (l *LanguageService) getReferencedSymbolsForModule(ctx context.Context, pro } return newNodeEntry(rangeNode) case ModuleReferenceKindReference: - return &referenceEntry{ - kind: entryKindRange, - fileName: reference.referencingFile.FileName(), - textRange: l.createLspRangeFromBounds(reference.ref.Pos(), reference.ref.End(), reference.referencingFile), - } + // or + // We can't easily create a proper range entry here without access to LanguageService, + // but we can create a node-based entry pointing to the source file which will be resolved later + return newNodeEntry(reference.referencingFile.AsNode()) } return nil }) diff --git a/internal/module/resolver.go b/internal/module/resolver.go index 7f83beb76d..1130604759 100644 --- a/internal/module/resolver.go +++ b/internal/module/resolver.go @@ -231,9 +231,8 @@ func (r *Resolver) ResolveModuleName(moduleName string, containingFile string, r } containingDirectory := tspath.GetDirectoryPath(containingFile) - moduleResolution := compilerOptions.ModuleResolution - if moduleResolution == core.ModuleResolutionKindUnknown { - moduleResolution = compilerOptions.GetModuleResolutionKind() + moduleResolution := compilerOptions.GetModuleResolutionKind() + if compilerOptions.ModuleResolution != moduleResolution { if traceBuilder != nil { traceBuilder.write(diagnostics.Module_resolution_kind_is_not_specified_using_0.Format(moduleResolution.String())) } diff --git a/internal/testrunner/compiler_runner.go b/internal/testrunner/compiler_runner.go index 35eac30102..06f9f10038 100644 --- a/internal/testrunner/compiler_runner.go +++ b/internal/testrunner/compiler_runner.go @@ -182,9 +182,25 @@ func (r *CompilerBaselineRunner) runSingleConfigTest(t *testing.T, testName stri payload := makeUnitsFromTest(test.content, test.filename) compilerTest := newCompilerTest(t, testName, test.filename, &payload, config) - switch compilerTest.options.GetEmitModuleKind() { + switch compilerTest.options.Module { case core.ModuleKindAMD, core.ModuleKindUMD, core.ModuleKindSystem: - t.Skipf("Skipping test %s with unsupported module kind %s", testName, compilerTest.options.GetEmitModuleKind()) + t.Skipf("Skipping test %s with unsupported module kind %s", testName, compilerTest.options.Module) + } + switch compilerTest.options.ModuleResolution { + case core.ModuleResolutionKindNode10, core.ModuleResolutionKindClassic: + t.Skipf("Skipping test %s with unsupported module resolution kind %d", testName, compilerTest.options.ModuleResolution) + } + if compilerTest.options.ESModuleInterop.IsFalse() { + t.Skipf("Skipping test %s with esModuleInterop=false", testName) + } + if compilerTest.options.AllowSyntheticDefaultImports.IsFalse() { + t.Skipf("Skipping test %s with allowSyntheticDefaultImports=false", testName) + } + if compilerTest.options.BaseUrl != "" { + t.Skipf("Skipping test %s with baseUrl set", testName) + } + if compilerTest.options.OutFile != "" { + t.Skipf("Skipping test %s with outFile set", testName) } compilerTest.verifyDiagnostics(t, r.testSuitName, r.isSubmodule) diff --git a/internal/transformers/moduletransforms/commonjsmodule_test.go b/internal/transformers/moduletransforms/commonjsmodule_test.go deleted file mode 100644 index de4de7dc45..0000000000 --- a/internal/transformers/moduletransforms/commonjsmodule_test.go +++ /dev/null @@ -1,1057 +0,0 @@ -package moduletransforms_test - -import ( - "testing" - - "github.com/microsoft/typescript-go/internal/ast" - "github.com/microsoft/typescript-go/internal/binder" - "github.com/microsoft/typescript-go/internal/core" - "github.com/microsoft/typescript-go/internal/printer" - "github.com/microsoft/typescript-go/internal/testutil/emittestutil" - "github.com/microsoft/typescript-go/internal/testutil/parsetestutil" - "github.com/microsoft/typescript-go/internal/transformers" - "github.com/microsoft/typescript-go/internal/transformers/moduletransforms" - "github.com/microsoft/typescript-go/internal/transformers/tstransforms" -) - -func fakeGetEmitModuleFormatOfFile(file ast.HasFileName) core.ModuleKind { - return core.ModuleKindNone -} - -func TestCommonJSModuleTransformer(t *testing.T) { - t.Parallel() - data := []struct { - title string - input string - output string - other string - jsx bool - options *core.CompilerOptions - }{ - // ImportDeclaration - { - title: "ImportDeclaration#1", - input: `import "other"`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -require("other");`, - }, - { - title: "ImportDeclaration#2", - input: `import * as a from "other"`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const a = require("other");`, - }, - { - title: "ImportDeclaration#3", - input: `import { a } from "other"`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const other_1 = require("other");`, - }, - { - title: "ImportDeclaration#4", - input: `import a from "other"`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const other_1 = require("other");`, - }, - { - title: "ImportDeclaration#5", - input: `import a, * as b from "other"`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const other_1 = require("other"), b = other_1;`, - }, - { - title: "ImportDeclaration#6", - input: `import { a } from "other" -export { a }`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -const other_1 = require("other"); -Object.defineProperty(exports, "a", { enumerable: true, get: function () { return other_1.a; } });`, - }, - { - title: "ImportDeclaration#7", - input: `import * as a from "other"`, - output: `"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || (function () { - var ownKeys = function(o) { - ownKeys = Object.getOwnPropertyNames || function (o) { - var ar = []; - for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; - return ar; - }; - return ownKeys(o); - }; - return function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); - __setModuleDefault(result, mod); - return result; - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -const a = __importStar(require("other"));`, - options: &core.CompilerOptions{ESModuleInterop: core.TSTrue}, - }, - { - title: "ImportDeclaration#8", - input: `import * as a from "other"`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const tslib_1 = require("tslib"); -const a = tslib_1.__importStar(require("other"));`, - options: &core.CompilerOptions{ESModuleInterop: core.TSTrue, ImportHelpers: core.TSTrue}, - }, - - // ImportEqualsDeclaration - { - title: "ImportEqualsDeclaration#1", - input: `import a = require("other");`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const a = require("other");`, - }, - { - title: "ImportEqualsDeclaration#2", - input: `export import a = require("other");`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = require("other");`, - }, - - // ExportDeclaration - { - title: "ExportDeclaration#1", - input: `export { a } from "other";`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -const other_1 = require("other"); -Object.defineProperty(exports, "a", { enumerable: true, get: function () { return other_1.a; } });`, - }, - { - title: "ExportDeclaration#2", - input: `export * as a from "other";`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -exports.a = require("other");`, - }, - { - title: "ExportDeclaration#3", - input: `export * from "other";`, - output: `"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -__exportStar(require("other"), exports);`, - }, - { - title: "ExportDeclaration#4", - input: `export * as a from "other"`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -const tslib_1 = require("tslib"); -exports.a = tslib_1.__importStar(require("other"));`, - options: &core.CompilerOptions{ESModuleInterop: core.TSTrue, ImportHelpers: core.TSTrue}, - }, - { - title: "ExportDeclaration#5", - input: `export * from "other"`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const tslib_1 = require("tslib"); -tslib_1.__exportStar(require("other"), exports);`, - options: &core.CompilerOptions{ESModuleInterop: core.TSTrue, ImportHelpers: core.TSTrue}, - }, - - // ExportAssignment - { - title: "ExportAssignment#1", - input: `var a = 0; -export default a;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var a = 0; -exports.default = a;`, - }, - { - title: "ExportAssignment#2", - input: `var a = 0; -export = a;`, - output: `"use strict"; -var a = 0; -module.exports = a;`, - }, - - // FunctionDeclaration - { - title: "FunctionDeclaration#1", - input: `export function f() {}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.f = f; -function f() { }`, - }, - { - title: "FunctionDeclaration#2", - input: `export default function f() {}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = f; -function f() { }`, - }, - { - title: "FunctionDeclaration#3", - input: `export default function () {}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = default_1; -function default_1() { }`, - }, - { - title: "FunctionDeclaration#4", - input: `function f() {} -export { f };`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.f = f; -function f() { }`, - }, - - // ClassDeclaration - { - title: "ClassDeclaration#1", - input: `export class C {}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.C = void 0; -class C { -} -exports.C = C;`, - }, - { - title: "ClassDeclaration#2", - input: `export default class C {}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class C { -} -exports.default = C;`, - }, - { - title: "ClassDeclaration#3", - input: `export default class {}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class default_1 { -} -exports.default = default_1;`, - }, - { - title: "ClassDeclaration#4", - input: `class C {} -export { C };`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.C = void 0; -class C { -} -exports.C = C;`, - }, - - // VariableStatement - { - title: "VariableStatement#1", - input: `export var x = y;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -exports.x = y;`, - }, - { - title: "VariableStatement#2", - input: `export var { x } = y;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -({ x: exports.x } = y);`, - }, - { - title: "VariableStatement#3", - input: `export var [x] = y;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -[exports.x] = y;`, - }, - { - title: "VariableStatement#4", - input: `var x; -export { x }; -x || (x = 1);`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -x || (exports.x = x = 1);`, - }, - { - title: "VariableStatement#5 (from enum)", - input: `export enum E { A }`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.E = void 0; -var E; -(function (E) { - E[E["A"] = 0] = "A"; -})(E || (exports.E = E = {}));`, - }, - - // ForStatement - { - title: "ForStatement#1", - input: `export { x }; -for (var x = 0; ; ) ;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x = 0; -exports.x = x; -for (;;) - ;`, - }, - - // ForInStatement - { - title: "ForInStatement#1", - input: `export { x }; -for (var x in {});`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -for (var x in {}) { - exports.x = x; - ; -}`, - }, - - // ForOfStatement - { - title: "ForOfStatement#1", - input: `export { x }; -for (var x of {});`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -for (var x of {}) { - exports.x = x; - ; -}`, - }, - - // DoStatement - { - title: "DoStatement#1", - input: `export { x }; -do { - var x = 0; -} while (false);`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -do { - var x = 0; - exports.x = x; -} while (false);`, - }, - - // WhileStatement - { - title: "WhileStatement#1", - input: `export { x }; -while (true) { - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -while (true) { - var x = 0; - exports.x = x; -}`, - }, - - // LabeledStatement - { - title: "LabeledStatement#1", - input: `export { x }; -label: { - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -label: { - var x = 0; - exports.x = x; -}`, - }, - - // WithStatement - { - title: "WithStatement#1", - input: `export { x }; -with ({}) { - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -with ({}) { - var x = 0; - exports.x = x; -}`, - }, - - // IfStatement - { - title: "IfStatement#1", - input: `export { x }; -if (y) { - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -if (y) { - var x = 0; - exports.x = x; -}`, - }, - { - title: "IfStatement#2", - input: `export { x }; -if (y) { -} -else { - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -if (y) { -} -else { - var x = 0; - exports.x = x; -}`, - }, - - // SwitchStatement - { - title: "SwitchStatement#1", - input: `export { x }; -switch (y) { - case 0: - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -switch (y) { - case 0: - var x = 0; - exports.x = x; -}`, - }, - { - title: "SwitchStatement#2", - input: `export { x }; -switch (y) { - default: - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -switch (y) { - default: - var x = 0; - exports.x = x; -}`, - }, - - // TryStatement - { - title: "TryStatement#1", - input: `export { x }; -try { - var x = 0; -} -catch { -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -try { - var x = 0; - exports.x = x; -} -catch { -}`, - }, - { - title: "TryStatement#2", - input: `export { x }; -try { -} -catch { - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -try { -} -catch { - var x = 0; - exports.x = x; -}`, - }, - { - title: "TryStatement#3", - input: `export { x }; -try { -} -finally { - var x = 0; -}`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -try { -} -finally { - var x = 0; - exports.x = x; -}`, - }, - - // DestructuringAssignment - { - title: "DestructuringAssignment#1", - input: `var x; -export { x }; -({ x: x } = {});`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -({ x: { set value(value) { exports.x = x = value; } }.value } = {});`, - }, - { - title: "DestructuringAssignment#2", - input: `var x; -export { x }; -({ x: x = 1 } = {});`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -({ x: { set value(value) { exports.x = x = value; } }.value = 1 } = {});`, - }, - { - title: "DestructuringAssignment#3", - input: `var x; -export { x }; -({ x } = {});`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -({ x: { set value(value) { exports.x = x = value; } }.value } = {});`, - }, - { - title: "DestructuringAssignment#4", - input: `var x; -export { x }; -({ x = 1 } = {});`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -({ x: { set value(value) { exports.x = x = value; } }.value = 1 } = {});`, - }, - { - title: "DestructuringAssignment#5", - input: `var x; -export { x }; -({ ...x } = {});`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -({ ...{ set value(value) { exports.x = x = value; } }.value } = {});`, - }, - { - title: "DestructuringAssignment#6", - input: `var x; -export { x }; -[x] = [];`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -[{ set value(value) { exports.x = x = value; } }.value] = [];`, - }, - { - title: "DestructuringAssignment#7", - input: `var x; -export { x }; -[x = 1] = [];`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -[{ set value(value) { exports.x = x = value; } }.value = 1] = [];`, - }, - { - title: "DestructuringAssignment#8", - input: `var x; -export { x }; -[...x] = [];`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -[...{ set value(value) { exports.x = x = value; } }.value] = [];`, - }, - { - title: "DestructuringAssignment#9", - input: `var x; -export { x }; -[{ x: x }] = [];`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -var x; -[{ x: { set value(value) { exports.x = x = value; } }.value }] = [];`, - }, - - // AssignmentExpression - { - title: "AssignmentExpression#1", - input: `export var a; -a = 1;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -exports.a = 1;`, - }, - { - title: "AssignmentExpression#2", - input: `var a; -export { a }; -a = 1;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -var a; -exports.a = a = 1;`, - }, - { - title: "AssignmentExpression#3", - input: `var a; -export { a, a as b }; -a = 1;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.b = exports.a = void 0; -var a; -exports.b = exports.a = a = 1;`, - }, - - // PrefixUnaryExpression - { - title: "PrefixUnaryExpression#1", - input: `export var a = 0; -++a;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -exports.a = 0; -++exports.a;`, - }, - { - title: "PrefixUnaryExpression#2", - input: `var a = 0; -export { a } -++a;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -var a = 0; -exports.a = a; -exports.a = ++a;`, - }, - - // PostfixUnaryExpression - { - title: "PostfixUnaryExpression#1", - input: `export var a = 0; -a++;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -exports.a = 0; -exports.a++;`, - }, - { - title: "PostfixUnaryExpression#2", - input: `var a = 0; -export { a } -a++;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -var a = 0; -exports.a = a; -exports.a = (a++, a);`, - }, - { - title: "PostfixUnaryExpression#3", - input: `var a = 0, b; -export { a } -b = a++;`, - output: `"use strict"; -var _a; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -var a = 0, b; -exports.a = a; -b = (exports.a = (_a = a++, a), _a);`, - }, - { - title: "PostfixUnaryExpression#4", - input: `var a = 0; -export { a } -(a++);`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -var a = 0; -exports.a = a; -(exports.a = (a++, a));`, - }, - { - title: "PostfixUnaryExpression#5", - input: `var a = 0; -export { a } -a++, 0;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -var a = 0; -exports.a = a; -exports.a = (a++, a), 0;`, - }, - { - title: "PostfixUnaryExpression#6", - input: `var a = 0, b; -export { a } -b = (a++, 0);`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -var a = 0, b; -exports.a = a; -b = (exports.a = (a++, a), 0);`, - }, - { - title: "PostfixUnaryExpression#7", - input: `var a = 0, b; -export { a } -b = (0, a++);`, - output: `"use strict"; -var _a; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -var a = 0, b; -exports.a = a; -b = (0, exports.a = (_a = a++, a), _a);`, - }, - - // ShortHandPropertyAssignment - { - title: "ShorthandPropertyAssignment#1", - input: `import { a } from "other" -({ a })`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const other_1 = require("other"); -({ a: other_1.a });`, - }, - { - title: "ShorthandPropertyAssignment#2", - input: `import { a } from "other" -({ - a, -})`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const other_1 = require("other"); -({ - a: other_1.a, -});`, - }, - - // CallExpression - { - title: "CallExpression#1", - input: `import { a } from "other" -a()`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const other_1 = require("other"); -(0, other_1.a)();`, - }, - { - title: "CallExpression#2", - input: `export var a = (0, function() {}); -a()`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -exports.a = (0, function () { }); -(0, exports.a)();`, - }, - { - title: "CallExpression#3", - input: `export{}; -import("./other.ts");`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -Promise.resolve().then(() => require("./other.js"));`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "CallExpression#4", - input: `export{}; -import(x);`, - output: `"use strict"; -var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) { - if (typeof path === "string" && /^\.\.?\//.test(path)) { - return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) { - return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js"); - }); - } - return path; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -Promise.resolve(` + "`" + `${__rewriteRelativeImportExtension(x)}` + "`" + `).then(s => require(s));`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "CallExpression#5", - input: `export{}; -import(x);`, - output: `"use strict"; -var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) { - if (typeof path === "string" && /^\.\.?\//.test(path)) { - return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) { - return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js"); - }); - } - return path; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -Promise.resolve(` + "`" + `${__rewriteRelativeImportExtension(x, true)}` + "`" + `).then(s => require(s));`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue, Jsx: core.JsxEmitPreserve}, - }, - { - title: "CallExpression#6", - input: `export{}; -import(x);`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const tslib_1 = require("tslib"); -Promise.resolve(` + "`" + `${tslib_1.__rewriteRelativeImportExtension(x)}` + "`" + `).then(s => require(s));`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue, ImportHelpers: core.TSTrue}, - }, - { - title: "CallExpression#7", - input: `export {}; -a?.()`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -a?.();`, - }, - - // TaggedTemplateExpression - { - title: "TaggedTemplateExpression#1", - input: "import { a } from \"other\"\n" + - "a``", - output: "\"use strict\";\n" + - "Object.defineProperty(exports, \"__esModule\", { value: true });\n" + - "const other_1 = require(\"other\");\n" + - "(0, other_1.a) ``;", - }, - { - title: "TaggedTemplateExpression#1", - input: "export var a = (0, function() {});" + - "a``", - output: "\"use strict\";\n" + - "Object.defineProperty(exports, \"__esModule\", { value: true });\n" + - "exports.a = void 0;\n" + - "exports.a = (0, function () { });\n" + - "(0, exports.a) ``;", - }, - - // Identifier - { - title: "Identifier#1", - input: `import { a } from "other" -a;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const other_1 = require("other"); -other_1.a;`, - }, - { - title: "Identifier#2", - input: `export var a = 0; -a;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -exports.a = 0; -exports.a;`, - }, - { - title: "Identifier#3 (from enum)", - input: `export enum E { A } -E.A`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.E = void 0; -var E; -(function (E) { - E[E["A"] = 0] = "A"; -})(E || (exports.E = E = {})); -E.A;`, - }, - { - title: "Identifier#4 (preserve location)", - input: `import { a } from "other"; -x || - a`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const other_1 = require("other"); -x || - other_1.a;`, - }, - { - title: "Identifier#5 (from import specifier)", - input: `import { and } from "./_namespaces/ts.js"; -const isNotOverloadAndNotAccessor = and(isNotOverload, isNotAccessor); -`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const ts_js_1 = require("./_namespaces/ts.js"); -const isNotOverloadAndNotAccessor = (0, ts_js_1.and)(isNotOverload, isNotAccessor);`, - }, - - { - title: "Identifier#6 (in template literal)", - input: `export var x = 1; -` + "`" + `${x}` + "`" + `;`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -exports.x = 1; -` + "`" + `${exports.x}` + "`" + `;`, - }, - - { - title: "Other", - input: `export const a = class { - p = 10; -};`, - output: `"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -const a = class { - p = 10; -}; -exports.a = a;`, - }, - } - for _, rec := range data { - t.Run(rec.title, func(t *testing.T) { - t.Parallel() - - compilerOptions := rec.options - if compilerOptions == nil { - compilerOptions = &core.CompilerOptions{} - } - - compilerOptions.Module = core.ModuleKindCommonJS - - file := parsetestutil.ParseTypeScript(rec.input, rec.jsx) - parsetestutil.CheckDiagnostics(t, file) - binder.BindSourceFile(file) - - var other *ast.SourceFile - if len(rec.other) > 0 { - other = parsetestutil.ParseTypeScript(rec.other, rec.jsx) - parsetestutil.CheckDiagnostics(t, other) - binder.BindSourceFile(other) - } - - emitContext := printer.NewEmitContext() - resolver := binder.NewReferenceResolver(compilerOptions, binder.ReferenceResolverHooks{}) - opts := transformers.TransformOptions{CompilerOptions: compilerOptions, Context: emitContext, Resolver: resolver, GetEmitModuleFormatOfFile: fakeGetEmitModuleFormatOfFile} - file = tstransforms.NewRuntimeSyntaxTransformer(&opts).TransformSourceFile(file) - file = moduletransforms.NewCommonJSModuleTransformer(&opts).TransformSourceFile(file) - emittestutil.CheckEmit(t, emitContext, file, rec.output) - }) - } -} diff --git a/internal/transformers/moduletransforms/esmodule_test.go b/internal/transformers/moduletransforms/esmodule_test.go deleted file mode 100644 index a9be38f3c2..0000000000 --- a/internal/transformers/moduletransforms/esmodule_test.go +++ /dev/null @@ -1,249 +0,0 @@ -package moduletransforms_test - -import ( - "testing" - - "github.com/microsoft/typescript-go/internal/ast" - "github.com/microsoft/typescript-go/internal/binder" - "github.com/microsoft/typescript-go/internal/core" - "github.com/microsoft/typescript-go/internal/printer" - "github.com/microsoft/typescript-go/internal/testutil/emittestutil" - "github.com/microsoft/typescript-go/internal/testutil/parsetestutil" - "github.com/microsoft/typescript-go/internal/transformers" - "github.com/microsoft/typescript-go/internal/transformers/moduletransforms" - "github.com/microsoft/typescript-go/internal/transformers/tstransforms" -) - -func TestESModuleTransformer(t *testing.T) { - t.Parallel() - data := []struct { - title string - input string - output string - other string - jsx bool - options *core.CompilerOptions - }{ - // ImportDeclaration - { - title: "ImportDeclaration#1", - input: `import "other"`, - output: `import "other";`, - }, - { - title: "ImportDeclaration#2", - input: `import "./other.ts"`, - output: `import "./other.js";`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "ImportDeclaration#3", - input: `import "./other.tsx"`, - output: `import "./other.js";`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "ImportDeclaration#4", - input: `import "./other.tsx"`, - output: `import "./other.jsx";`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue, Jsx: core.JsxEmitPreserve}, - }, - - // ImportEqualsDeclaration - { - title: "ImportEqualsDeclaration#1", - input: `import x = require("other")`, - output: `export {};`, - }, - { - title: "ImportEqualsDeclaration#2", - input: `import x = require("other")`, - output: `import { createRequire as _createRequire } from "module"; -const __require = _createRequire(import.meta.url); -const x = __require("other");`, - options: &core.CompilerOptions{Module: core.ModuleKindNode16}, - }, - { - title: "ImportEqualsDeclaration#3", - input: `import x = require("./other.ts")`, - output: `import { createRequire as _createRequire } from "module"; -const __require = _createRequire(import.meta.url); -const x = __require("./other.js");`, - options: &core.CompilerOptions{Module: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "ImportEqualsDeclaration#4", - input: `import x = require("./other.tsx")`, - output: `import { createRequire as _createRequire } from "module"; -const __require = _createRequire(import.meta.url); -const x = __require("./other.js");`, - options: &core.CompilerOptions{Module: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "ImportEqualsDeclaration#5", - input: `import x = require("./other.tsx")`, - output: `import { createRequire as _createRequire } from "module"; -const __require = _createRequire(import.meta.url); -const x = __require("./other.jsx");`, - options: &core.CompilerOptions{Module: core.ModuleKindNode16, RewriteRelativeImportExtensions: core.TSTrue, Jsx: core.JsxEmitPreserve}, - }, - { - title: "ImportEqualsDeclaration#6", - input: `export import x = require("other")`, - output: `import { createRequire as _createRequire } from "module"; -const __require = _createRequire(import.meta.url); -const x = __require("other"); -export { x };`, - options: &core.CompilerOptions{Module: core.ModuleKindNode16}, - }, - - // ExportAssignment - { - title: "ExportAssignment#1", - input: `export = x`, - output: `export {};`, - }, - { - title: "ExportAssignment#2", - input: `export = x`, - output: `module.exports = x;`, - options: &core.CompilerOptions{Module: core.ModuleKindPreserve}, - }, - - // ExportDeclaration - { - title: "ExportDeclaration#1", - input: `export * from "other";`, - output: `export * from "other";`, - }, - { - title: "ExportDeclaration#2", - input: `export * from "./other.ts";`, - output: `export * from "./other.js";`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "ExportDeclaration#3", - input: `export * as x from "other";`, - output: `export * as x from "other";`, - options: &core.CompilerOptions{Module: core.ModuleKindESNext}, - }, - { - title: "ExportDeclaration#4", - input: `export { x } from "other";`, - output: `export { x } from "other";`, - }, - { - title: "ExportDeclaration#5", - input: `export * as x from "other";`, - output: `import * as x_1 from "other"; -export { x_1 as x };`, - }, - { - title: "ExportDeclaration#6", - input: `export * as default from "other";`, - output: `import * as default_1 from "other"; -export default default_1;`, - }, - - // CallExpression - { - title: "CallExpression#1", - input: `import("other");`, - output: `import("other");`, - }, - { - title: "CallExpression#2", - input: `import(x);`, - output: `import(x);`, - }, - { - title: "CallExpression#3", - input: `export {}; -import("./other.ts");`, - output: `export {}; -import("./other.js");`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "CallExpression#4", - input: `export {}; -import(x);`, - output: `var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) { - if (typeof path === "string" && /^\.\.?\//.test(path)) { - return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) { - return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js"); - }); - } - return path; -}; -export {}; -import(__rewriteRelativeImportExtension(x));`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue}, - }, - { - title: "CallExpression#5", - input: `export {}; -import(x);`, - output: `var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) { - if (typeof path === "string" && /^\.\.?\//.test(path)) { - return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) { - return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js"); - }); - } - return path; -}; -export {}; -import(__rewriteRelativeImportExtension(x, true));`, - options: &core.CompilerOptions{RewriteRelativeImportExtensions: core.TSTrue, Jsx: core.JsxEmitPreserve}, - }, - { - title: "CallExpression#6", - input: `export {}; -import(x);`, - output: `import { __rewriteRelativeImportExtension } from "tslib"; -export {}; -import(__rewriteRelativeImportExtension(x));`, - options: &core.CompilerOptions{Module: core.ModuleKindESNext, RewriteRelativeImportExtensions: core.TSTrue, ImportHelpers: core.TSTrue}, - }, - { - title: "CallExpression#7", - input: `export {}; -import(x); -var __rewriteRelativeImportExtension;`, - output: `import { __rewriteRelativeImportExtension as __rewriteRelativeImportExtension_1 } from "tslib"; -export {}; -import(__rewriteRelativeImportExtension_1(x)); -var __rewriteRelativeImportExtension;`, - options: &core.CompilerOptions{Module: core.ModuleKindESNext, RewriteRelativeImportExtensions: core.TSTrue, ImportHelpers: core.TSTrue}, - }, - } - for _, rec := range data { - t.Run(rec.title, func(t *testing.T) { - t.Parallel() - - compilerOptions := rec.options - if compilerOptions == nil { - compilerOptions = &core.CompilerOptions{} - } - - file := parsetestutil.ParseTypeScript(rec.input, rec.jsx) - parsetestutil.CheckDiagnostics(t, file) - binder.BindSourceFile(file) - - var other *ast.SourceFile - if len(rec.other) > 0 { - other = parsetestutil.ParseTypeScript(rec.other, rec.jsx) - parsetestutil.CheckDiagnostics(t, other) - binder.BindSourceFile(other) - } - - emitContext := printer.NewEmitContext() - resolver := binder.NewReferenceResolver(compilerOptions, binder.ReferenceResolverHooks{}) - opts := transformers.TransformOptions{CompilerOptions: compilerOptions, Context: emitContext, Resolver: resolver, GetEmitModuleFormatOfFile: fakeGetEmitModuleFormatOfFile} - file = tstransforms.NewRuntimeSyntaxTransformer(&opts).TransformSourceFile(file) - file = moduletransforms.NewESModuleTransformer(&opts).TransformSourceFile(file) - emittestutil.CheckEmit(t, emitContext, file, rec.output) - }) - } -} diff --git a/internal/tsoptions/declscompiler.go b/internal/tsoptions/declscompiler.go index ec730ea048..2161f77343 100644 --- a/internal/tsoptions/declscompiler.go +++ b/internal/tsoptions/declscompiler.go @@ -699,7 +699,7 @@ var optionsForCompiler = []*CommandLineOption{ AffectsModuleResolution: true, Category: diagnostics.Modules, Description: diagnostics.Specify_how_TypeScript_looks_up_a_file_from_a_given_module_specifier, - DefaultValueDescription: diagnostics.X_module_AMD_or_UMD_or_System_or_ES6_then_Classic_Otherwise_Node, + DefaultValueDescription: diagnostics.X_nodenext_if_module_is_nodenext_node16_if_module_is_node16_or_node18_otherwise_bundler, }, { Name: "baseUrl", diff --git a/internal/tsoptions/enummaps.go b/internal/tsoptions/enummaps.go index 92fcb428e3..e57fe6a337 100644 --- a/internal/tsoptions/enummaps.go +++ b/internal/tsoptions/enummaps.go @@ -136,9 +136,9 @@ var moduleResolutionOptionMap = collections.NewOrderedMapFromList([]collections. {Key: "node16", Value: core.ModuleResolutionKindNode16}, {Key: "nodenext", Value: core.ModuleResolutionKindNodeNext}, {Key: "bundler", Value: core.ModuleResolutionKindBundler}, - {Key: "node", Value: core.ModuleResolutionKindBundler}, // TODO: remove when node is fully deprecated -- this is helpful for testing porting - {Key: "classic", Value: core.ModuleResolutionKindBundler}, // TODO: remove when fully deprecated - {Key: "node10", Value: core.ModuleResolutionKindBundler}, // TODO: remove when fully deprecated + {Key: "classic", Value: core.ModuleResolutionKindClassic}, + {Key: "node", Value: core.ModuleResolutionKindNode10}, + {Key: "node10", Value: core.ModuleResolutionKindNode10}, }) var targetOptionMap = collections.NewOrderedMapFromList([]collections.MapEntry[string, any]{ diff --git a/testdata/baselines/reference/compiler/allowSyntheticDefaultImports9.js b/testdata/baselines/reference/compiler/allowSyntheticDefaultImports9.js index 14cdb26657..cc99033f91 100644 --- a/testdata/baselines/reference/compiler/allowSyntheticDefaultImports9.js +++ b/testdata/baselines/reference/compiler/allowSyntheticDefaultImports9.js @@ -12,7 +12,10 @@ Foo.foo(); //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const b_1 = require("./b"); +const b_1 = __importDefault(require("./b")); b_1.default.bar(); b_1.default.foo(); diff --git a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).js b/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).js deleted file mode 100644 index da264d8e4c..0000000000 --- a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).js +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/settingsSimpleTest.ts] //// - -//// [settingsSimpleTest.ts] -export {}; -const x: string = undefined; - -//// [settingsSimpleTest.js] -const x = undefined; -export {}; - - -//// [settingsSimpleTest.d.ts] -export {}; diff --git a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).symbols b/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).symbols deleted file mode 100644 index fb50091854..0000000000 --- a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).symbols +++ /dev/null @@ -1,8 +0,0 @@ -//// [tests/cases/compiler/settingsSimpleTest.ts] //// - -=== settingsSimpleTest.ts === -export {}; -const x: string = undefined; ->x : Symbol(x, Decl(settingsSimpleTest.ts, 1, 5)) ->undefined : Symbol(undefined) - diff --git a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).types b/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).types deleted file mode 100644 index 2c05c492b6..0000000000 --- a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=false).types +++ /dev/null @@ -1,8 +0,0 @@ -//// [tests/cases/compiler/settingsSimpleTest.ts] //// - -=== settingsSimpleTest.ts === -export {}; -const x: string = undefined; ->x : string ->undefined : undefined - diff --git a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).errors.txt b/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).errors.txt deleted file mode 100644 index 1c2471e7a6..0000000000 --- a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).errors.txt +++ /dev/null @@ -1,8 +0,0 @@ -settingsSimpleTest.ts(2,7): error TS2322: Type 'undefined' is not assignable to type 'string'. - - -==== settingsSimpleTest.ts (1 errors) ==== - export {}; - const x: string = undefined; - ~ -!!! error TS2322: Type 'undefined' is not assignable to type 'string'. \ No newline at end of file diff --git a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).js b/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).js deleted file mode 100644 index da264d8e4c..0000000000 --- a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).js +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/settingsSimpleTest.ts] //// - -//// [settingsSimpleTest.ts] -export {}; -const x: string = undefined; - -//// [settingsSimpleTest.js] -const x = undefined; -export {}; - - -//// [settingsSimpleTest.d.ts] -export {}; diff --git a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).symbols b/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).symbols deleted file mode 100644 index fb50091854..0000000000 --- a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).symbols +++ /dev/null @@ -1,8 +0,0 @@ -//// [tests/cases/compiler/settingsSimpleTest.ts] //// - -=== settingsSimpleTest.ts === -export {}; -const x: string = undefined; ->x : Symbol(x, Decl(settingsSimpleTest.ts, 1, 5)) ->undefined : Symbol(undefined) - diff --git a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).types b/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).types deleted file mode 100644 index 2c05c492b6..0000000000 --- a/testdata/baselines/reference/compiler/settingsSimpleTest(strict=true).types +++ /dev/null @@ -1,8 +0,0 @@ -//// [tests/cases/compiler/settingsSimpleTest.ts] //// - -=== settingsSimpleTest.ts === -export {}; -const x: string = undefined; ->x : string ->undefined : undefined - diff --git a/testdata/baselines/reference/conformance/jsdocTypeParameterTagConflict.types b/testdata/baselines/reference/conformance/jsdocTypeParameterTagConflict.types index 181028247a..c011a7682c 100644 --- a/testdata/baselines/reference/conformance/jsdocTypeParameterTagConflict.types +++ b/testdata/baselines/reference/conformance/jsdocTypeParameterTagConflict.types @@ -6,7 +6,7 @@ * @param {2} a */ export function conflictingParam(a) { return true } ->conflictingParam : (a: 1) => true +>conflictingParam : (a: 2) => true >a : 2 >true : true @@ -15,7 +15,7 @@ export function conflictingParam(a) { return true } * @return {false} */ export function conflictingReturn(b) { return false } ->conflictingReturn : (b: 3) => true +>conflictingReturn : (b: 3) => false >b : 3 >false : false @@ -26,7 +26,7 @@ export function conflictingReturn(b) { return false } * @return {false} */ export function conflictingBoth(d) { return false } ->conflictingBoth : (c: 4) => true +>conflictingBoth : (d: 5) => false >d : 5 >false : false diff --git a/testdata/baselines/reference/fourslash/documentHighlights/documentHighlightReferenceDirective.baseline.jsonc b/testdata/baselines/reference/fourslash/documentHighlights/documentHighlightReferenceDirective.baseline.jsonc deleted file mode 100644 index affad0dae7..0000000000 --- a/testdata/baselines/reference/fourslash/documentHighlights/documentHighlightReferenceDirective.baseline.jsonc +++ /dev/null @@ -1,6 +0,0 @@ -// === documentHighlights === -// === /a.ts === -// /// -// -// const x = 1; -// \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/APISample_jsdoc.js b/testdata/baselines/reference/submodule/compiler/APISample_jsdoc.js index 3a50a28422..a641c88257 100644 --- a/testdata/baselines/reference/submodule/compiler/APISample_jsdoc.js +++ b/testdata/baselines/reference/submodule/compiler/APISample_jsdoc.js @@ -129,8 +129,41 @@ function getSomeOtherTags(node: ts.Node) { * https://github.com/vega/ts-json-schema-generator * Please log a "breaking change" issue for any API breaking change affecting this issue */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ts = require("typescript"); +const ts = __importStar(require("typescript")); // excerpted from https://github.com/YousefED/typescript-json-schema // (converted from a method and modified; for example, `this: any` to compensate, among other changes) function parseCommentsIntoDefinition(symbol, definition, otherAnnotations) { diff --git a/testdata/baselines/reference/submodule/compiler/APISample_jsdoc.js.diff b/testdata/baselines/reference/submodule/compiler/APISample_jsdoc.js.diff index 9989abff97..467a8e297e 100644 --- a/testdata/baselines/reference/submodule/compiler/APISample_jsdoc.js.diff +++ b/testdata/baselines/reference/submodule/compiler/APISample_jsdoc.js.diff @@ -1,11 +1,11 @@ --- old.APISample_jsdoc.js +++ new.APISample_jsdoc.js -@@= skipped -129, +129 lines =@@ - * Please log a "breaking change" issue for any API breaking change affecting this issue - */ +@@= skipped -162, +162 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ts = require("typescript"); -+const ts = require("typescript"); +-var ts = __importStar(require("typescript")); ++const ts = __importStar(require("typescript")); // excerpted from https://github.com/YousefED/typescript-json-schema // (converted from a method and modified; for example, `this: any` to compensate, among other changes) function parseCommentsIntoDefinition(symbol, definition, otherAnnotations) { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/APISample_linter.js b/testdata/baselines/reference/submodule/compiler/APISample_linter.js index be5ae7c4e5..b0ed0df036 100644 --- a/testdata/baselines/reference/submodule/compiler/APISample_linter.js +++ b/testdata/baselines/reference/submodule/compiler/APISample_linter.js @@ -79,9 +79,42 @@ fileNames.forEach(fileName => { * at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#traversing-the-ast-with-a-little-linter * Please log a "breaking change" issue for any API breaking change affecting this issue */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.delint = delint; -const ts = require("typescript"); +const ts = __importStar(require("typescript")); function delint(sourceFile) { delintNode(sourceFile); function delintNode(node) { diff --git a/testdata/baselines/reference/submodule/compiler/APISample_linter.js.diff b/testdata/baselines/reference/submodule/compiler/APISample_linter.js.diff index 5bc028be72..6104a135e1 100644 --- a/testdata/baselines/reference/submodule/compiler/APISample_linter.js.diff +++ b/testdata/baselines/reference/submodule/compiler/APISample_linter.js.diff @@ -1,11 +1,11 @@ --- old.APISample_linter.js +++ new.APISample_linter.js -@@= skipped -80, +80 lines =@@ - */ +@@= skipped -113, +113 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.delint = delint; --var ts = require("typescript"); -+const ts = require("typescript"); +-var ts = __importStar(require("typescript")); ++const ts = __importStar(require("typescript")); function delint(sourceFile) { delintNode(sourceFile); function delintNode(node) { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/APISample_transform.js b/testdata/baselines/reference/submodule/compiler/APISample_transform.js index 8f1b028cad..38b2ccd05a 100644 --- a/testdata/baselines/reference/submodule/compiler/APISample_transform.js +++ b/testdata/baselines/reference/submodule/compiler/APISample_transform.js @@ -31,8 +31,41 @@ console.log(JSON.stringify(result)); * at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#a-simple-transform-function * Please log a "breaking change" issue for any API breaking change affecting this issue */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ts = require("typescript"); +const ts = __importStar(require("typescript")); const source = "let x: string = 'string'"; let result = ts.transpile(source, { module: ts.ModuleKind.CommonJS }); console.log(JSON.stringify(result)); diff --git a/testdata/baselines/reference/submodule/compiler/APISample_transform.js.diff b/testdata/baselines/reference/submodule/compiler/APISample_transform.js.diff index 353eeba78c..c50c35bc1e 100644 --- a/testdata/baselines/reference/submodule/compiler/APISample_transform.js.diff +++ b/testdata/baselines/reference/submodule/compiler/APISample_transform.js.diff @@ -1,11 +1,11 @@ --- old.APISample_transform.js +++ new.APISample_transform.js -@@= skipped -31, +31 lines =@@ - * Please log a "breaking change" issue for any API breaking change affecting this issue - */ +@@= skipped -64, +64 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ts = require("typescript"); -+const ts = require("typescript"); +-var ts = __importStar(require("typescript")); ++const ts = __importStar(require("typescript")); const source = "let x: string = 'string'"; let result = ts.transpile(source, { module: ts.ModuleKind.CommonJS }); console.log(JSON.stringify(result)); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/APISample_watcher.js b/testdata/baselines/reference/submodule/compiler/APISample_watcher.js index 4b2a3906c9..cf3cef8653 100644 --- a/testdata/baselines/reference/submodule/compiler/APISample_watcher.js +++ b/testdata/baselines/reference/submodule/compiler/APISample_watcher.js @@ -126,8 +126,41 @@ watch(currentDirectoryFiles, { module: ts.ModuleKind.CommonJS }); * at: https://github.com/Microsoft/TypeScript/wiki/Using-the-Compiler-API#incremental-build-support-using-the-language-services * Please log a "breaking change" issue for any API breaking change affecting this issue */ +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ts = require("typescript"); +const ts = __importStar(require("typescript")); function watch(rootFileNames, options) { const files = {}; // initialize the list of files diff --git a/testdata/baselines/reference/submodule/compiler/APISample_watcher.js.diff b/testdata/baselines/reference/submodule/compiler/APISample_watcher.js.diff index 9b572eae42..4ed94ed8ed 100644 --- a/testdata/baselines/reference/submodule/compiler/APISample_watcher.js.diff +++ b/testdata/baselines/reference/submodule/compiler/APISample_watcher.js.diff @@ -1,11 +1,11 @@ --- old.APISample_watcher.js +++ new.APISample_watcher.js -@@= skipped -126, +126 lines =@@ - * Please log a "breaking change" issue for any API breaking change affecting this issue - */ +@@= skipped -159, +159 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ts = require("typescript"); -+const ts = require("typescript"); +-var ts = __importStar(require("typescript")); ++const ts = __importStar(require("typescript")); function watch(rootFileNames, options) { const files = {}; // initialize the list of files \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/allowImportClausesToMergeWithTypes.js b/testdata/baselines/reference/submodule/compiler/allowImportClausesToMergeWithTypes.js index 1e09e38fb1..e86a028cd1 100644 --- a/testdata/baselines/reference/submodule/compiler/allowImportClausesToMergeWithTypes.js +++ b/testdata/baselines/reference/submodule/compiler/allowImportClausesToMergeWithTypes.js @@ -35,18 +35,24 @@ exports.zzz = 123; exports.default = exports.zzz; //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; -const b_1 = require("./b"); +const b_1 = __importDefault(require("./b")); exports.default = b_1.default; const x = { x: "" }; b_1.default; //// [index.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); const x = { x: "" }; a_1.default; -const b_1 = require("./b"); +const b_1 = __importDefault(require("./b")); b_1.default; const y = x; diff --git a/testdata/baselines/reference/submodule/compiler/allowImportClausesToMergeWithTypes.js.diff b/testdata/baselines/reference/submodule/compiler/allowImportClausesToMergeWithTypes.js.diff index 467ca1a9f4..c17a90fb7f 100644 --- a/testdata/baselines/reference/submodule/compiler/allowImportClausesToMergeWithTypes.js.diff +++ b/testdata/baselines/reference/submodule/compiler/allowImportClausesToMergeWithTypes.js.diff @@ -1,22 +1,23 @@ --- old.allowImportClausesToMergeWithTypes.js +++ new.allowImportClausesToMergeWithTypes.js -@@= skipped -36, +36 lines =@@ - "use strict"; +@@= skipped -39, +39 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; --var b_1 = require("./b"); -+const b_1 = require("./b"); +-var b_1 = __importDefault(require("./b")); ++const b_1 = __importDefault(require("./b")); exports.default = b_1.default; const x = { x: "" }; b_1.default; - //// [index.js] - "use strict"; +@@= skipped -10, +10 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); const x = { x: "" }; a_1.default; --var b_1 = require("./b"); -+const b_1 = require("./b"); +-var b_1 = __importDefault(require("./b")); ++const b_1 = __importDefault(require("./b")); b_1.default; const y = x; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports1.js b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports1.js index e5d33c74b7..eecb8bb251 100644 --- a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports1.js +++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports1.js @@ -12,7 +12,10 @@ export class Foo { //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; -const b_1 = require("./b"); +const b_1 = __importDefault(require("./b")); exports.x = new b_1.default.Foo(); diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports1.js.diff b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports1.js.diff index a91de62581..b6cac15f88 100644 --- a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports1.js.diff +++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports1.js.diff @@ -1,9 +1,9 @@ --- old.allowSyntheticDefaultImports1.js +++ new.allowSyntheticDefaultImports1.js -@@= skipped -13, +13 lines =@@ - "use strict"; +@@= skipped -16, +16 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; --var b_1 = require("./b"); -+const b_1 = require("./b"); +-var b_1 = __importDefault(require("./b")); ++const b_1 = __importDefault(require("./b")); exports.x = new b_1.default.Foo(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports4.js b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports4.js index 95657fc337..a6ec766c41 100644 --- a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports4.js +++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports4.js @@ -13,7 +13,10 @@ export var x = new Foo(); //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; -const b_1 = require("./b"); +const b_1 = __importDefault(require("./b")); exports.x = new b_1.default(); diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports4.js.diff b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports4.js.diff index 87f7d45681..db2b69074d 100644 --- a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports4.js.diff +++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports4.js.diff @@ -1,9 +1,9 @@ --- old.allowSyntheticDefaultImports4.js +++ new.allowSyntheticDefaultImports4.js -@@= skipped -14, +14 lines =@@ - "use strict"; +@@= skipped -17, +17 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; --var b_1 = require("./b"); -+const b_1 = require("./b"); +-var b_1 = __importDefault(require("./b")); ++const b_1 = __importDefault(require("./b")); exports.x = new b_1.default(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports9.js b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports9.js index 14cdb26657..cc99033f91 100644 --- a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports9.js +++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports9.js @@ -12,7 +12,10 @@ Foo.foo(); //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const b_1 = require("./b"); +const b_1 = __importDefault(require("./b")); b_1.default.bar(); b_1.default.foo(); diff --git a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports9.js.diff b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports9.js.diff index 95bd4aba2c..6b4e52d16e 100644 --- a/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports9.js.diff +++ b/testdata/baselines/reference/submodule/compiler/allowSyntheticDefaultImports9.js.diff @@ -1,10 +1,10 @@ --- old.allowSyntheticDefaultImports9.js +++ new.allowSyntheticDefaultImports9.js -@@= skipped -12, +12 lines =@@ - //// [a.js] - "use strict"; +@@= skipped -15, +15 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var b_1 = require("./b"); -+const b_1 = require("./b"); +-var b_1 = __importDefault(require("./b")); ++const b_1 = __importDefault(require("./b")); b_1.default.bar(); b_1.default.foo(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.errors.txt b/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.errors.txt deleted file mode 100644 index eae1ba1ed9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.errors.txt +++ /dev/null @@ -1,23 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -a.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode. -b.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (1 errors) ==== - module M { - export function f() { - var arguments = []; - ~~~~~~~~~ -!!! error TS1100: Invalid use of 'arguments' in strict mode. - } - } - -==== b.ts (1 errors) ==== - module M { - export function f2() { - var arguments = []; - ~~~~~~~~~ -!!! error TS1100: Invalid use of 'arguments' in strict mode. - } - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.symbols b/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.symbols deleted file mode 100644 index 43ad606a40..0000000000 --- a/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.symbols +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/compiler/alwaysStrictModule2.ts] //// - -=== a.ts === -module M { ->M : Symbol(M, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0)) - - export function f() { ->f : Symbol(f, Decl(a.ts, 0, 10)) - - var arguments = []; ->arguments : Symbol(arguments, Decl(a.ts, 2, 11)) - } -} - -=== b.ts === -module M { ->M : Symbol(M, Decl(a.ts, 0, 0), Decl(b.ts, 0, 0)) - - export function f2() { ->f2 : Symbol(f2, Decl(b.ts, 0, 10)) - - var arguments = []; ->arguments : Symbol(arguments, Decl(b.ts, 2, 11)) - } -} diff --git a/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.types b/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.types deleted file mode 100644 index ddf13f957e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/alwaysStrictModule2.types +++ /dev/null @@ -1,27 +0,0 @@ -//// [tests/cases/compiler/alwaysStrictModule2.ts] //// - -=== a.ts === -module M { ->M : typeof M - - export function f() { ->f : () => void - - var arguments = []; ->arguments : any[] ->[] : undefined[] - } -} - -=== b.ts === -module M { ->M : typeof M - - export function f2() { ->f2 : () => void - - var arguments = []; ->arguments : any[] ->[] : undefined[] - } -} diff --git a/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.errors.txt b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.errors.txt new file mode 100644 index 0000000000..f8f07f10a8 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.errors.txt @@ -0,0 +1,19 @@ +ambientExternalModuleInAnotherExternalModule.ts(4,16): error TS2664: Invalid module name in augmentation, module 'ext' cannot be found. +ambientExternalModuleInAnotherExternalModule.ts(9,22): error TS2307: Cannot find module 'ext' or its corresponding type declarations. + + +==== ambientExternalModuleInAnotherExternalModule.ts (2 errors) ==== + class D { } + export = D; + + declare module "ext" { + ~~~~~ +!!! error TS2664: Invalid module name in augmentation, module 'ext' cannot be found. + export class C { } + } + + // Cannot resolve this ext module reference + import ext = require("ext"); + ~~~~~ +!!! error TS2307: Cannot find module 'ext' or its corresponding type declarations. + var x = ext; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.js b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.js new file mode 100644 index 0000000000..44a551ba0f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.js @@ -0,0 +1,22 @@ +//// [tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts] //// + +//// [ambientExternalModuleInAnotherExternalModule.ts] +class D { } +export = D; + +declare module "ext" { + export class C { } +} + +// Cannot resolve this ext module reference +import ext = require("ext"); +var x = ext; + +//// [ambientExternalModuleInAnotherExternalModule.js] +"use strict"; +class D { +} +// Cannot resolve this ext module reference +const ext = require("ext"); +var x = ext; +module.exports = D; diff --git a/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.js.diff b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.js.diff new file mode 100644 index 0000000000..a0ce2f8517 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.js.diff @@ -0,0 +1,10 @@ +--- old.ambientExternalModuleInAnotherExternalModule.js ++++ new.ambientExternalModuleInAnotherExternalModule.js +@@= skipped -16, +16 lines =@@ + class D { + } + // Cannot resolve this ext module reference +-var ext = require("ext"); ++const ext = require("ext"); + var x = ext; + module.exports = D; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.symbols b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.symbols new file mode 100644 index 0000000000..e8d7e6ebd3 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.symbols @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts] //// + +=== ambientExternalModuleInAnotherExternalModule.ts === +class D { } +>D : Symbol(D, Decl(ambientExternalModuleInAnotherExternalModule.ts, 0, 0)) + +export = D; +>D : Symbol(D, Decl(ambientExternalModuleInAnotherExternalModule.ts, 0, 0)) + +declare module "ext" { +>"ext" : Symbol("ext", Decl(ambientExternalModuleInAnotherExternalModule.ts, 1, 11)) + + export class C { } +>C : Symbol(C, Decl(ambientExternalModuleInAnotherExternalModule.ts, 3, 22)) +} + +// Cannot resolve this ext module reference +import ext = require("ext"); +>ext : Symbol(ext, Decl(ambientExternalModuleInAnotherExternalModule.ts, 5, 1)) + +var x = ext; +>x : Symbol(x, Decl(ambientExternalModuleInAnotherExternalModule.ts, 9, 3)) +>ext : Symbol(ext, Decl(ambientExternalModuleInAnotherExternalModule.ts, 5, 1)) + diff --git a/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.types b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.types new file mode 100644 index 0000000000..2f25de3758 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/ambientExternalModuleInAnotherExternalModule.types @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/ambientExternalModuleInAnotherExternalModule.ts] //// + +=== ambientExternalModuleInAnotherExternalModule.ts === +class D { } +>D : D + +export = D; +>D : D + +declare module "ext" { +>"ext" : typeof import("ext") + + export class C { } +>C : C +} + +// Cannot resolve this ext module reference +import ext = require("ext"); +>ext : any + +var x = ext; +>x : any +>ext : any + diff --git a/testdata/baselines/reference/submodule/compiler/argumentsObjectCreatesRestForJs.errors.txt b/testdata/baselines/reference/submodule/compiler/argumentsObjectCreatesRestForJs.errors.txt index 9728abd151..d0da78af1a 100644 --- a/testdata/baselines/reference/submodule/compiler/argumentsObjectCreatesRestForJs.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/argumentsObjectCreatesRestForJs.errors.txt @@ -1,8 +1,9 @@ main.js(3,9): error TS2554: Expected 0 arguments, but got 3. -main.js(6,16): error TS2554: Expected 0-2 arguments, but got 3. +main.js(5,1): error TS2554: Expected 2 arguments, but got 0. +main.js(6,16): error TS2554: Expected 2 arguments, but got 3. -==== main.js (2 errors) ==== +==== main.js (3 errors) ==== function allRest() { arguments; } allRest(); allRest(1, 2, 3); @@ -10,9 +11,12 @@ main.js(6,16): error TS2554: Expected 0-2 arguments, but got 3. !!! error TS2554: Expected 0 arguments, but got 3. function someRest(x, y) { arguments; } someRest(); // x and y are still optional because they are in a JS file + ~~~~~~~~ +!!! error TS2554: Expected 2 arguments, but got 0. +!!! related TS6210 main.js:4:19: An argument for 'x' was not provided. someRest(1, 2, 3); ~ -!!! error TS2554: Expected 0-2 arguments, but got 3. +!!! error TS2554: Expected 2 arguments, but got 3. /** * @param {number} x - a thing diff --git a/testdata/baselines/reference/submodule/compiler/argumentsPropertyNameInJsMode1.errors.txt b/testdata/baselines/reference/submodule/compiler/argumentsPropertyNameInJsMode1.errors.txt index 3bca806b62..9ff220110a 100644 --- a/testdata/baselines/reference/submodule/compiler/argumentsPropertyNameInJsMode1.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/argumentsPropertyNameInJsMode1.errors.txt @@ -1,4 +1,4 @@ -a.js(9,7): error TS2554: Expected 0-1 arguments, but got 3. +a.js(9,7): error TS2554: Expected 1 arguments, but got 3. ==== a.js (1 errors) ==== @@ -12,5 +12,5 @@ a.js(9,7): error TS2554: Expected 0-1 arguments, but got 3. f2(1, 2, 3); ~~~~ -!!! error TS2554: Expected 0-1 arguments, but got 3. +!!! error TS2554: Expected 1 arguments, but got 3. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/argumentsPropertyNameInJsMode2.errors.txt b/testdata/baselines/reference/submodule/compiler/argumentsPropertyNameInJsMode2.errors.txt index 6f3d779512..c887f9f9bf 100644 --- a/testdata/baselines/reference/submodule/compiler/argumentsPropertyNameInJsMode2.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/argumentsPropertyNameInJsMode2.errors.txt @@ -1,4 +1,4 @@ -a.js(5,6): error TS2554: Expected 0-1 arguments, but got 3. +a.js(5,6): error TS2554: Expected 1 arguments, but got 3. ==== a.js (1 errors) ==== @@ -8,5 +8,5 @@ a.js(5,6): error TS2554: Expected 0-1 arguments, but got 3. f(1, 2, 3); ~~~~ -!!! error TS2554: Expected 0-1 arguments, but got 3. +!!! error TS2554: Expected 1 arguments, but got 3. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/argumentsReferenceInFunction1_Js.errors.txt b/testdata/baselines/reference/submodule/compiler/argumentsReferenceInFunction1_Js.errors.txt index 21fcf854a8..fecdd50367 100644 --- a/testdata/baselines/reference/submodule/compiler/argumentsReferenceInFunction1_Js.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/argumentsReferenceInFunction1_Js.errors.txt @@ -1,5 +1,5 @@ index.js(1,25): error TS7006: Parameter 'f' implicitly has an 'any' type. -index.js(13,29): error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f?: any]'. +index.js(13,29): error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f: any]'. ==== index.js (2 errors) ==== @@ -19,6 +19,6 @@ index.js(13,29): error TS2345: Argument of type 'IArguments' is not assignable t const debuglog = function() { return format.apply(null, arguments); ~~~~~~~~~ -!!! error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f?: any]'. +!!! error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f: any]'. }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport1.js b/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport1.js index abd758c14e..11f0c6c93f 100644 --- a/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport1.js +++ b/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport1.js @@ -33,14 +33,80 @@ Debug.assert(true); Object.defineProperty(exports, "__esModule", { value: true }); //// [ts.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Debug = void 0; -const Debug = require("../debug"); +const Debug = __importStar(require("../debug")); exports.Debug = Debug; //// [foo.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ts = require("./_namespaces/ts"); +const ts = __importStar(require("./_namespaces/ts")); const ts_1 = require("./_namespaces/ts"); ts.Debug.assert(true); ts_1.Debug.assert(true); @@ -64,8 +130,41 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("../../core/_namespaces/ts"), exports); //// [bar.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ts = require("./_namespaces/ts"); +const ts = __importStar(require("./_namespaces/ts")); const ts_1 = require("./_namespaces/ts"); ts.Debug.assert(true); ts_1.Debug.assert(true); diff --git a/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport1.js.diff b/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport1.js.diff index 7f6eaed5b7..79c4471801 100644 --- a/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport1.js.diff +++ b/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport1.js.diff @@ -1,29 +1,32 @@ --- old.assertionFunctionWildcardImport1.js +++ new.assertionFunctionWildcardImport1.js -@@= skipped -34, +34 lines =@@ - "use strict"; +@@= skipped -67, +67 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Debug = void 0; --var Debug = require("../debug"); -+const Debug = require("../debug"); +-var Debug = __importStar(require("../debug")); ++const Debug = __importStar(require("../debug")); exports.Debug = Debug; //// [foo.js] "use strict"; +@@= skipped -38, +38 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ts = require("./_namespaces/ts"); +-var ts = __importStar(require("./_namespaces/ts")); -var ts_1 = require("./_namespaces/ts"); -+const ts = require("./_namespaces/ts"); ++const ts = __importStar(require("./_namespaces/ts")); +const ts_1 = require("./_namespaces/ts"); ts.Debug.assert(true); ts_1.Debug.assert(true); //// [ts.js] -@@= skipped -30, +30 lines =@@ - //// [bar.js] - "use strict"; +@@= skipped -58, +58 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ts = require("./_namespaces/ts"); +-var ts = __importStar(require("./_namespaces/ts")); -var ts_1 = require("./_namespaces/ts"); -+const ts = require("./_namespaces/ts"); ++const ts = __importStar(require("./_namespaces/ts")); +const ts_1 = require("./_namespaces/ts"); ts.Debug.assert(true); ts_1.Debug.assert(true); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport2.js b/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport2.js index 17ad223160..25edf1e2fe 100644 --- a/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport2.js +++ b/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport2.js @@ -31,8 +31,41 @@ function isNonNullable(obj) { } //// [test.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const asserts = require("./asserts"); +const asserts = __importStar(require("./asserts")); function test(obj) { asserts.isNonNullable(obj); obj.trim(); diff --git a/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport2.js.diff b/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport2.js.diff index dde0e4fc73..bf6949f146 100644 --- a/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/assertionFunctionWildcardImport2.js.diff @@ -1,11 +1,11 @@ --- old.assertionFunctionWildcardImport2.js +++ new.assertionFunctionWildcardImport2.js -@@= skipped -31, +31 lines =@@ - //// [test.js] - "use strict"; +@@= skipped -64, +64 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var asserts = require("./asserts"); -+const asserts = require("./asserts"); +-var asserts = __importStar(require("./asserts")); ++const asserts = __importStar(require("./asserts")); function test(obj) { asserts.isNonNullable(obj); obj.trim(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/asyncImportNestedYield.js b/testdata/baselines/reference/submodule/compiler/asyncImportNestedYield.js index 31ea3415b2..5ed024a4a5 100644 --- a/testdata/baselines/reference/submodule/compiler/asyncImportNestedYield.js +++ b/testdata/baselines/reference/submodule/compiler/asyncImportNestedYield.js @@ -6,6 +6,39 @@ async function* foo() { } //// [asyncImportNestedYield.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); async function* foo() { - Promise.resolve(`${(await Promise.resolve(`${yield "foo"}`).then(s => require(s))).default}`).then(s => require(s)); + Promise.resolve(`${(await Promise.resolve(`${yield "foo"}`).then(s => __importStar(require(s)))).default}`).then(s => __importStar(require(s))); } diff --git a/testdata/baselines/reference/submodule/compiler/asyncImportNestedYield.js.diff b/testdata/baselines/reference/submodule/compiler/asyncImportNestedYield.js.diff index 4e0ed2c606..db8e2cd81b 100644 --- a/testdata/baselines/reference/submodule/compiler/asyncImportNestedYield.js.diff +++ b/testdata/baselines/reference/submodule/compiler/asyncImportNestedYield.js.diff @@ -1,9 +1,9 @@ --- old.asyncImportNestedYield.js +++ new.asyncImportNestedYield.js -@@= skipped -5, +5 lines =@@ - } - - //// [asyncImportNestedYield.js] +@@= skipped -38, +38 lines =@@ + return result; + }; + })(); -var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); } -var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) { - if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined."); @@ -19,8 +19,8 @@ -}; -function foo() { - return __asyncGenerator(this, arguments, function* foo_1() { -- Promise.resolve("".concat((yield __await(Promise.resolve("".concat(yield yield __await("foo"))).then(function (s) { return require(s); }))).default)).then(function (s) { return require(s); }); +- Promise.resolve("".concat((yield __await(Promise.resolve("".concat(yield yield __await("foo"))).then(function (s) { return __importStar(require(s)); }))).default)).then(function (s) { return __importStar(require(s)); }); - }); +async function* foo() { -+ Promise.resolve(`${(await Promise.resolve(`${yield "foo"}`).then(s => require(s))).default}`).then(s => require(s)); ++ Promise.resolve(`${(await Promise.resolve(`${yield "foo"}`).then(s => __importStar(require(s)))).default}`).then(s => __importStar(require(s))); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.errors.txt b/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.errors.txt new file mode 100644 index 0000000000..390b069468 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.errors.txt @@ -0,0 +1,25 @@ +file2.ts(5,16): error TS2671: Cannot augment module './file1' because it resolves to a non-module entity. +file3.ts(3,8): error TS2503: Cannot find namespace 'x'. + + +==== file3.ts (1 errors) ==== + import x = require("./file1"); + import "./file2"; + let a: x.A; // should not work + ~ +!!! error TS2503: Cannot find namespace 'x'. +==== file1.ts (0 errors) ==== + var x = 1; + export = x; + +==== file2.ts (1 errors) ==== + import x = require("./file1"); + + // augmentation for './file1' + // should error since './file1' does not have namespace meaning + declare module "./file1" { + ~~~~~~~~~ +!!! error TS2671: Cannot augment module './file1' because it resolves to a non-module entity. + interface A { a } + } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.js b/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.js new file mode 100644 index 0000000000..f5d241153b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.js @@ -0,0 +1,32 @@ +//// [tests/cases/compiler/augmentExportEquals1.ts] //// + +//// [file1.ts] +var x = 1; +export = x; + +//// [file2.ts] +import x = require("./file1"); + +// augmentation for './file1' +// should error since './file1' does not have namespace meaning +declare module "./file1" { + interface A { a } +} + +//// [file3.ts] +import x = require("./file1"); +import "./file2"; +let a: x.A; // should not work + +//// [file1.js] +"use strict"; +var x = 1; +module.exports = x; +//// [file2.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//// [file3.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +require("./file2"); +let a; // should not work diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.symbols b/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.symbols new file mode 100644 index 0000000000..2a49028ee9 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.symbols @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/augmentExportEquals1.ts] //// + +=== file3.ts === +import x = require("./file1"); +>x : Symbol(x, Decl(file3.ts, 0, 0)) + +import "./file2"; +let a: x.A; // should not work +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>x : Symbol(x) +>A : Symbol(x.A) + +=== file1.ts === +var x = 1; +>x : Symbol(x, Decl(file1.ts, 0, 3)) + +export = x; +>x : Symbol(x, Decl(file1.ts, 0, 3)) + +=== file2.ts === +import x = require("./file1"); +>x : Symbol(x, Decl(file2.ts, 0, 0)) + +// augmentation for './file1' +// should error since './file1' does not have namespace meaning +declare module "./file1" { +>"./file1" : Symbol("./file1", Decl(file2.ts, 0, 30)) + + interface A { a } +>A : Symbol(A, Decl(file2.ts, 4, 26)) +>a : Symbol(A.a, Decl(file2.ts, 5, 17)) +} + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.types b/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.types new file mode 100644 index 0000000000..46bd32b257 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals1.types @@ -0,0 +1,32 @@ +//// [tests/cases/compiler/augmentExportEquals1.ts] //// + +=== file3.ts === +import x = require("./file1"); +>x : number + +import "./file2"; +let a: x.A; // should not work +>a : x.A +>x : any + +=== file1.ts === +var x = 1; +>x : number +>1 : 1 + +export = x; +>x : number + +=== file2.ts === +import x = require("./file1"); +>x : number + +// augmentation for './file1' +// should error since './file1' does not have namespace meaning +declare module "./file1" { +>"./file1" : any + + interface A { a } +>a : any +} + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.errors.txt.diff new file mode 100644 index 0000000000..6344d4199e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.errors.txt.diff @@ -0,0 +1,28 @@ +--- old.augmentExportEquals2.errors.txt ++++ new.augmentExportEquals2.errors.txt +@@= skipped -0, +0 lines =@@ +-file2.ts(4,16): error TS2671: Cannot augment module './file1' because it resolves to a non-module entity. +-file3.ts(3,8): error TS2503: Cannot find namespace 'x'. +- +- +-==== file3.ts (1 errors) ==== +- import x = require("./file1"); +- import "./file2"; +- let a: x.A; // should not work +- ~ +-!!! error TS2503: Cannot find namespace 'x'. +-==== file1.ts (0 errors) ==== +- function foo() {} +- export = foo; +- +-==== file2.ts (1 errors) ==== +- import x = require("./file1"); +- +- // should error since './file1' does not have namespace meaning +- declare module "./file1" { +- ~~~~~~~~~ +-!!! error TS2671: Cannot augment module './file1' because it resolves to a non-module entity. +- interface A { a } +- } +- ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.js b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.js new file mode 100644 index 0000000000..bd4ceebc7b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.js @@ -0,0 +1,22 @@ +//// [tests/cases/compiler/augmentExportEquals2.ts] //// + +//// [file1.ts] +function foo() {} +export = foo; + +//// [file2.ts] +import x = require("./file1"); + +// should error since './file1' does not have namespace meaning +declare module "./file1" { + interface A { a } +} + +//// [file3.ts] + +//// [file3.ts] +import x = require("./file1"); +import "./file2"; +let a: x.A; // should not work + +//// [file3.js] diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.js.diff b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.js.diff new file mode 100644 index 0000000000..163783e142 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.js.diff @@ -0,0 +1,24 @@ +--- old.augmentExportEquals2.js ++++ new.augmentExportEquals2.js +@@= skipped -12, +12 lines =@@ + } + + //// [file3.ts] ++ ++//// [file3.ts] + import x = require("./file1"); + import "./file2"; + let a: x.A; // should not work + +-//// [file1.js] +-"use strict"; +-function foo() { } +-module.exports = foo; +-//// [file2.js] +-"use strict"; +-Object.defineProperty(exports, "__esModule", { value: true }); + //// [file3.js] +-"use strict"; +-Object.defineProperty(exports, "__esModule", { value: true }); +-require("./file2"); +-let a; // should not work \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.symbols b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.symbols new file mode 100644 index 0000000000..1f758cf8e6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.symbols @@ -0,0 +1,9 @@ +//// [tests/cases/compiler/augmentExportEquals2.ts] //// + +=== file3.ts === + +import x = require("./file1"); +import "./file2"; +let a: x.A; // should not work +=== file3.ts === + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.symbols.diff b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.symbols.diff new file mode 100644 index 0000000000..9794f4388d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.symbols.diff @@ -0,0 +1,36 @@ +--- old.augmentExportEquals2.symbols ++++ new.augmentExportEquals2.symbols +@@= skipped -0, +0 lines =@@ + //// [tests/cases/compiler/augmentExportEquals2.ts] //// + + === file3.ts === ++ + import x = require("./file1"); +->x : Symbol(x, Decl(file3.ts, 0, 0)) +- + import "./file2"; + let a: x.A; // should not work +->a : Symbol(a, Decl(file3.ts, 2, 3)) +->x : Symbol(x) +->A : Symbol(x.A) +- +-=== file1.ts === +-function foo() {} +->foo : Symbol(foo, Decl(file1.ts, 0, 0)) +- +-export = foo; +->foo : Symbol(foo, Decl(file1.ts, 0, 0)) +- +-=== file2.ts === +-import x = require("./file1"); +->x : Symbol(x, Decl(file2.ts, 0, 0)) +- +-// should error since './file1' does not have namespace meaning +-declare module "./file1" { +->"./file1" : Symbol("./file1", Decl(file2.ts, 0, 30)) +- +- interface A { a } +->A : Symbol(A, Decl(file2.ts, 3, 26)) +->a : Symbol(A.a, Decl(file2.ts, 4, 17)) +-} ++=== file3.ts === diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.types b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.types new file mode 100644 index 0000000000..1f758cf8e6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.types @@ -0,0 +1,9 @@ +//// [tests/cases/compiler/augmentExportEquals2.ts] //// + +=== file3.ts === + +import x = require("./file1"); +import "./file2"; +let a: x.A; // should not work +=== file3.ts === + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.types.diff b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.types.diff new file mode 100644 index 0000000000..da4189e2e6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals2.types.diff @@ -0,0 +1,34 @@ +--- old.augmentExportEquals2.types ++++ new.augmentExportEquals2.types +@@= skipped -0, +0 lines =@@ + //// [tests/cases/compiler/augmentExportEquals2.ts] //// + + === file3.ts === ++ + import x = require("./file1"); +->x : () => void +- + import "./file2"; + let a: x.A; // should not work +->a : x.A +->x : any +- +-=== file1.ts === +-function foo() {} +->foo : () => void +- +-export = foo; +->foo : () => void +- +-=== file2.ts === +-import x = require("./file1"); +->x : () => void +- +-// should error since './file1' does not have namespace meaning +-declare module "./file1" { +->"./file1" : any +- +- interface A { a } +->a : any +-} ++=== file3.ts === diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.js b/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.js new file mode 100644 index 0000000000..8fb564804f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.js @@ -0,0 +1,77 @@ +//// [tests/cases/compiler/augmentExportEquals3.ts] //// + +//// [file1.ts] +function foo() {} +namespace foo { + export var v = 1; +} +export = foo; + +//// [file2.ts] +import x = require("./file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a } + let b: number; +} + +//// [file3.ts] +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = x.b; + +//// [file1.js] +"use strict"; +function foo() { } +(function (foo) { + foo.v = 1; +})(foo || (foo = {})); +module.exports = foo; +//// [file2.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const x = require("./file1"); +x.b = 1; +//// [file3.js] +"use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +const x = __importStar(require("./file1")); +require("./file2"); +let a; +let b = x.b; diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.js.diff b/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.js.diff new file mode 100644 index 0000000000..898c818540 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.js.diff @@ -0,0 +1,20 @@ +--- old.augmentExportEquals3.js ++++ new.augmentExportEquals3.js +@@= skipped -32, +32 lines =@@ + //// [file2.js] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-var x = require("./file1"); ++const x = require("./file1"); + x.b = 1; + //// [file3.js] + "use strict"; +@@= skipped -38, +38 lines =@@ + }; + })(); + Object.defineProperty(exports, "__esModule", { value: true }); +-var x = __importStar(require("./file1")); ++const x = __importStar(require("./file1")); + require("./file2"); + let a; + let b = x.b; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.symbols b/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.symbols new file mode 100644 index 0000000000..765e4342e4 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.symbols @@ -0,0 +1,52 @@ +//// [tests/cases/compiler/augmentExportEquals3.ts] //// + +=== file1.ts === +function foo() {} +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 17), Decl(file2.ts, 1, 8)) + +namespace foo { +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 17), Decl(file2.ts, 1, 8)) + + export var v = 1; +>v : Symbol(v, Decl(file1.ts, 2, 14)) +} +export = foo; +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 17), Decl(file2.ts, 1, 8)) + +=== file2.ts === +import x = require("./file1"); +>x : Symbol(x, Decl(file2.ts, 0, 0)) + +x.b = 1; +>x.b : Symbol(x.b, Decl(file2.ts, 6, 7)) +>x : Symbol(x, Decl(file2.ts, 0, 0)) +>b : Symbol(x.b, Decl(file2.ts, 6, 7)) + +// OK - './file1' is a namespace +declare module "./file1" { +>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 17), Decl(file2.ts, 1, 8)) + + interface A { a } +>A : Symbol(A, Decl(file2.ts, 4, 26)) +>a : Symbol(A.a, Decl(file2.ts, 5, 17)) + + let b: number; +>b : Symbol(b, Decl(file2.ts, 6, 7)) +} + +=== file3.ts === +import * as x from "./file1"; +>x : Symbol(x, Decl(file3.ts, 0, 6)) + +import "./file2"; +let a: x.A; +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>A : Symbol(x.A, Decl(file2.ts, 4, 26)) + +let b = x.b; +>b : Symbol(b, Decl(file3.ts, 3, 3)) +>x.b : Symbol(x.b, Decl(file2.ts, 6, 7)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>b : Symbol(x.b, Decl(file2.ts, 6, 7)) + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.types b/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.types new file mode 100644 index 0000000000..d5274780fb --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals3.types @@ -0,0 +1,53 @@ +//// [tests/cases/compiler/augmentExportEquals3.ts] //// + +=== file1.ts === +function foo() {} +>foo : typeof import("file1.ts") + +namespace foo { +>foo : typeof import("file1.ts") + + export var v = 1; +>v : number +>1 : 1 +} +export = foo; +>foo : typeof import("file1.ts") + +=== file2.ts === +import x = require("./file1"); +>x : typeof x + +x.b = 1; +>x.b = 1 : 1 +>x.b : number +>x : typeof x +>b : number +>1 : 1 + +// OK - './file1' is a namespace +declare module "./file1" { +>"./file1" : typeof x + + interface A { a } +>a : any + + let b: number; +>b : number +} + +=== file3.ts === +import * as x from "./file1"; +>x : typeof x + +import "./file2"; +let a: x.A; +>a : x.A +>x : any + +let b = x.b; +>b : number +>x.b : number +>x : typeof x +>b : number + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.js b/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.js new file mode 100644 index 0000000000..411afefd7a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.js @@ -0,0 +1,78 @@ +//// [tests/cases/compiler/augmentExportEquals4.ts] //// + +//// [file1.ts] +class foo {} +namespace foo { + export var v = 1; +} +export = foo; + +//// [file2.ts] +import x = require("./file1"); +x.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a } + let b: number; +} + +//// [file3.ts] +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = x.b; + +//// [file1.js] +"use strict"; +class foo { +} +(function (foo) { + foo.v = 1; +})(foo || (foo = {})); +module.exports = foo; +//// [file2.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const x = require("./file1"); +x.b = 1; +//// [file3.js] +"use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +const x = __importStar(require("./file1")); +require("./file2"); +let a; +let b = x.b; diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.js.diff b/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.js.diff new file mode 100644 index 0000000000..a781171be5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.js.diff @@ -0,0 +1,20 @@ +--- old.augmentExportEquals4.js ++++ new.augmentExportEquals4.js +@@= skipped -33, +33 lines =@@ + //// [file2.js] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-var x = require("./file1"); ++const x = require("./file1"); + x.b = 1; + //// [file3.js] + "use strict"; +@@= skipped -38, +38 lines =@@ + }; + })(); + Object.defineProperty(exports, "__esModule", { value: true }); +-var x = __importStar(require("./file1")); ++const x = __importStar(require("./file1")); + require("./file2"); + let a; + let b = x.b; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.symbols b/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.symbols new file mode 100644 index 0000000000..1c03321f69 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.symbols @@ -0,0 +1,52 @@ +//// [tests/cases/compiler/augmentExportEquals4.ts] //// + +=== file1.ts === +class foo {} +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 8)) + +namespace foo { +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 8)) + + export var v = 1; +>v : Symbol(v, Decl(file1.ts, 2, 14)) +} +export = foo; +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 8)) + +=== file2.ts === +import x = require("./file1"); +>x : Symbol(x, Decl(file2.ts, 0, 0)) + +x.b = 1; +>x.b : Symbol(x.b, Decl(file2.ts, 6, 7)) +>x : Symbol(x, Decl(file2.ts, 0, 0)) +>b : Symbol(x.b, Decl(file2.ts, 6, 7)) + +// OK - './file1' is a namespace +declare module "./file1" { +>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 8)) + + interface A { a } +>A : Symbol(A, Decl(file2.ts, 4, 26)) +>a : Symbol(A.a, Decl(file2.ts, 5, 17)) + + let b: number; +>b : Symbol(b, Decl(file2.ts, 6, 7)) +} + +=== file3.ts === +import * as x from "./file1"; +>x : Symbol(x, Decl(file3.ts, 0, 6)) + +import "./file2"; +let a: x.A; +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>A : Symbol(x.A, Decl(file2.ts, 4, 26)) + +let b = x.b; +>b : Symbol(b, Decl(file3.ts, 3, 3)) +>x.b : Symbol(x.b, Decl(file2.ts, 6, 7)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>b : Symbol(x.b, Decl(file2.ts, 6, 7)) + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.types b/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.types new file mode 100644 index 0000000000..d0ff6e614d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals4.types @@ -0,0 +1,53 @@ +//// [tests/cases/compiler/augmentExportEquals4.ts] //// + +=== file1.ts === +class foo {} +>foo : import("file1.ts") + +namespace foo { +>foo : typeof import("file1.ts") + + export var v = 1; +>v : number +>1 : 1 +} +export = foo; +>foo : import("file1.ts") + +=== file2.ts === +import x = require("./file1"); +>x : typeof x + +x.b = 1; +>x.b = 1 : 1 +>x.b : number +>x : typeof x +>b : number +>1 : 1 + +// OK - './file1' is a namespace +declare module "./file1" { +>"./file1" : typeof x + + interface A { a } +>a : any + + let b: number; +>b : number +} + +=== file3.ts === +import * as x from "./file1"; +>x : typeof x + +import "./file2"; +let a: x.A; +>a : x.A +>x : any + +let b = x.b; +>b : number +>x.b : number +>x : typeof x +>b : number + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.js b/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.js new file mode 100644 index 0000000000..c316fdb891 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.js @@ -0,0 +1,91 @@ +//// [tests/cases/compiler/augmentExportEquals5.ts] //// + +//// [express.d.ts] +declare module Express { + export interface Request { } + export interface Response { } + export interface Application { } +} + +declare module "express" { + function e(): e.Express; + namespace e { + interface IRoute { + all(...handler: RequestHandler[]): IRoute; + } + + interface IRouterMatcher { + (name: string|RegExp, ...handlers: RequestHandler[]): T; + } + + interface IRouter extends RequestHandler { + route(path: string): IRoute; + } + + export function Router(options?: any): Router; + + export interface Router extends IRouter {} + + interface Errback { (err: Error): void; } + + interface Request extends Express.Request { + + get (name: string): string; + } + + interface Response extends Express.Response { + charset: string; + } + + interface ErrorRequestHandler { + (err: any, req: Request, res: Response, next: Function): any; + } + + interface RequestHandler { + (req: Request, res: Response, next: Function): any; + } + + interface Handler extends RequestHandler {} + + interface RequestParamHandler { + (req: Request, res: Response, next: Function, param: any): any; + } + + interface Application extends IRouter, Express.Application { + routes: any; + } + + interface Express extends Application { + createApplication(): Application; + } + + var static: any; + } + + export = e; +} + +//// [augmentation.ts] +/// +import * as e from "express"; +declare module "express" { + interface Request { + id: number; + } +} + +//// [consumer.ts] +import { Request } from "express"; +import "./augmentation"; +let x: Request; +const y = x.id; + +//// [augmentation.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//// [consumer.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +require("./augmentation"); +let x; +const y = x.id; diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.symbols b/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.symbols new file mode 100644 index 0000000000..b2bcb83b6f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.symbols @@ -0,0 +1,198 @@ +//// [tests/cases/compiler/augmentExportEquals5.ts] //// + +=== express.d.ts === +declare module Express { +>Express : Symbol(Express, Decl(express.d.ts, 0, 0)) + + export interface Request { } +>Request : Symbol(Request, Decl(express.d.ts, 0, 24)) + + export interface Response { } +>Response : Symbol(Response, Decl(express.d.ts, 1, 32)) + + export interface Application { } +>Application : Symbol(Application, Decl(express.d.ts, 2, 33)) +} + +declare module "express" { +>"express" : Symbol("express", Decl(express.d.ts, 4, 1)) + + function e(): e.Express; +>e : Symbol(e, Decl(express.d.ts, 6, 26), Decl(express.d.ts, 7, 28), Decl(augmentation.ts, 1, 29)) +>e : Symbol(e, Decl(express.d.ts, 6, 26), Decl(express.d.ts, 7, 28), Decl(augmentation.ts, 1, 29)) +>Express : Symbol(e.Express, Decl(express.d.ts, 52, 9)) + + namespace e { +>e : Symbol(e, Decl(express.d.ts, 6, 26), Decl(express.d.ts, 7, 28), Decl(augmentation.ts, 1, 29)) + + interface IRoute { +>IRoute : Symbol(IRoute, Decl(express.d.ts, 8, 17)) + + all(...handler: RequestHandler[]): IRoute; +>all : Symbol(IRoute.all, Decl(express.d.ts, 9, 26)) +>handler : Symbol(handler, Decl(express.d.ts, 10, 16)) +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 38, 9)) +>IRoute : Symbol(IRoute, Decl(express.d.ts, 8, 17)) + } + + interface IRouterMatcher { +>IRouterMatcher : Symbol(IRouterMatcher, Decl(express.d.ts, 11, 9)) +>T : Symbol(T, Decl(express.d.ts, 13, 33)) + + (name: string|RegExp, ...handlers: RequestHandler[]): T; +>name : Symbol(name, Decl(express.d.ts, 14, 13)) +>RegExp : Symbol(RegExp, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>handlers : Symbol(handlers, Decl(express.d.ts, 14, 33)) +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 38, 9)) +>T : Symbol(T, Decl(express.d.ts, 13, 33)) + } + + interface IRouter extends RequestHandler { +>IRouter : Symbol(IRouter, Decl(express.d.ts, 15, 9)) +>T : Symbol(T, Decl(express.d.ts, 17, 26)) +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 38, 9)) + + route(path: string): IRoute; +>route : Symbol(IRouter.route, Decl(express.d.ts, 17, 53)) +>path : Symbol(path, Decl(express.d.ts, 18, 18)) +>IRoute : Symbol(IRoute, Decl(express.d.ts, 8, 17)) + } + + export function Router(options?: any): Router; +>Router : Symbol(Router, Decl(express.d.ts, 19, 9), Decl(express.d.ts, 21, 54)) +>options : Symbol(options, Decl(express.d.ts, 21, 31)) +>Router : Symbol(Router, Decl(express.d.ts, 19, 9), Decl(express.d.ts, 21, 54)) + + export interface Router extends IRouter {} +>Router : Symbol(Router, Decl(express.d.ts, 19, 9), Decl(express.d.ts, 21, 54)) +>IRouter : Symbol(IRouter, Decl(express.d.ts, 15, 9)) +>Router : Symbol(Router, Decl(express.d.ts, 19, 9), Decl(express.d.ts, 21, 54)) + + interface Errback { (err: Error): void; } +>Errback : Symbol(Errback, Decl(express.d.ts, 23, 58)) +>err : Symbol(err, Decl(express.d.ts, 25, 29)) +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) + + interface Request extends Express.Request { +>Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26)) +>Express.Request : Symbol(Express.Request, Decl(express.d.ts, 0, 24)) +>Express : Symbol(Express, Decl(express.d.ts, 0, 0)) +>Request : Symbol(Express.Request, Decl(express.d.ts, 0, 24)) + + get (name: string): string; +>get : Symbol(Request.get, Decl(express.d.ts, 27, 51)) +>name : Symbol(name, Decl(express.d.ts, 29, 17)) + } + + interface Response extends Express.Response { +>Response : Symbol(Response, Decl(express.d.ts, 30, 9)) +>Express.Response : Symbol(Express.Response, Decl(express.d.ts, 1, 32)) +>Express : Symbol(Express, Decl(express.d.ts, 0, 0)) +>Response : Symbol(Express.Response, Decl(express.d.ts, 1, 32)) + + charset: string; +>charset : Symbol(Response.charset, Decl(express.d.ts, 32, 53)) + } + + interface ErrorRequestHandler { +>ErrorRequestHandler : Symbol(ErrorRequestHandler, Decl(express.d.ts, 34, 9)) + + (err: any, req: Request, res: Response, next: Function): any; +>err : Symbol(err, Decl(express.d.ts, 37, 13)) +>req : Symbol(req, Decl(express.d.ts, 37, 22)) +>Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26)) +>res : Symbol(res, Decl(express.d.ts, 37, 36)) +>Response : Symbol(Response, Decl(express.d.ts, 30, 9)) +>next : Symbol(next, Decl(express.d.ts, 37, 51)) +>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) + } + + interface RequestHandler { +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 38, 9)) + + (req: Request, res: Response, next: Function): any; +>req : Symbol(req, Decl(express.d.ts, 41, 13)) +>Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26)) +>res : Symbol(res, Decl(express.d.ts, 41, 26)) +>Response : Symbol(Response, Decl(express.d.ts, 30, 9)) +>next : Symbol(next, Decl(express.d.ts, 41, 41)) +>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) + } + + interface Handler extends RequestHandler {} +>Handler : Symbol(Handler, Decl(express.d.ts, 42, 9)) +>RequestHandler : Symbol(RequestHandler, Decl(express.d.ts, 38, 9)) + + interface RequestParamHandler { +>RequestParamHandler : Symbol(RequestParamHandler, Decl(express.d.ts, 44, 51)) + + (req: Request, res: Response, next: Function, param: any): any; +>req : Symbol(req, Decl(express.d.ts, 47, 13)) +>Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26)) +>res : Symbol(res, Decl(express.d.ts, 47, 26)) +>Response : Symbol(Response, Decl(express.d.ts, 30, 9)) +>next : Symbol(next, Decl(express.d.ts, 47, 41)) +>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>param : Symbol(param, Decl(express.d.ts, 47, 57)) + } + + interface Application extends IRouter, Express.Application { +>Application : Symbol(Application, Decl(express.d.ts, 48, 9)) +>IRouter : Symbol(IRouter, Decl(express.d.ts, 15, 9)) +>Application : Symbol(Application, Decl(express.d.ts, 48, 9)) +>Express.Application : Symbol(Express.Application, Decl(express.d.ts, 2, 33)) +>Express : Symbol(Express, Decl(express.d.ts, 0, 0)) +>Application : Symbol(Express.Application, Decl(express.d.ts, 2, 33)) + + routes: any; +>routes : Symbol(Application.routes, Decl(express.d.ts, 50, 81)) + } + + interface Express extends Application { +>Express : Symbol(Express, Decl(express.d.ts, 52, 9)) +>Application : Symbol(Application, Decl(express.d.ts, 48, 9)) + + createApplication(): Application; +>createApplication : Symbol(Express.createApplication, Decl(express.d.ts, 54, 47)) +>Application : Symbol(Application, Decl(express.d.ts, 48, 9)) + } + + var static: any; +>static : Symbol(static, Decl(express.d.ts, 58, 11)) + } + + export = e; +>e : Symbol(e, Decl(express.d.ts, 6, 26), Decl(express.d.ts, 7, 28), Decl(augmentation.ts, 1, 29)) +} + +=== augmentation.ts === +/// +import * as e from "express"; +>e : Symbol(e, Decl(augmentation.ts, 1, 6)) + +declare module "express" { +>"express" : Symbol(e, Decl(express.d.ts, 6, 26), Decl(express.d.ts, 7, 28), Decl(augmentation.ts, 1, 29)) + + interface Request { +>Request : Symbol(Request, Decl(express.d.ts, 25, 49), Decl(augmentation.ts, 2, 26)) + + id: number; +>id : Symbol(Request.id, Decl(augmentation.ts, 3, 23)) + } +} + +=== consumer.ts === +import { Request } from "express"; +>Request : Symbol(Request, Decl(consumer.ts, 0, 8)) + +import "./augmentation"; +let x: Request; +>x : Symbol(x, Decl(consumer.ts, 2, 3)) +>Request : Symbol(Request, Decl(consumer.ts, 0, 8)) + +const y = x.id; +>y : Symbol(y, Decl(consumer.ts, 3, 5)) +>x.id : Symbol(Request.id, Decl(augmentation.ts, 3, 23)) +>x : Symbol(x, Decl(consumer.ts, 2, 3)) +>id : Symbol(Request.id, Decl(augmentation.ts, 3, 23)) + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.types b/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.types new file mode 100644 index 0000000000..342c2a172e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals5.types @@ -0,0 +1,134 @@ +//// [tests/cases/compiler/augmentExportEquals5.ts] //// + +=== express.d.ts === +declare module Express { + export interface Request { } + export interface Response { } + export interface Application { } +} + +declare module "express" { +>"express" : typeof import("express") + + function e(): e.Express; +>e : typeof import("express.d.ts") +>e : any + + namespace e { +>e : typeof import("express.d.ts") + + interface IRoute { + all(...handler: RequestHandler[]): IRoute; +>all : (...handler: RequestHandler[]) => IRoute +>handler : RequestHandler[] + } + + interface IRouterMatcher { + (name: string|RegExp, ...handlers: RequestHandler[]): T; +>name : string | RegExp +>handlers : RequestHandler[] + } + + interface IRouter extends RequestHandler { + route(path: string): IRoute; +>route : (path: string) => IRoute +>path : string + } + + export function Router(options?: any): Router; +>Router : (options?: any) => Router +>options : any + + export interface Router extends IRouter {} + + interface Errback { (err: Error): void; } +>err : Error + + interface Request extends Express.Request { +>Express : any + + get (name: string): string; +>get : (name: string) => string +>name : string + } + + interface Response extends Express.Response { +>Express : any + + charset: string; +>charset : string + } + + interface ErrorRequestHandler { + (err: any, req: Request, res: Response, next: Function): any; +>err : any +>req : Request +>res : Response +>next : Function + } + + interface RequestHandler { + (req: Request, res: Response, next: Function): any; +>req : Request +>res : Response +>next : Function + } + + interface Handler extends RequestHandler {} + + interface RequestParamHandler { + (req: Request, res: Response, next: Function, param: any): any; +>req : Request +>res : Response +>next : Function +>param : any + } + + interface Application extends IRouter, Express.Application { +>Express : any + + routes: any; +>routes : any + } + + interface Express extends Application { + createApplication(): Application; +>createApplication : () => Application + } + + var static: any; +>static : any + } + + export = e; +>e : typeof import("express.d.ts") +} + +=== augmentation.ts === +/// +import * as e from "express"; +>e : typeof e + +declare module "express" { +>"express" : typeof import("express") + + interface Request { + id: number; +>id : number + } +} + +=== consumer.ts === +import { Request } from "express"; +>Request : any + +import "./augmentation"; +let x: Request; +>x : Request + +const y = x.id; +>y : number +>x.id : number +>x : Request +>id : number + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.js b/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.js new file mode 100644 index 0000000000..b55de356a7 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.js @@ -0,0 +1,88 @@ +//// [tests/cases/compiler/augmentExportEquals6.ts] //// + +//// [file1.ts] +class foo {} +namespace foo { + export class A {} + export namespace B { export let a; } +} +export = foo; + +//// [file2.ts] +import x = require("./file1"); +x.B.b = 1; + +// OK - './file1' is a namespace +declare module "./file1" { + interface A { a: number } + namespace B { + export let b: number; + } +} + +//// [file3.ts] +import * as x from "./file1"; +import "./file2"; +let a: x.A; +let b = a.a; +let c = x.B.b; + +//// [file1.js] +"use strict"; +class foo { +} +(function (foo) { + class A { + } + foo.A = A; + let B; + (function (B) { + })(B = foo.B || (foo.B = {})); +})(foo || (foo = {})); +module.exports = foo; +//// [file2.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const x = require("./file1"); +x.B.b = 1; +//// [file3.js] +"use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +const x = __importStar(require("./file1")); +require("./file2"); +let a; +let b = a.a; +let c = x.B.b; diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.js.diff b/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.js.diff new file mode 100644 index 0000000000..a2e50f5a74 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.js.diff @@ -0,0 +1,20 @@ +--- old.augmentExportEquals6.js ++++ new.augmentExportEquals6.js +@@= skipped -42, +42 lines =@@ + //// [file2.js] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-var x = require("./file1"); ++const x = require("./file1"); + x.B.b = 1; + //// [file3.js] + "use strict"; +@@= skipped -38, +38 lines =@@ + }; + })(); + Object.defineProperty(exports, "__esModule", { value: true }); +-var x = __importStar(require("./file1")); ++const x = __importStar(require("./file1")); + require("./file2"); + let a; + let b = a.a; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.symbols b/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.symbols new file mode 100644 index 0000000000..3174f41445 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.symbols @@ -0,0 +1,70 @@ +//// [tests/cases/compiler/augmentExportEquals6.ts] //// + +=== file1.ts === +class foo {} +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 10)) + +namespace foo { +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 10)) + + export class A {} +>A : Symbol(A, Decl(file1.ts, 1, 15), Decl(file2.ts, 4, 26)) + + export namespace B { export let a; } +>B : Symbol(B, Decl(file1.ts, 2, 21), Decl(file2.ts, 5, 29)) +>a : Symbol(a, Decl(file1.ts, 3, 35)) +} +export = foo; +>foo : Symbol(foo, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 10)) + +=== file2.ts === +import x = require("./file1"); +>x : Symbol(x, Decl(file2.ts, 0, 0)) + +x.B.b = 1; +>x.B.b : Symbol(x.B.b, Decl(file2.ts, 7, 18)) +>x.B : Symbol(x.B, Decl(file1.ts, 2, 21), Decl(file2.ts, 5, 29)) +>x : Symbol(x, Decl(file2.ts, 0, 0)) +>B : Symbol(x.B, Decl(file1.ts, 2, 21), Decl(file2.ts, 5, 29)) +>b : Symbol(x.B.b, Decl(file2.ts, 7, 18)) + +// OK - './file1' is a namespace +declare module "./file1" { +>"./file1" : Symbol(x, Decl(file1.ts, 0, 0), Decl(file1.ts, 0, 12), Decl(file2.ts, 1, 10)) + + interface A { a: number } +>A : Symbol(A, Decl(file1.ts, 1, 15), Decl(file2.ts, 4, 26)) +>a : Symbol(A.a, Decl(file2.ts, 5, 17)) + + namespace B { +>B : Symbol(B, Decl(file1.ts, 2, 21), Decl(file2.ts, 5, 29)) + + export let b: number; +>b : Symbol(b, Decl(file2.ts, 7, 18)) + } +} + +=== file3.ts === +import * as x from "./file1"; +>x : Symbol(x, Decl(file3.ts, 0, 6)) + +import "./file2"; +let a: x.A; +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>A : Symbol(x.A, Decl(file1.ts, 1, 15), Decl(file2.ts, 4, 26)) + +let b = a.a; +>b : Symbol(b, Decl(file3.ts, 3, 3)) +>a.a : Symbol(x.A.a, Decl(file2.ts, 5, 17)) +>a : Symbol(a, Decl(file3.ts, 2, 3)) +>a : Symbol(x.A.a, Decl(file2.ts, 5, 17)) + +let c = x.B.b; +>c : Symbol(c, Decl(file3.ts, 4, 3)) +>x.B.b : Symbol(x.B.b, Decl(file2.ts, 7, 18)) +>x.B : Symbol(x.B, Decl(file1.ts, 2, 21), Decl(file2.ts, 5, 29)) +>x : Symbol(x, Decl(file3.ts, 0, 6)) +>B : Symbol(x.B, Decl(file1.ts, 2, 21), Decl(file2.ts, 5, 29)) +>b : Symbol(x.B.b, Decl(file2.ts, 7, 18)) + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.types b/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.types new file mode 100644 index 0000000000..bf067695df --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals6.types @@ -0,0 +1,70 @@ +//// [tests/cases/compiler/augmentExportEquals6.ts] //// + +=== file1.ts === +class foo {} +>foo : import("file1.ts") + +namespace foo { +>foo : typeof import("file1.ts") + + export class A {} +>A : A + + export namespace B { export let a; } +>B : typeof B +>a : any +} +export = foo; +>foo : import("file1.ts") + +=== file2.ts === +import x = require("./file1"); +>x : typeof x + +x.B.b = 1; +>x.B.b = 1 : 1 +>x.B.b : number +>x.B : typeof x.B +>x : typeof x +>B : typeof x.B +>b : number +>1 : 1 + +// OK - './file1' is a namespace +declare module "./file1" { +>"./file1" : typeof x + + interface A { a: number } +>a : number + + namespace B { +>B : typeof B + + export let b: number; +>b : number + } +} + +=== file3.ts === +import * as x from "./file1"; +>x : typeof x + +import "./file2"; +let a: x.A; +>a : x.A +>x : any + +let b = a.a; +>b : number +>a.a : number +>a : x.A +>a : number + +let c = x.B.b; +>c : number +>x.B.b : number +>x.B : typeof x.B +>x : typeof x +>B : typeof x.B +>b : number + diff --git a/testdata/baselines/reference/submodule/compiler/augmentExportEquals7.types b/testdata/baselines/reference/submodule/compiler/augmentExportEquals7.types index fdc26b6a99..3e593cce90 100644 --- a/testdata/baselines/reference/submodule/compiler/augmentExportEquals7.types +++ b/testdata/baselines/reference/submodule/compiler/augmentExportEquals7.types @@ -10,7 +10,7 @@ export = lib; === /node_modules/@types/lib-extender/index.d.ts === import * as lib from "lib"; ->lib : () => void +>lib : { default: () => void; } declare module "lib" { >"lib" : typeof import("lib") diff --git a/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.errors.txt b/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.errors.txt new file mode 100644 index 0000000000..3e8f387229 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.errors.txt @@ -0,0 +1,12 @@ +badExternalModuleReference.ts(1,21): error TS2307: Cannot find module 'garbage' or its corresponding type declarations. + + +==== badExternalModuleReference.ts (1 errors) ==== + import a1 = require("garbage"); + ~~~~~~~~~ +!!! error TS2307: Cannot find module 'garbage' or its corresponding type declarations. + export declare var a: { + test1: a1.connectModule; + (): a1.connectExport; + }; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.js b/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.js new file mode 100644 index 0000000000..017e5d940f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.js @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/badExternalModuleReference.ts] //// + +//// [badExternalModuleReference.ts] +import a1 = require("garbage"); +export declare var a: { + test1: a1.connectModule; + (): a1.connectExport; +}; + + +//// [badExternalModuleReference.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.symbols b/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.symbols new file mode 100644 index 0000000000..ab6bf58442 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.symbols @@ -0,0 +1,20 @@ +//// [tests/cases/compiler/badExternalModuleReference.ts] //// + +=== badExternalModuleReference.ts === +import a1 = require("garbage"); +>a1 : Symbol(a1, Decl(badExternalModuleReference.ts, 0, 0)) + +export declare var a: { +>a : Symbol(a, Decl(badExternalModuleReference.ts, 1, 18)) + + test1: a1.connectModule; +>test1 : Symbol(test1, Decl(badExternalModuleReference.ts, 1, 23)) +>a1 : Symbol(a1, Decl(badExternalModuleReference.ts, 0, 0)) +>connectModule : Symbol(a1.connectModule) + + (): a1.connectExport; +>a1 : Symbol(a1, Decl(badExternalModuleReference.ts, 0, 0)) +>connectExport : Symbol(a1.connectExport) + +}; + diff --git a/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.types b/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.types new file mode 100644 index 0000000000..54e647d16d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/badExternalModuleReference.types @@ -0,0 +1,18 @@ +//// [tests/cases/compiler/badExternalModuleReference.ts] //// + +=== badExternalModuleReference.ts === +import a1 = require("garbage"); +>a1 : any + +export declare var a: { +>a : { (): a1.connectExport; test1: a1.connectModule; } + + test1: a1.connectModule; +>test1 : a1.connectModule +>a1 : any + + (): a1.connectExport; +>a1 : any + +}; + diff --git a/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.errors.txt b/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.errors.txt deleted file mode 100644 index ea94961d68..0000000000 --- a/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.errors.txt +++ /dev/null @@ -1,9 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== c.ts (0 errors) ==== - let foo: typeof C; -==== b.ts (0 errors) ==== - class C { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.symbols b/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.symbols deleted file mode 100644 index 4fa4569b62..0000000000 --- a/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.symbols +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/blockScopedClassDeclarationAcrossFiles.ts] //// - -=== c.ts === -let foo: typeof C; ->foo : Symbol(foo, Decl(c.ts, 0, 3)) ->C : Symbol(C, Decl(b.ts, 0, 0)) - -=== b.ts === -class C { } ->C : Symbol(C, Decl(b.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.types b/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.types deleted file mode 100644 index 1da2a72801..0000000000 --- a/testdata/baselines/reference/submodule/compiler/blockScopedClassDeclarationAcrossFiles.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/blockScopedClassDeclarationAcrossFiles.ts] //// - -=== c.ts === -let foo: typeof C; ->foo : typeof C ->C : typeof C - -=== b.ts === -class C { } ->C : C - diff --git a/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.errors.txt b/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.errors.txt new file mode 100644 index 0000000000..f958ba0e05 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.errors.txt @@ -0,0 +1,12 @@ +blockScopedFunctionDeclarationInStrictModule.ts(6,10): error TS2304: Cannot find name 'foo'. + + +==== blockScopedFunctionDeclarationInStrictModule.ts (1 errors) ==== + if (true) { + function foo() { } + foo(); // ok + } + + export = foo; // not ok + ~~~ +!!! error TS2304: Cannot find name 'foo'. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.js b/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.js new file mode 100644 index 0000000000..e7c00bb07a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.js @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts] //// + +//// [blockScopedFunctionDeclarationInStrictModule.ts] +if (true) { + function foo() { } + foo(); // ok +} + +export = foo; // not ok + +//// [blockScopedFunctionDeclarationInStrictModule.js] +"use strict"; +if (true) { + function foo() { } + foo(); // ok +} +module.exports = foo; diff --git a/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.symbols b/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.symbols new file mode 100644 index 0000000000..b21eec9de5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.symbols @@ -0,0 +1,12 @@ +//// [tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts] //// + +=== blockScopedFunctionDeclarationInStrictModule.ts === +if (true) { + function foo() { } +>foo : Symbol(foo, Decl(blockScopedFunctionDeclarationInStrictModule.ts, 0, 11)) + + foo(); // ok +>foo : Symbol(foo, Decl(blockScopedFunctionDeclarationInStrictModule.ts, 0, 11)) +} + +export = foo; // not ok diff --git a/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.types b/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.types new file mode 100644 index 0000000000..8adbd07915 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/blockScopedFunctionDeclarationInStrictModule.types @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/blockScopedFunctionDeclarationInStrictModule.ts] //// + +=== blockScopedFunctionDeclarationInStrictModule.ts === +if (true) { +>true : true + + function foo() { } +>foo : () => void + + foo(); // ok +>foo() : void +>foo : () => void +} + +export = foo; // not ok +>foo : any + diff --git a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.errors.txt b/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.errors.txt deleted file mode 100644 index dea88727d4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== index.ts (0 errors) ==== - export * from "./nested"; - -==== nested/base.ts (0 errors) ==== - import { B } from "./shared"; - - export function f() { - return new B(); - } - -==== nested/derived.ts (0 errors) ==== - import { f } from "./base"; - - export function g() { - return f(); - } - -==== nested/index.ts (0 errors) ==== - export * from "./base"; - - export * from "./derived"; - export * from "./shared"; - -==== nested/shared.ts (0 errors) ==== - export class B {} - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.symbols b/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.symbols deleted file mode 100644 index be9a646ce5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.symbols +++ /dev/null @@ -1,39 +0,0 @@ -//// [tests/cases/compiler/bundledDtsLateExportRenaming.ts] //// - -=== index.ts === - -export * from "./nested"; - -=== nested/base.ts === -import { B } from "./shared"; ->B : Symbol(B, Decl(base.ts, 0, 8)) - -export function f() { ->f : Symbol(f, Decl(base.ts, 0, 29)) - - return new B(); ->B : Symbol(B, Decl(base.ts, 0, 8)) -} - -=== nested/derived.ts === -import { f } from "./base"; ->f : Symbol(f, Decl(derived.ts, 0, 8)) - -export function g() { ->g : Symbol(g, Decl(derived.ts, 0, 27)) - - return f(); ->f : Symbol(f, Decl(derived.ts, 0, 8)) -} - -=== nested/index.ts === - -export * from "./base"; - -export * from "./derived"; -export * from "./shared"; - -=== nested/shared.ts === -export class B {} ->B : Symbol(B, Decl(shared.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types b/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types deleted file mode 100644 index b9593cea1a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/bundledDtsLateExportRenaming.types +++ /dev/null @@ -1,41 +0,0 @@ -//// [tests/cases/compiler/bundledDtsLateExportRenaming.ts] //// - -=== index.ts === - -export * from "./nested"; - -=== nested/base.ts === -import { B } from "./shared"; ->B : typeof B - -export function f() { ->f : () => B - - return new B(); ->new B() : B ->B : typeof B -} - -=== nested/derived.ts === -import { f } from "./base"; ->f : () => import("index").B - -export function g() { ->g : () => import("index").B - - return f(); ->f() : import("index").B ->f : () => import("index").B -} - -=== nested/index.ts === - -export * from "./base"; - -export * from "./derived"; -export * from "./shared"; - -=== nested/shared.ts === -export class B {} ->B : B - diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.errors.txt b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.errors.txt deleted file mode 100644 index ad281922cc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - -==== /a/b/foo.d.ts (0 errors) ==== - export declare let x: number - -==== /a/b/c/d/e/app.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - -==== /a/b/c/lib.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.errors.txt.diff deleted file mode 100644 index 4ea4f7b5fc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.cachedModuleResolution3.errors.txt -+++ new.cachedModuleResolution3.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+ -+ -+==== /a/b/foo.d.ts (0 errors) ==== -+ export declare let x: number -+ -+==== /a/b/c/d/e/app.ts (1 errors) ==== -+ import {x} from "foo"; -+ ~~~~~ -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+ -+==== /a/b/c/lib.ts (1 errors) ==== -+ import {x} from "foo"; -+ ~~~~~ -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.js b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.js deleted file mode 100644 index 3fce23e3f2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.js +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution3.ts] //// - -//// [foo.d.ts] -export declare let x: number - -//// [app.ts] -import {x} from "foo"; - -//// [lib.ts] -import {x} from "foo"; - -//// [app.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [lib.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.symbols b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.symbols deleted file mode 100644 index cce7b24eb2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution3.ts] //// - -=== /a/b/foo.d.ts === -export declare let x: number ->x : Symbol(x, Decl(foo.d.ts, 0, 18)) - -=== /a/b/c/d/e/app.ts === -import {x} from "foo"; ->x : Symbol(x, Decl(app.ts, 0, 8)) - -=== /a/b/c/lib.ts === -import {x} from "foo"; ->x : Symbol(x, Decl(lib.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.trace.json b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.trace.json deleted file mode 100644 index 8090b18e29..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.trace.json +++ /dev/null @@ -1,54 +0,0 @@ -======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/a/b/c/d/e/package.json' does not exist. -File '/a/b/c/d/package.json' does not exist. -File '/a/b/c/package.json' does not exist. -File '/a/b/package.json' does not exist. -File '/a/package.json' does not exist. -File '/package.json' does not exist. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/e/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== -======== Resolving module 'foo' from '/a/b/c/lib.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/a/b/c/package.json' does not exist according to earlier cached lookups. -File '/a/b/package.json' does not exist according to earlier cached lookups. -File '/a/package.json' does not exist according to earlier cached lookups. -File '/package.json' does not exist according to earlier cached lookups. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.types b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.types deleted file mode 100644 index 141f909a5c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution3.ts] //// - -=== /a/b/foo.d.ts === -export declare let x: number ->x : number - -=== /a/b/c/d/e/app.ts === -import {x} from "foo"; ->x : any - -=== /a/b/c/lib.ts === -import {x} from "foo"; ->x : any - diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.types.diff b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.types.diff deleted file mode 100644 index 32e0765a47..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution3.types.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- old.cachedModuleResolution3.types -+++ new.cachedModuleResolution3.types -@@= skipped -5, +5 lines =@@ - - === /a/b/c/d/e/app.ts === - import {x} from "foo"; -->x : number -+>x : any - - === /a/b/c/lib.ts === - import {x} from "foo"; -->x : number -+>x : any diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.errors.txt b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.errors.txt deleted file mode 100644 index 7a9cb71715..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - -==== /a/b/foo.d.ts (0 errors) ==== - export declare let x: number - -==== /a/b/c/lib.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - -==== /a/b/c/d/e/app.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.errors.txt.diff deleted file mode 100644 index fec64eb7a9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.cachedModuleResolution4.errors.txt -+++ new.cachedModuleResolution4.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+ -+ -+==== /a/b/foo.d.ts (0 errors) ==== -+ export declare let x: number -+ -+==== /a/b/c/lib.ts (1 errors) ==== -+ import {x} from "foo"; -+ ~~~~~ -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+ -+==== /a/b/c/d/e/app.ts (1 errors) ==== -+ import {x} from "foo"; -+ ~~~~~ -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.js b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.js deleted file mode 100644 index 2236fdf34c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.js +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution4.ts] //// - -//// [foo.d.ts] -export declare let x: number - -//// [lib.ts] -import {x} from "foo"; - -//// [app.ts] -import {x} from "foo"; - - -//// [lib.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [app.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.symbols b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.symbols deleted file mode 100644 index a377de8c86..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution4.ts] //// - -=== /a/b/foo.d.ts === -export declare let x: number ->x : Symbol(x, Decl(foo.d.ts, 0, 18)) - -=== /a/b/c/lib.ts === -import {x} from "foo"; ->x : Symbol(x, Decl(lib.ts, 0, 8)) - -=== /a/b/c/d/e/app.ts === -import {x} from "foo"; ->x : Symbol(x, Decl(app.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.trace.json b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.trace.json deleted file mode 100644 index aa92ef4940..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.trace.json +++ /dev/null @@ -1,54 +0,0 @@ -======== Resolving module 'foo' from '/a/b/c/lib.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/a/b/c/package.json' does not exist. -File '/a/b/package.json' does not exist. -File '/a/package.json' does not exist. -File '/package.json' does not exist. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== -======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/a/b/c/d/e/package.json' does not exist. -File '/a/b/c/d/package.json' does not exist. -File '/a/b/c/package.json' does not exist according to earlier cached lookups. -File '/a/b/package.json' does not exist according to earlier cached lookups. -File '/a/package.json' does not exist according to earlier cached lookups. -File '/package.json' does not exist according to earlier cached lookups. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/e/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.types b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.types deleted file mode 100644 index b2088fa5ef..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution4.ts] //// - -=== /a/b/foo.d.ts === -export declare let x: number ->x : number - -=== /a/b/c/lib.ts === -import {x} from "foo"; ->x : any - -=== /a/b/c/d/e/app.ts === -import {x} from "foo"; ->x : any - diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.types.diff b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.types.diff deleted file mode 100644 index bc816a5ea7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution4.types.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- old.cachedModuleResolution4.types -+++ new.cachedModuleResolution4.types -@@= skipped -5, +5 lines =@@ - - === /a/b/c/lib.ts === - import {x} from "foo"; -->x : number -+>x : any - - === /a/b/c/d/e/app.ts === - import {x} from "foo"; -->x : number -+>x : any diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.errors.txt b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.errors.txt deleted file mode 100644 index e80de6969f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.errors.txt +++ /dev/null @@ -1,13 +0,0 @@ -/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - -==== /a/b/c/d/e/app.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - -==== /a/b/c/lib.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.errors.txt.diff deleted file mode 100644 index bd593cdfe9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.cachedModuleResolution8.errors.txt -+++ new.cachedModuleResolution8.errors.txt -@@= skipped -0, +0 lines =@@ --/a/b/c/d/e/app.ts(1,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --/a/b/c/lib.ts(1,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - - ==== /a/b/c/d/e/app.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - ==== /a/b/c/lib.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.js b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.js deleted file mode 100644 index c071c1dbf9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.js +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution8.ts] //// - -//// [app.ts] -import {x} from "foo"; - -//// [lib.ts] -import {x} from "foo"; - -//// [app.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [lib.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.symbols b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.symbols deleted file mode 100644 index 73d8ce998f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution8.ts] //// - -=== /a/b/c/d/e/app.ts === -import {x} from "foo"; ->x : Symbol(x, Decl(app.ts, 0, 8)) - -=== /a/b/c/lib.ts === -import {x} from "foo"; ->x : Symbol(x, Decl(lib.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.trace.json b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.trace.json deleted file mode 100644 index 8090b18e29..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.trace.json +++ /dev/null @@ -1,54 +0,0 @@ -======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/a/b/c/d/e/package.json' does not exist. -File '/a/b/c/d/package.json' does not exist. -File '/a/b/c/package.json' does not exist. -File '/a/b/package.json' does not exist. -File '/a/package.json' does not exist. -File '/package.json' does not exist. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/e/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== -======== Resolving module 'foo' from '/a/b/c/lib.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/a/b/c/package.json' does not exist according to earlier cached lookups. -File '/a/b/package.json' does not exist according to earlier cached lookups. -File '/a/package.json' does not exist according to earlier cached lookups. -File '/package.json' does not exist according to earlier cached lookups. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.types b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.types deleted file mode 100644 index 8ccd2f6024..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution8.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution8.ts] //// - -=== /a/b/c/d/e/app.ts === -import {x} from "foo"; ->x : any - -=== /a/b/c/lib.ts === -import {x} from "foo"; ->x : any - diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.errors.txt b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.errors.txt deleted file mode 100644 index 0dc795af6b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - -==== /a/b/c/lib.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - -==== /a/b/c/d/e/app.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.errors.txt.diff deleted file mode 100644 index d820f0f522..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.errors.txt.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- old.cachedModuleResolution9.errors.txt -+++ new.cachedModuleResolution9.errors.txt -@@= skipped -0, +0 lines =@@ --/a/b/c/d/e/app.ts(1,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --/a/b/c/lib.ts(1,17): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+/a/b/c/d/e/app.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+/a/b/c/lib.ts(1,17): error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - - ==== /a/b/c/lib.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - - ==== /a/b/c/d/e/app.ts (1 errors) ==== - import {x} from "foo"; - ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.js b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.js deleted file mode 100644 index 17ef035df3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.js +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution9.ts] //// - -//// [lib.ts] -import {x} from "foo"; - - -//// [app.ts] -import {x} from "foo"; - - -//// [lib.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [app.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.symbols b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.symbols deleted file mode 100644 index 266ca70eaf..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.symbols +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution9.ts] //// - -=== /a/b/c/lib.ts === -import {x} from "foo"; ->x : Symbol(x, Decl(lib.ts, 0, 8)) - - -=== /a/b/c/d/e/app.ts === -import {x} from "foo"; ->x : Symbol(x, Decl(app.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.trace.json b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.trace.json deleted file mode 100644 index aa92ef4940..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.trace.json +++ /dev/null @@ -1,54 +0,0 @@ -======== Resolving module 'foo' from '/a/b/c/lib.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/a/b/c/package.json' does not exist. -File '/a/b/package.json' does not exist. -File '/a/package.json' does not exist. -File '/package.json' does not exist. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== -======== Resolving module 'foo' from '/a/b/c/d/e/app.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/a/b/c/d/e/package.json' does not exist. -File '/a/b/c/d/package.json' does not exist. -File '/a/b/c/package.json' does not exist according to earlier cached lookups. -File '/a/b/package.json' does not exist according to earlier cached lookups. -File '/a/package.json' does not exist according to earlier cached lookups. -File '/package.json' does not exist according to earlier cached lookups. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/e/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/a/b/c/d/e/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/d/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/c/node_modules' does not exist, skipping all lookups in it. -Directory '/a/b/node_modules' does not exist, skipping all lookups in it. -Directory '/a/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.types b/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.types deleted file mode 100644 index e448995d1a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/cachedModuleResolution9.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/cachedModuleResolution9.ts] //// - -=== /a/b/c/lib.ts === -import {x} from "foo"; ->x : any - - -=== /a/b/c/d/e/app.ts === -import {x} from "foo"; ->x : any - diff --git a/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.errors.txt b/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.errors.txt deleted file mode 100644 index 91e5fd5a6c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.errors.txt +++ /dev/null @@ -1,29 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -weird.js(1,1): error TS2552: Cannot find name 'someFunction'. Did you mean 'Function'? -weird.js(1,23): error TS7006: Parameter 'BaseClass' implicitly has an 'any' type. -weird.js(9,17): error TS7006: Parameter 'error' implicitly has an 'any' type. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== weird.js (3 errors) ==== - someFunction(function(BaseClass) { - ~~~~~~~~~~~~ -!!! error TS2552: Cannot find name 'someFunction'. Did you mean 'Function'? -!!! related TS2728 lib.es5.d.ts:--:--: 'Function' is declared here. - ~~~~~~~~~ -!!! error TS7006: Parameter 'BaseClass' implicitly has an 'any' type. - 'use strict'; - const DEFAULT_MESSAGE = "nop!"; - class Hello extends BaseClass { - constructor() { - super(); - this.foo = "bar"; - } - _render(error) { - ~~~~~ -!!! error TS7006: Parameter 'error' implicitly has an 'any' type. - const message = error.message || DEFAULT_MESSAGE; - } - } - }); - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.symbols b/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.symbols deleted file mode 100644 index 99ddd57e9d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.symbols +++ /dev/null @@ -1,33 +0,0 @@ -//// [tests/cases/compiler/checkIndexConstraintOfJavascriptClassExpression.ts] //// - -=== weird.js === -someFunction(function(BaseClass) { ->BaseClass : Symbol(BaseClass, Decl(weird.js, 0, 22)) - - 'use strict'; - const DEFAULT_MESSAGE = "nop!"; ->DEFAULT_MESSAGE : Symbol(DEFAULT_MESSAGE, Decl(weird.js, 2, 9)) - - class Hello extends BaseClass { ->Hello : Symbol(Hello, Decl(weird.js, 2, 35)) ->BaseClass : Symbol(BaseClass, Decl(weird.js, 0, 22)) - - constructor() { - super(); - this.foo = "bar"; ->this.foo : Symbol(Hello.foo, Decl(weird.js, 5, 20)) ->this : Symbol(Hello, Decl(weird.js, 2, 35)) ->foo : Symbol(Hello.foo, Decl(weird.js, 5, 20)) - } - _render(error) { ->_render : Symbol(Hello._render, Decl(weird.js, 7, 9)) ->error : Symbol(error, Decl(weird.js, 8, 16)) - - const message = error.message || DEFAULT_MESSAGE; ->message : Symbol(message, Decl(weird.js, 9, 17)) ->error : Symbol(error, Decl(weird.js, 8, 16)) ->DEFAULT_MESSAGE : Symbol(DEFAULT_MESSAGE, Decl(weird.js, 2, 9)) - } - } -}); - diff --git a/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.types b/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.types deleted file mode 100644 index 7f98768cc3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/checkIndexConstraintOfJavascriptClassExpression.types +++ /dev/null @@ -1,47 +0,0 @@ -//// [tests/cases/compiler/checkIndexConstraintOfJavascriptClassExpression.ts] //// - -=== weird.js === -someFunction(function(BaseClass) { ->someFunction(function(BaseClass) { 'use strict'; const DEFAULT_MESSAGE = "nop!"; class Hello extends BaseClass { constructor() { super(); this.foo = "bar"; } _render(error) { const message = error.message || DEFAULT_MESSAGE; } }}) : any ->someFunction : any ->function(BaseClass) { 'use strict'; const DEFAULT_MESSAGE = "nop!"; class Hello extends BaseClass { constructor() { super(); this.foo = "bar"; } _render(error) { const message = error.message || DEFAULT_MESSAGE; } }} : (BaseClass: any) => void ->BaseClass : any - - 'use strict'; ->'use strict' : "use strict" - - const DEFAULT_MESSAGE = "nop!"; ->DEFAULT_MESSAGE : "nop!" ->"nop!" : "nop!" - - class Hello extends BaseClass { ->Hello : Hello ->BaseClass : any - - constructor() { - super(); ->super() : void ->super : any - - this.foo = "bar"; ->this.foo = "bar" : "bar" ->this.foo : any ->this : this ->foo : any ->"bar" : "bar" - } - _render(error) { ->_render : (error: any) => void ->error : any - - const message = error.message || DEFAULT_MESSAGE; ->message : any ->error.message || DEFAULT_MESSAGE : any ->error.message : any ->error : any ->message : any ->DEFAULT_MESSAGE : "nop!" - } - } -}); - diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.js b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.js index 6bf89996a4..ad2d034a27 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.js +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.js @@ -30,6 +30,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { c: false }; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); a_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.js.diff b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.js.diff index 962b43db5d..d196532b84 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.js.diff +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment1.js.diff @@ -1,9 +1,9 @@ --- old.checkJsdocTypeTagOnExportAssignment1.js +++ new.checkJsdocTypeTagOnExportAssignment1.js -@@= skipped -30, +30 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -33, +33 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); a_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.js b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.js index b7428a229c..cb7d1e31ee 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.js +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.js @@ -28,6 +28,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { c: false }; //// [c.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const b_1 = require("./b"); +const b_1 = __importDefault(require("./b")); b_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.js.diff b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.js.diff index f4362a6e7c..6238a28034 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment2.js.diff @@ -1,9 +1,9 @@ --- old.checkJsdocTypeTagOnExportAssignment2.js +++ new.checkJsdocTypeTagOnExportAssignment2.js -@@= skipped -28, +28 lines =@@ - //// [c.js] - "use strict"; +@@= skipped -31, +31 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var b_1 = require("./b"); -+const b_1 = require("./b"); +-var b_1 = __importDefault(require("./b")); ++const b_1 = __importDefault(require("./b")); b_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment3.js b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment3.js index 6205b8fe2e..f97a3ac134 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment3.js +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment3.js @@ -33,6 +33,9 @@ const bar = { c: 1 }; exports.default = bar; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); a_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment3.js.diff b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment3.js.diff index df954aac94..77c151c3e4 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment3.js.diff +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment3.js.diff @@ -1,9 +1,9 @@ --- old.checkJsdocTypeTagOnExportAssignment3.js +++ new.checkJsdocTypeTagOnExportAssignment3.js -@@= skipped -33, +33 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -36, +36 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); a_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.js b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.js index 25a7b3dae7..88badb94e9 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.js +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.js @@ -30,6 +30,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { a: 1, b: 1 }; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); a_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.js.diff b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.js.diff index b7331afe3b..1c86e1e49b 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.js.diff +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment5.js.diff @@ -1,9 +1,9 @@ --- old.checkJsdocTypeTagOnExportAssignment5.js +++ new.checkJsdocTypeTagOnExportAssignment5.js -@@= skipped -30, +30 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -33, +33 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); a_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.js b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.js index 7dce488e36..dbdd725c30 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.js +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.js @@ -30,6 +30,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { a: 1, b: 1, c: 1 }; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); a_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.js.diff b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.js.diff index 93ac1ae858..d7bf707e0f 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.js.diff +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment6.js.diff @@ -1,9 +1,9 @@ --- old.checkJsdocTypeTagOnExportAssignment6.js +++ new.checkJsdocTypeTagOnExportAssignment6.js -@@= skipped -30, +30 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -33, +33 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); a_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment7.js b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment7.js index 2c00033c88..c77ce904d2 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment7.js +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment7.js @@ -33,6 +33,9 @@ const abc = { a: 1, b: 1, c: 1 }; exports.default = abc; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); a_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment7.js.diff b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment7.js.diff index 852115e2a2..ed5775a164 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment7.js.diff +++ b/testdata/baselines/reference/submodule/compiler/checkJsdocTypeTagOnExportAssignment7.js.diff @@ -1,9 +1,9 @@ --- old.checkJsdocTypeTagOnExportAssignment7.js +++ new.checkJsdocTypeTagOnExportAssignment7.js -@@= skipped -33, +33 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -36, +36 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); a_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/checkJsxNotSetError.js b/testdata/baselines/reference/submodule/compiler/checkJsxNotSetError.js index c5c1f56860..27e6c7df59 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsxNotSetError.js +++ b/testdata/baselines/reference/submodule/compiler/checkJsxNotSetError.js @@ -17,6 +17,9 @@ const Foo = () => (
foo
); exports.default = Foo; //// [bar.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const foo_1 = require("/foo"); +const foo_1 = __importDefault(require("/foo")); const a = ; diff --git a/testdata/baselines/reference/submodule/compiler/checkJsxNotSetError.js.diff b/testdata/baselines/reference/submodule/compiler/checkJsxNotSetError.js.diff index 553d172c82..ee74eaaf13 100644 --- a/testdata/baselines/reference/submodule/compiler/checkJsxNotSetError.js.diff +++ b/testdata/baselines/reference/submodule/compiler/checkJsxNotSetError.js.diff @@ -1,9 +1,9 @@ --- old.checkJsxNotSetError.js +++ new.checkJsxNotSetError.js -@@= skipped -17, +17 lines =@@ - //// [bar.js] - "use strict"; +@@= skipped -20, +20 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var foo_1 = require("/foo"); -+const foo_1 = require("/foo"); +-var foo_1 = __importDefault(require("/foo")); ++const foo_1 = __importDefault(require("/foo")); const a = ; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.errors.txt b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.errors.txt new file mode 100644 index 0000000000..8a030e687c --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.errors.txt @@ -0,0 +1,24 @@ +collisionExportsRequireAndAlias_file2.ts(1,8): error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module. +collisionExportsRequireAndAlias_file2.ts(2,8): error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module. + + +==== collisionExportsRequireAndAlias_file2.ts (2 errors) ==== + import require = require('./collisionExportsRequireAndAlias_file1'); // Error + ~~~~~~~ +!!! error TS2441: Duplicate identifier 'require'. Compiler reserves name 'require' in top level scope of a module. + import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error + ~~~~~~~ +!!! error TS2441: Duplicate identifier 'exports'. Compiler reserves name 'exports' in top level scope of a module. + export function foo() { + require.bar(); + } + export function foo2() { + exports.bar2(); + } +==== collisionExportsRequireAndAlias_file1.ts (0 errors) ==== + export function bar() { + } + +==== collisionExportsRequireAndAlias_file3333.ts (0 errors) ==== + export function bar2() { + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.js b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.js new file mode 100644 index 0000000000..45cf142de2 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.js @@ -0,0 +1,44 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAlias.ts] //// + +//// [collisionExportsRequireAndAlias_file1.ts] +export function bar() { +} + +//// [collisionExportsRequireAndAlias_file3333.ts] +export function bar2() { +} +//// [collisionExportsRequireAndAlias_file2.ts] +import require = require('./collisionExportsRequireAndAlias_file1'); // Error +import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error +export function foo() { + require.bar(); +} +export function foo2() { + exports.bar2(); +} + +//// [collisionExportsRequireAndAlias_file1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.bar = bar; +function bar() { +} +//// [collisionExportsRequireAndAlias_file3333.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.bar2 = bar2; +function bar2() { +} +//// [collisionExportsRequireAndAlias_file2.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.foo = foo; +exports.foo2 = foo2; +const require = require("./collisionExportsRequireAndAlias_file1"); // Error +const exports = require("./collisionExportsRequireAndAlias_file3333"); // Error +function foo() { + require.bar(); +} +function foo2() { + exports.bar2(); +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.js.diff b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.js.diff new file mode 100644 index 0000000000..400f530342 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.js.diff @@ -0,0 +1,13 @@ +--- old.collisionExportsRequireAndAlias.js ++++ new.collisionExportsRequireAndAlias.js +@@= skipped -33, +33 lines =@@ + Object.defineProperty(exports, "__esModule", { value: true }); + exports.foo = foo; + exports.foo2 = foo2; +-var require = require("./collisionExportsRequireAndAlias_file1"); // Error +-var exports = require("./collisionExportsRequireAndAlias_file3333"); // Error ++const require = require("./collisionExportsRequireAndAlias_file1"); // Error ++const exports = require("./collisionExportsRequireAndAlias_file3333"); // Error + function foo() { + require.bar(); + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.symbols b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.symbols new file mode 100644 index 0000000000..471d8d7742 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.symbols @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAlias.ts] //// + +=== collisionExportsRequireAndAlias_file2.ts === +import require = require('./collisionExportsRequireAndAlias_file1'); // Error +>require : Symbol(require, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 0)) + +import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error +>exports : Symbol(exports, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 68)) + +export function foo() { +>foo : Symbol(foo, Decl(collisionExportsRequireAndAlias_file2.ts, 1, 71)) + + require.bar(); +>require.bar : Symbol(require.bar, Decl(collisionExportsRequireAndAlias_file1.ts, 0, 0)) +>require : Symbol(require, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 0)) +>bar : Symbol(require.bar, Decl(collisionExportsRequireAndAlias_file1.ts, 0, 0)) +} +export function foo2() { +>foo2 : Symbol(foo2, Decl(collisionExportsRequireAndAlias_file2.ts, 4, 1)) + + exports.bar2(); +>exports.bar2 : Symbol(exports.bar2, Decl(collisionExportsRequireAndAlias_file3333.ts, 0, 0)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndAlias_file2.ts, 0, 68)) +>bar2 : Symbol(exports.bar2, Decl(collisionExportsRequireAndAlias_file3333.ts, 0, 0)) +} +=== collisionExportsRequireAndAlias_file1.ts === +export function bar() { +>bar : Symbol(bar, Decl(collisionExportsRequireAndAlias_file1.ts, 0, 0)) +} + +=== collisionExportsRequireAndAlias_file3333.ts === +export function bar2() { +>bar2 : Symbol(bar2, Decl(collisionExportsRequireAndAlias_file3333.ts, 0, 0)) +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.types b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.types new file mode 100644 index 0000000000..72ef2678f7 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAlias.types @@ -0,0 +1,36 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAlias.ts] //// + +=== collisionExportsRequireAndAlias_file2.ts === +import require = require('./collisionExportsRequireAndAlias_file1'); // Error +>require : typeof require + +import exports = require('./collisionExportsRequireAndAlias_file3333'); // Error +>exports : typeof exports + +export function foo() { +>foo : () => void + + require.bar(); +>require.bar() : void +>require.bar : () => void +>require : typeof require +>bar : () => void +} +export function foo2() { +>foo2 : () => void + + exports.bar2(); +>exports.bar2() : void +>exports.bar2 : () => void +>exports : typeof exports +>bar2 : () => void +} +=== collisionExportsRequireAndAlias_file1.ts === +export function bar() { +>bar : () => void +} + +=== collisionExportsRequireAndAlias_file3333.ts === +export function bar2() { +>bar2 : () => void +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.js b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.js new file mode 100644 index 0000000000..0643e7fcff --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.js @@ -0,0 +1,50 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts] //// + +//// [collisionExportsRequireAndAmbientClass_externalmodule.ts] +export declare class require { +} +export declare class exports { +} +declare module m1 { + class require { + } + class exports { + } +} +module m2 { + export declare class require { + } + export declare class exports { + } +} + +//// [collisionExportsRequireAndAmbientClass_globalFile.ts] +declare class require { +} +declare class exports { +} +declare module m3 { + class require { + } + class exports { + } +} +module m4 { + export declare class require { + } + export declare class exports { + } + var a = 10; +} + +//// [collisionExportsRequireAndAmbientClass_externalmodule.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var m2; +(function (m2) { +})(m2 || (m2 = {})); +//// [collisionExportsRequireAndAmbientClass_globalFile.js] +var m4; +(function (m4) { + var a = 10; +})(m4 || (m4 = {})); diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.symbols b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.symbols new file mode 100644 index 0000000000..8a6569dfdc --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.symbols @@ -0,0 +1,59 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts] //// + +=== collisionExportsRequireAndAmbientClass_externalmodule.ts === +export declare class require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 0, 0)) +} +export declare class exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 1, 1)) +} +declare module m1 { +>m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 3, 1)) + + class require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 4, 19)) + } + class exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 6, 5)) + } +} +module m2 { +>m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 9, 1)) + + export declare class require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 10, 11)) + } + export declare class exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_externalmodule.ts, 12, 5)) + } +} + +=== collisionExportsRequireAndAmbientClass_globalFile.ts === +declare class require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 0, 0)) +} +declare class exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 1, 1)) +} +declare module m3 { +>m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 3, 1)) + + class require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 4, 19)) + } + class exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 6, 5)) + } +} +module m4 { +>m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 9, 1)) + + export declare class require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 10, 11)) + } + export declare class exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 12, 5)) + } + var a = 10; +>a : Symbol(a, Decl(collisionExportsRequireAndAmbientClass_globalFile.ts, 15, 7)) +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.types b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.types new file mode 100644 index 0000000000..0405ace4d3 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientClass.types @@ -0,0 +1,60 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientClass.ts] //// + +=== collisionExportsRequireAndAmbientClass_externalmodule.ts === +export declare class require { +>require : require +} +export declare class exports { +>exports : exports +} +declare module m1 { +>m1 : typeof m1 + + class require { +>require : require + } + class exports { +>exports : exports + } +} +module m2 { +>m2 : typeof m2 + + export declare class require { +>require : require + } + export declare class exports { +>exports : exports + } +} + +=== collisionExportsRequireAndAmbientClass_globalFile.ts === +declare class require { +>require : require +} +declare class exports { +>exports : exports +} +declare module m3 { +>m3 : typeof m3 + + class require { +>require : require + } + class exports { +>exports : exports + } +} +module m4 { +>m4 : typeof m4 + + export declare class require { +>require : require + } + export declare class exports { +>exports : exports + } + var a = 10; +>a : number +>10 : 10 +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.js b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.js new file mode 100644 index 0000000000..c0014da295 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.js @@ -0,0 +1,72 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts] //// + +//// [collisionExportsRequireAndAmbientEnum_externalmodule.ts] +export declare enum require { + _thisVal1, + _thisVal2, +} +export declare enum exports { + _thisVal1, + _thisVal2, +} +declare module m1 { + enum require { + _thisVal1, + _thisVal2, + } + enum exports { + _thisVal1, + _thisVal2, + } +} +module m2 { + export declare enum require { + _thisVal1, + _thisVal2, + } + export declare enum exports { + _thisVal1, + _thisVal2, + } +} + +//// [collisionExportsRequireAndAmbientEnum_globalFile.ts] +declare enum require { + _thisVal1, + _thisVal2, +} +declare enum exports { + _thisVal1, + _thisVal2, +} +declare module m3 { + enum require { + _thisVal1, + _thisVal2, + } + enum exports { + _thisVal1, + _thisVal2, + } +} +module m4 { + export declare enum require { + _thisVal1, + _thisVal2, + } + export declare enum exports { + _thisVal1, + _thisVal2, + } +} + +//// [collisionExportsRequireAndAmbientEnum_externalmodule.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var m2; +(function (m2) { +})(m2 || (m2 = {})); +//// [collisionExportsRequireAndAmbientEnum_globalFile.js] +var m4; +(function (m4) { +})(m4 || (m4 = {})); diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.symbols b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.symbols new file mode 100644 index 0000000000..2e615c974d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.symbols @@ -0,0 +1,129 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts] //// + +=== collisionExportsRequireAndAmbientEnum_externalmodule.ts === +export declare enum require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 0, 0)) + + _thisVal1, +>_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 0, 29)) + + _thisVal2, +>_thisVal2 : Symbol(require._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 1, 14)) +} +export declare enum exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 3, 1)) + + _thisVal1, +>_thisVal1 : Symbol(exports._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 4, 29)) + + _thisVal2, +>_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 5, 14)) +} +declare module m1 { +>m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 7, 1)) + + enum require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 8, 19)) + + _thisVal1, +>_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 9, 18)) + + _thisVal2, +>_thisVal2 : Symbol(require._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 10, 18)) + } + enum exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 12, 5)) + + _thisVal1, +>_thisVal1 : Symbol(exports._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 13, 18)) + + _thisVal2, +>_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 14, 18)) + } +} +module m2 { +>m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 17, 1)) + + export declare enum require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 18, 11)) + + _thisVal1, +>_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 19, 33)) + + _thisVal2, +>_thisVal2 : Symbol(require._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 20, 18)) + } + export declare enum exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 22, 5)) + + _thisVal1, +>_thisVal1 : Symbol(exports._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 23, 33)) + + _thisVal2, +>_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_externalmodule.ts, 24, 18)) + } +} + +=== collisionExportsRequireAndAmbientEnum_globalFile.ts === +declare enum require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 0, 0)) + + _thisVal1, +>_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 0, 22)) + + _thisVal2, +>_thisVal2 : Symbol(require._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 1, 14)) +} +declare enum exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 3, 1)) + + _thisVal1, +>_thisVal1 : Symbol(exports._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 4, 22)) + + _thisVal2, +>_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 5, 14)) +} +declare module m3 { +>m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 7, 1)) + + enum require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 8, 19)) + + _thisVal1, +>_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 9, 18)) + + _thisVal2, +>_thisVal2 : Symbol(require._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 10, 18)) + } + enum exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 12, 5)) + + _thisVal1, +>_thisVal1 : Symbol(exports._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 13, 18)) + + _thisVal2, +>_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 14, 18)) + } +} +module m4 { +>m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 17, 1)) + + export declare enum require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 18, 11)) + + _thisVal1, +>_thisVal1 : Symbol(require._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 19, 33)) + + _thisVal2, +>_thisVal2 : Symbol(require._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 20, 18)) + } + export declare enum exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 22, 5)) + + _thisVal1, +>_thisVal1 : Symbol(exports._thisVal1, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 23, 33)) + + _thisVal2, +>_thisVal2 : Symbol(exports._thisVal2, Decl(collisionExportsRequireAndAmbientEnum_globalFile.ts, 24, 18)) + } +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.types b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.types new file mode 100644 index 0000000000..e64df56329 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientEnum.types @@ -0,0 +1,129 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientEnum.ts] //// + +=== collisionExportsRequireAndAmbientEnum_externalmodule.ts === +export declare enum require { +>require : require + + _thisVal1, +>_thisVal1 : require._thisVal1 + + _thisVal2, +>_thisVal2 : require._thisVal2 +} +export declare enum exports { +>exports : exports + + _thisVal1, +>_thisVal1 : exports._thisVal1 + + _thisVal2, +>_thisVal2 : exports._thisVal2 +} +declare module m1 { +>m1 : typeof m1 + + enum require { +>require : require + + _thisVal1, +>_thisVal1 : require._thisVal1 + + _thisVal2, +>_thisVal2 : require._thisVal2 + } + enum exports { +>exports : exports + + _thisVal1, +>_thisVal1 : exports._thisVal1 + + _thisVal2, +>_thisVal2 : exports._thisVal2 + } +} +module m2 { +>m2 : typeof m2 + + export declare enum require { +>require : require + + _thisVal1, +>_thisVal1 : require._thisVal1 + + _thisVal2, +>_thisVal2 : require._thisVal2 + } + export declare enum exports { +>exports : exports + + _thisVal1, +>_thisVal1 : exports._thisVal1 + + _thisVal2, +>_thisVal2 : exports._thisVal2 + } +} + +=== collisionExportsRequireAndAmbientEnum_globalFile.ts === +declare enum require { +>require : require + + _thisVal1, +>_thisVal1 : require._thisVal1 + + _thisVal2, +>_thisVal2 : require._thisVal2 +} +declare enum exports { +>exports : exports + + _thisVal1, +>_thisVal1 : exports._thisVal1 + + _thisVal2, +>_thisVal2 : exports._thisVal2 +} +declare module m3 { +>m3 : typeof m3 + + enum require { +>require : require + + _thisVal1, +>_thisVal1 : require._thisVal1 + + _thisVal2, +>_thisVal2 : require._thisVal2 + } + enum exports { +>exports : exports + + _thisVal1, +>_thisVal1 : exports._thisVal1 + + _thisVal2, +>_thisVal2 : exports._thisVal2 + } +} +module m4 { +>m4 : typeof m4 + + export declare enum require { +>require : require + + _thisVal1, +>_thisVal1 : require._thisVal1 + + _thisVal2, +>_thisVal2 : require._thisVal2 + } + export declare enum exports { +>exports : exports + + _thisVal1, +>_thisVal1 : exports._thisVal1 + + _thisVal2, +>_thisVal2 : exports._thisVal2 + } +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.js b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.js new file mode 100644 index 0000000000..92782b0797 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.js @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts] //// + +//// [collisionExportsRequireAndAmbientFunction.ts] +export declare function exports(): number; + +export declare function require(): string[]; + +declare module m1 { + function exports(): string; + function require(): number; +} +module m2 { + export declare function exports(): string; + export declare function require(): string[]; + var a = 10; +} + +//// [collisionExportsRequireAndAmbientFunction.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var m2; +(function (m2) { + var a = 10; +})(m2 || (m2 = {})); diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.symbols b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.symbols new file mode 100644 index 0000000000..a97d0b1a31 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.symbols @@ -0,0 +1,30 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts] //// + +=== collisionExportsRequireAndAmbientFunction.ts === +export declare function exports(): number; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunction.ts, 0, 0)) + +export declare function require(): string[]; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunction.ts, 0, 42)) + +declare module m1 { +>m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientFunction.ts, 2, 44)) + + function exports(): string; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunction.ts, 4, 19)) + + function require(): number; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunction.ts, 5, 31)) +} +module m2 { +>m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientFunction.ts, 7, 1)) + + export declare function exports(): string; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientFunction.ts, 8, 11)) + + export declare function require(): string[]; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientFunction.ts, 9, 46)) + + var a = 10; +>a : Symbol(a, Decl(collisionExportsRequireAndAmbientFunction.ts, 11, 7)) +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.types b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.types new file mode 100644 index 0000000000..854f8d0596 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientFunction.types @@ -0,0 +1,31 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientFunction.ts] //// + +=== collisionExportsRequireAndAmbientFunction.ts === +export declare function exports(): number; +>exports : () => number + +export declare function require(): string[]; +>require : () => string[] + +declare module m1 { +>m1 : typeof m1 + + function exports(): string; +>exports : () => string + + function require(): number; +>require : () => number +} +module m2 { +>m2 : typeof m2 + + export declare function exports(): string; +>exports : () => string + + export declare function require(): string[]; +>require : () => string[] + + var a = 10; +>a : number +>10 : 10 +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.js b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.js new file mode 100644 index 0000000000..65520e644e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.js @@ -0,0 +1,116 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts] //// + +//// [collisionExportsRequireAndAmbientModule_externalmodule.ts] +export declare module require { + export interface I { + } + export class C { + } +} +export function foo(): require.I { + return null; +} +export declare module exports { + export interface I { + } + export class C { + } +} +export function foo2(): exports.I { + return null; +} +declare module m1 { + module require { + export interface I { + } + export class C { + } + } + module exports { + export interface I { + } + export class C { + } + } +} +module m2 { + export declare module require { + export interface I { + } + export class C { + } + } + export declare module exports { + export interface I { + } + export class C { + } + } + var a = 10; +} + +//// [collisionExportsRequireAndAmbientModule_globalFile.ts] +declare module require { + export interface I { + } + export class C { + } +} +declare module exports { + export interface I { + } + export class C { + } +} +declare module m3 { + module require { + export interface I { + } + export class C { + } + } + module exports { + export interface I { + } + export class C { + } + } +} +module m4 { + export declare module require { + export interface I { + } + export class C { + } + } + export declare module exports { + export interface I { + } + export class C { + } + } + + var a = 10; +} + + +//// [collisionExportsRequireAndAmbientModule_externalmodule.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.foo = foo; +exports.foo2 = foo2; +function foo() { + return null; +} +function foo2() { + return null; +} +var m2; +(function (m2) { + var a = 10; +})(m2 || (m2 = {})); +//// [collisionExportsRequireAndAmbientModule_globalFile.js] +var m4; +(function (m4) { + var a = 10; +})(m4 || (m4 = {})); diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.symbols b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.symbols new file mode 100644 index 0000000000..063b12f4d8 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.symbols @@ -0,0 +1,161 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts] //// + +=== collisionExportsRequireAndAmbientModule_externalmodule.ts === +export declare module require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 0)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 31)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 2, 5)) + } +} +export function foo(): require.I { +>foo : Symbol(foo, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 5, 1)) +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 0)) +>I : Symbol(require.I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 0, 31)) + + return null; +} +export declare module exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 8, 1)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 9, 31)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 11, 5)) + } +} +export function foo2(): exports.I { +>foo2 : Symbol(foo2, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 14, 1)) +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 8, 1)) +>I : Symbol(exports.I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 9, 31)) + + return null; +} +declare module m1 { +>m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 17, 1)) + + module require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 18, 19)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 19, 20)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 21, 9)) + } + } + module exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 24, 5)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 25, 20)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 27, 9)) + } + } +} +module m2 { +>m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 31, 1)) + + export declare module require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 32, 11)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 33, 35)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 35, 9)) + } + } + export declare module exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 38, 5)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 39, 35)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 41, 9)) + } + } + var a = 10; +>a : Symbol(a, Decl(collisionExportsRequireAndAmbientModule_externalmodule.ts, 45, 7)) +} + +=== collisionExportsRequireAndAmbientModule_globalFile.ts === +declare module require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 0, 0)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 0, 24)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 2, 5)) + } +} +declare module exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 5, 1)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 6, 24)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 8, 5)) + } +} +declare module m3 { +>m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 11, 1)) + + module require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 12, 19)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 13, 20)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 15, 9)) + } + } + module exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 18, 5)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 19, 20)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 21, 9)) + } + } +} +module m4 { +>m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 25, 1)) + + export declare module require { +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 26, 11)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 27, 35)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 29, 9)) + } + } + export declare module exports { +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 32, 5)) + + export interface I { +>I : Symbol(I, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 33, 35)) + } + export class C { +>C : Symbol(C, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 35, 9)) + } + } + + var a = 10; +>a : Symbol(a, Decl(collisionExportsRequireAndAmbientModule_globalFile.ts, 40, 7)) +} + diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.types b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.types new file mode 100644 index 0000000000..f4fff9019a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientModule.types @@ -0,0 +1,149 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientModule.ts] //// + +=== collisionExportsRequireAndAmbientModule_externalmodule.ts === +export declare module require { +>require : typeof require + + export interface I { + } + export class C { +>C : C + } +} +export function foo(): require.I { +>foo : () => require.I +>require : any + + return null; +} +export declare module exports { +>exports : typeof exports + + export interface I { + } + export class C { +>C : C + } +} +export function foo2(): exports.I { +>foo2 : () => exports.I +>exports : any + + return null; +} +declare module m1 { +>m1 : typeof m1 + + module require { +>require : typeof require + + export interface I { + } + export class C { +>C : C + } + } + module exports { +>exports : typeof exports + + export interface I { + } + export class C { +>C : C + } + } +} +module m2 { +>m2 : typeof m2 + + export declare module require { +>require : typeof require + + export interface I { + } + export class C { +>C : C + } + } + export declare module exports { +>exports : typeof exports + + export interface I { + } + export class C { +>C : C + } + } + var a = 10; +>a : number +>10 : 10 +} + +=== collisionExportsRequireAndAmbientModule_globalFile.ts === +declare module require { +>require : typeof require + + export interface I { + } + export class C { +>C : C + } +} +declare module exports { +>exports : typeof exports + + export interface I { + } + export class C { +>C : C + } +} +declare module m3 { +>m3 : typeof m3 + + module require { +>require : typeof require + + export interface I { + } + export class C { +>C : C + } + } + module exports { +>exports : typeof exports + + export interface I { + } + export class C { +>C : C + } + } +} +module m4 { +>m4 : typeof m4 + + export declare module require { +>require : typeof require + + export interface I { + } + export class C { +>C : C + } + } + export declare module exports { +>exports : typeof exports + + export interface I { + } + export class C { +>C : C + } + } + + var a = 10; +>a : number +>10 : 10 +} + diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.js b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.js new file mode 100644 index 0000000000..cbfed4ad76 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.js @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts] //// + +//// [collisionExportsRequireAndAmbientVar_externalmodule.ts] +export declare var exports: number; +export declare var require: string; +declare module m1 { + var exports: string; + var require: number; +} +module m2 { + export declare var exports: number; + export declare var require: string; + var a = 10; +} + +//// [collisionExportsRequireAndAmbientVar_globalFile.ts] +declare var exports: number; +declare var require: string; +declare module m3 { + var exports: string; + var require: number; +} +module m4 { + export declare var exports: string; + export declare var require: number; + var a = 10; +} + +//// [collisionExportsRequireAndAmbientVar_externalmodule.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var m2; +(function (m2) { + var a = 10; +})(m2 || (m2 = {})); +//// [collisionExportsRequireAndAmbientVar_globalFile.js] +var m4; +(function (m4) { + var a = 10; +})(m4 || (m4 = {})); diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.symbols b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.symbols new file mode 100644 index 0000000000..2519959c57 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.symbols @@ -0,0 +1,59 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts] //// + +=== collisionExportsRequireAndAmbientVar_externalmodule.ts === +export declare var exports: number; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 0, 18)) + +export declare var require: string; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 1, 18)) + +declare module m1 { +>m1 : Symbol(m1, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 1, 35)) + + var exports: string; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 3, 7)) + + var require: number; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 4, 7)) +} +module m2 { +>m2 : Symbol(m2, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 5, 1)) + + export declare var exports: number; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 7, 22)) + + export declare var require: string; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 8, 22)) + + var a = 10; +>a : Symbol(a, Decl(collisionExportsRequireAndAmbientVar_externalmodule.ts, 9, 7)) +} + +=== collisionExportsRequireAndAmbientVar_globalFile.ts === +declare var exports: number; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 0, 11)) + +declare var require: string; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 1, 11)) + +declare module m3 { +>m3 : Symbol(m3, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 1, 28)) + + var exports: string; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 3, 7)) + + var require: number; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 4, 7)) +} +module m4 { +>m4 : Symbol(m4, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 5, 1)) + + export declare var exports: string; +>exports : Symbol(exports, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 7, 22)) + + export declare var require: number; +>require : Symbol(require, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 8, 22)) + + var a = 10; +>a : Symbol(a, Decl(collisionExportsRequireAndAmbientVar_globalFile.ts, 9, 7)) +} diff --git a/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.types b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.types new file mode 100644 index 0000000000..d87ed7d386 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/collisionExportsRequireAndAmbientVar.types @@ -0,0 +1,61 @@ +//// [tests/cases/compiler/collisionExportsRequireAndAmbientVar.ts] //// + +=== collisionExportsRequireAndAmbientVar_externalmodule.ts === +export declare var exports: number; +>exports : number + +export declare var require: string; +>require : string + +declare module m1 { +>m1 : typeof m1 + + var exports: string; +>exports : string + + var require: number; +>require : number +} +module m2 { +>m2 : typeof m2 + + export declare var exports: number; +>exports : number + + export declare var require: string; +>require : string + + var a = 10; +>a : number +>10 : 10 +} + +=== collisionExportsRequireAndAmbientVar_globalFile.ts === +declare var exports: number; +>exports : number + +declare var require: string; +>require : string + +declare module m3 { +>m3 : typeof m3 + + var exports: string; +>exports : string + + var require: number; +>require : number +} +module m4 { +>m4 : typeof m4 + + export declare var exports: string; +>exports : string + + export declare var require: number; +>require : number + + var a = 10; +>a : number +>10 : 10 +} diff --git a/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.errors.txt b/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.errors.txt new file mode 100644 index 0000000000..4e5cb3b10c --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.errors.txt @@ -0,0 +1,10 @@ +commentOnImportStatement1.ts(3,22): error TS2307: Cannot find module './foo' or its corresponding type declarations. + + +==== commentOnImportStatement1.ts (1 errors) ==== + /* Copyright */ + + import foo = require('./foo'); + ~~~~~~~ +!!! error TS2307: Cannot find module './foo' or its corresponding type declarations. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.js b/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.js new file mode 100644 index 0000000000..93eb14b9a4 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.js @@ -0,0 +1,12 @@ +//// [tests/cases/compiler/commentOnImportStatement1.ts] //// + +//// [commentOnImportStatement1.ts] +/* Copyright */ + +import foo = require('./foo'); + + +//// [commentOnImportStatement1.js] +"use strict"; +/* Copyright */ +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.symbols b/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.symbols new file mode 100644 index 0000000000..b1ece547be --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.symbols @@ -0,0 +1,8 @@ +//// [tests/cases/compiler/commentOnImportStatement1.ts] //// + +=== commentOnImportStatement1.ts === +/* Copyright */ + +import foo = require('./foo'); +>foo : Symbol(foo, Decl(commentOnImportStatement1.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.types b/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.types new file mode 100644 index 0000000000..2409882770 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/commentOnImportStatement1.types @@ -0,0 +1,8 @@ +//// [tests/cases/compiler/commentOnImportStatement1.ts] //// + +=== commentOnImportStatement1.ts === +/* Copyright */ + +import foo = require('./foo'); +>foo : any + diff --git a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.errors.txt b/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.errors.txt deleted file mode 100644 index 94b49e0bd2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.errors.txt +++ /dev/null @@ -1,8 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class c { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.symbols b/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.symbols deleted file mode 100644 index c179362dd2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.symbols +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/compilerOptionsOutAndNoEmit.ts] //// - -=== a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.types b/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.types deleted file mode 100644 index a1e7ad2bf0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutAndNoEmit.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/compilerOptionsOutAndNoEmit.ts] //// - -=== a.ts === -class c { ->c : c -} - diff --git a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.errors.txt b/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.errors.txt deleted file mode 100644 index 94b49e0bd2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.errors.txt +++ /dev/null @@ -1,8 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class c { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.symbols b/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.symbols deleted file mode 100644 index 28ffa627f3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.symbols +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/compilerOptionsOutFileAndNoEmit.ts] //// - -=== a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.types b/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.types deleted file mode 100644 index 4338a5bb8d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/compilerOptionsOutFileAndNoEmit.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/compilerOptionsOutFileAndNoEmit.ts] //// - -=== a.ts === -class c { ->c : c -} - diff --git a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.js b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.js index c018dd7b69..06d5681d4b 100644 --- a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.js +++ b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.js @@ -31,8 +31,41 @@ export const pick = () => pick(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.pick = void 0; -const pick = require("lodash/pick"); +const pick = __importStar(require("lodash/pick")); const pick = () => (0, exports.pick)(); exports.pick = pick; diff --git a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.js.diff b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.js.diff index e854b89c8d..5529c7a3b1 100644 --- a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.js.diff +++ b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace1.js.diff @@ -1,10 +1,10 @@ --- old.conflictingDeclarationsImportFromNamespace1.js +++ new.conflictingDeclarationsImportFromNamespace1.js -@@= skipped -32, +32 lines =@@ - "use strict"; +@@= skipped -65, +65 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.pick = void 0; --var pick = require("lodash/pick"); -+const pick = require("lodash/pick"); +-var pick = __importStar(require("lodash/pick")); ++const pick = __importStar(require("lodash/pick")); const pick = () => (0, exports.pick)(); exports.pick = pick; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.js b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.js index da6b1bd9dc..b8dcdab16c 100644 --- a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.js +++ b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.js @@ -31,8 +31,41 @@ export const pick = () => pick(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.pick = void 0; -const pick = require("lodash/pick"); +const pick = __importStar(require("lodash/pick")); const pick = () => (0, exports.pick)(); exports.pick = pick; diff --git a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.js.diff b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.js.diff index 018d6fa105..991583d9d6 100644 --- a/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/conflictingDeclarationsImportFromNamespace2.js.diff @@ -1,10 +1,10 @@ --- old.conflictingDeclarationsImportFromNamespace2.js +++ new.conflictingDeclarationsImportFromNamespace2.js -@@= skipped -32, +32 lines =@@ - "use strict"; +@@= skipped -65, +65 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.pick = void 0; --var pick = require("lodash/pick"); -+const pick = require("lodash/pick"); +-var pick = __importStar(require("lodash/pick")); ++const pick = __importStar(require("lodash/pick")); const pick = () => (0, exports.pick)(); exports.pick = pick; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.errors.txt b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.errors.txt new file mode 100644 index 0000000000..9900daf98b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.errors.txt @@ -0,0 +1,50 @@ +constDeclarations_access_2.ts(4,1): error TS2322: Type '1' is not assignable to type '0'. + + +==== constDeclarations_access_2.ts (1 errors) ==== + /// + import m = require('./constDeclarations_access_1'); + // Errors + m.x = 1; + ~~~ +!!! error TS2322: Type '1' is not assignable to type '0'. + m.x += 2; + m.x -= 3; + m.x *= 4; + m.x /= 5; + m.x %= 6; + m.x <<= 7; + m.x >>= 8; + m.x >>>= 9; + m.x &= 10; + m.x |= 11; + m.x ^= 12; + m + m.x++; + m.x--; + ++m.x; + --m.x; + + ++((m.x)); + + m["x"] = 0; + + // OK + var a = m.x + 1; + + function f(v: number) { } + f(m.x); + + if (m.x) { } + + m.x; + (m.x); + + -m.x; + +m.x; + + m.x.toString(); + +==== constDeclarations_access_1.ts (0 errors) ==== + export const x = 0; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.errors.txt.diff new file mode 100644 index 0000000000..9d1bfa7cd5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.errors.txt.diff @@ -0,0 +1,93 @@ +--- old.constDeclarations-access5.errors.txt ++++ new.constDeclarations-access5.errors.txt +@@= skipped -0, +0 lines =@@ +-constDeclarations_access_2.ts(4,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(5,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(6,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(7,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(8,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(9,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(10,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(11,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(12,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(13,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(14,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(15,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(17,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(18,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(19,5): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(20,5): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(22,7): error TS2540: Cannot assign to 'x' because it is a read-only property. +-constDeclarations_access_2.ts(24,3): error TS2540: Cannot assign to 'x' because it is a read-only property. +- +- +-==== constDeclarations_access_2.ts (18 errors) ==== ++constDeclarations_access_2.ts(4,1): error TS2322: Type '1' is not assignable to type '0'. ++ ++ ++==== constDeclarations_access_2.ts (1 errors) ==== + /// + import m = require('./constDeclarations_access_1'); + // Errors + m.x = 1; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. ++ ~~~ ++!!! error TS2322: Type '1' is not assignable to type '0'. + m.x += 2; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x -= 3; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x *= 4; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x /= 5; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x %= 6; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x <<= 7; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x >>= 8; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x >>>= 9; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x &= 10; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x |= 11; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x ^= 12; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m + m.x++; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + m.x--; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + ++m.x; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + --m.x; +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + + ++((m.x)); +- ~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + + m["x"] = 0; +- ~~~ +-!!! error TS2540: Cannot assign to 'x' because it is a read-only property. + + // OK + var a = m.x + 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.js b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.js new file mode 100644 index 0000000000..4e5ca86aad --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.js @@ -0,0 +1,88 @@ +//// [tests/cases/compiler/constDeclarations-access5.ts] //// + +//// [constDeclarations_access_1.ts] +export const x = 0; + +//// [constDeclarations_access_2.ts] +/// +import m = require('./constDeclarations_access_1'); +// Errors +m.x = 1; +m.x += 2; +m.x -= 3; +m.x *= 4; +m.x /= 5; +m.x %= 6; +m.x <<= 7; +m.x >>= 8; +m.x >>>= 9; +m.x &= 10; +m.x |= 11; +m.x ^= 12; +m +m.x++; +m.x--; +++m.x; +--m.x; + +++((m.x)); + +m["x"] = 0; + +// OK +var a = m.x + 1; + +function f(v: number) { } +f(m.x); + +if (m.x) { } + +m.x; +(m.x); + +-m.x; ++m.x; + +m.x.toString(); + + +//// [constDeclarations_access_1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.x = void 0; +exports.x = 0; +//// [constDeclarations_access_2.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +/// +const m = require("./constDeclarations_access_1"); +// Errors +m.x = 1; +m.x += 2; +m.x -= 3; +m.x *= 4; +m.x /= 5; +m.x %= 6; +m.x <<= 7; +m.x >>= 8; +m.x >>>= 9; +m.x &= 10; +m.x |= 11; +m.x ^= 12; +m; +m.x++; +m.x--; +++m.x; +--m.x; +++((m.x)); +m["x"] = 0; +// OK +var a = m.x + 1; +function f(v) { } +f(m.x); +if (m.x) { } +m.x; +(m.x); +-m.x; ++m.x; +m.x.toString(); diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.symbols b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.symbols new file mode 100644 index 0000000000..59d9f3ed8c --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.symbols @@ -0,0 +1,153 @@ +//// [tests/cases/compiler/constDeclarations-access5.ts] //// + +=== constDeclarations_access_2.ts === +/// +import m = require('./constDeclarations_access_1'); +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) + +// Errors +m.x = 1; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x += 2; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x -= 3; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x *= 4; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x /= 5; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x %= 6; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x <<= 7; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x >>= 8; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x >>>= 9; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x &= 10; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x |= 11; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x ^= 12; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) + +m.x++; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x--; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +++m.x; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +--m.x; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +++((m.x)); +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m["x"] = 0; +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>"x" : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +// OK +var a = m.x + 1; +>a : Symbol(a, Decl(constDeclarations_access_2.ts, 26, 3)) +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +function f(v: number) { } +>f : Symbol(f, Decl(constDeclarations_access_2.ts, 26, 16)) +>v : Symbol(v, Decl(constDeclarations_access_2.ts, 28, 11)) + +f(m.x); +>f : Symbol(f, Decl(constDeclarations_access_2.ts, 26, 16)) +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +if (m.x) { } +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +(m.x); +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +-m.x; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + ++m.x; +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) + +m.x.toString(); +>m.x.toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) +>m.x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>m : Symbol(m, Decl(constDeclarations_access_2.ts, 0, 0)) +>x : Symbol(m.x, Decl(constDeclarations_access_1.ts, 0, 12)) +>toString : Symbol(Number.toString, Decl(lib.es5.d.ts, --, --)) + +=== constDeclarations_access_1.ts === +export const x = 0; +>x : Symbol(x, Decl(constDeclarations_access_1.ts, 0, 12)) + diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.types b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.types new file mode 100644 index 0000000000..822381ead2 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.types @@ -0,0 +1,195 @@ +//// [tests/cases/compiler/constDeclarations-access5.ts] //// + +=== constDeclarations_access_2.ts === +/// +import m = require('./constDeclarations_access_1'); +>m : typeof m + +// Errors +m.x = 1; +>m.x = 1 : 1 +>m.x : 0 +>m : typeof m +>x : 0 +>1 : 1 + +m.x += 2; +>m.x += 2 : number +>m.x : number +>m : typeof m +>x : number +>2 : 2 + +m.x -= 3; +>m.x -= 3 : number +>m.x : number +>m : typeof m +>x : number +>3 : 3 + +m.x *= 4; +>m.x *= 4 : number +>m.x : number +>m : typeof m +>x : number +>4 : 4 + +m.x /= 5; +>m.x /= 5 : number +>m.x : number +>m : typeof m +>x : number +>5 : 5 + +m.x %= 6; +>m.x %= 6 : number +>m.x : number +>m : typeof m +>x : number +>6 : 6 + +m.x <<= 7; +>m.x <<= 7 : number +>m.x : number +>m : typeof m +>x : number +>7 : 7 + +m.x >>= 8; +>m.x >>= 8 : number +>m.x : number +>m : typeof m +>x : number +>8 : 8 + +m.x >>>= 9; +>m.x >>>= 9 : number +>m.x : number +>m : typeof m +>x : number +>9 : 9 + +m.x &= 10; +>m.x &= 10 : number +>m.x : number +>m : typeof m +>x : number +>10 : 10 + +m.x |= 11; +>m.x |= 11 : number +>m.x : number +>m : typeof m +>x : number +>11 : 11 + +m.x ^= 12; +>m.x ^= 12 : number +>m.x : number +>m : typeof m +>x : number +>12 : 12 + +m +>m : typeof m + +m.x++; +>m.x++ : number +>m.x : number +>m : typeof m +>x : number + +m.x--; +>m.x-- : number +>m.x : number +>m : typeof m +>x : number + +++m.x; +>++m.x : number +>m.x : number +>m : typeof m +>x : number + +--m.x; +>--m.x : number +>m.x : number +>m : typeof m +>x : number + +++((m.x)); +>++((m.x)) : number +>((m.x)) : number +>(m.x) : number +>m.x : number +>m : typeof m +>x : number + +m["x"] = 0; +>m["x"] = 0 : 0 +>m["x"] : 0 +>m : typeof m +>"x" : "x" +>0 : 0 + +// OK +var a = m.x + 1; +>a : number +>m.x + 1 : number +>m.x : 0 +>m : typeof m +>x : 0 +>1 : 1 + +function f(v: number) { } +>f : (v: number) => void +>v : number + +f(m.x); +>f(m.x) : void +>f : (v: number) => void +>m.x : 0 +>m : typeof m +>x : 0 + +if (m.x) { } +>m.x : 0 +>m : typeof m +>x : 0 + +m.x; +>m.x : 0 +>m : typeof m +>x : 0 + +(m.x); +>(m.x) : 0 +>m.x : 0 +>m : typeof m +>x : 0 + +-m.x; +>-m.x : number +>m.x : 0 +>m : typeof m +>x : 0 + ++m.x; +>+m.x : number +>m.x : 0 +>m : typeof m +>x : 0 + +m.x.toString(); +>m.x.toString() : string +>m.x.toString : (radix?: number) => string +>m.x : 0 +>m : typeof m +>x : 0 +>toString : (radix?: number) => string + +=== constDeclarations_access_1.ts === +export const x = 0; +>x : 0 +>0 : 0 + diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.types.diff b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.types.diff new file mode 100644 index 0000000000..e14da40efa --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/constDeclarations-access5.types.diff @@ -0,0 +1,167 @@ +--- old.constDeclarations-access5.types ++++ new.constDeclarations-access5.types +@@= skipped -7, +7 lines =@@ + // Errors + m.x = 1; + >m.x = 1 : 1 +->m.x : any ++>m.x : 0 + >m : typeof m +->x : any ++>x : 0 + >1 : 1 + + m.x += 2; +->m.x += 2 : any +->m.x : any ++>m.x += 2 : number ++>m.x : number + >m : typeof m +->x : any ++>x : number + >2 : 2 + + m.x -= 3; + >m.x -= 3 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >3 : 3 + + m.x *= 4; + >m.x *= 4 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >4 : 4 + + m.x /= 5; + >m.x /= 5 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >5 : 5 + + m.x %= 6; + >m.x %= 6 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >6 : 6 + + m.x <<= 7; + >m.x <<= 7 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >7 : 7 + + m.x >>= 8; + >m.x >>= 8 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >8 : 8 + + m.x >>>= 9; + >m.x >>>= 9 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >9 : 9 + + m.x &= 10; + >m.x &= 10 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >10 : 10 + + m.x |= 11; + >m.x |= 11 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >11 : 11 + + m.x ^= 12; + >m.x ^= 12 : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + >12 : 12 + + m +@@= skipped -87, +87 lines =@@ + + m.x++; + >m.x++ : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + + m.x--; + >m.x-- : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + + ++m.x; + >++m.x : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + + --m.x; + >--m.x : number +->m.x : any ++>m.x : number + >m : typeof m +->x : any ++>x : number + + ++((m.x)); + >++((m.x)) : number +->((m.x)) : any +->(m.x) : any +->m.x : any ++>((m.x)) : number ++>(m.x) : number ++>m.x : number + >m : typeof m +->x : any ++>x : number + + m["x"] = 0; + >m["x"] = 0 : 0 +->m["x"] : any ++>m["x"] : 0 + >m : typeof m + >"x" : "x" + >0 : 0 \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.errors.txt b/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.errors.txt deleted file mode 100644 index 18f82cd7e6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== file1.ts (0 errors) ==== - c; - -==== file2.ts (0 errors) ==== - const c = 0; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.symbols b/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.symbols deleted file mode 100644 index aa905a40d2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts] //// - -=== file1.ts === -c; ->c : Symbol(c, Decl(file2.ts, 0, 5)) - -=== file2.ts === -const c = 0; ->c : Symbol(c, Decl(file2.ts, 0, 5)) - diff --git a/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.types b/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.types deleted file mode 100644 index 168dc54da6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/constDeclarations-useBeforeDefinition2.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/constDeclarations-useBeforeDefinition2.ts] //// - -=== file1.ts === -c; ->c : 0 - -=== file2.ts === -const c = 0; ->c : 0 ->0 : 0 - diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js b/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js index e29818d9ad..234e0c3045 100644 --- a/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js +++ b/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js @@ -32,8 +32,41 @@ var ConstFooEnum; function fooFunc() { } //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const Foo = require("./foo"); +const Foo = __importStar(require("./foo")); function check(x) { switch (x) { case Foo.ConstFooEnum.Some: diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js.diff b/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js.diff index 641b693b5a..34760791b2 100644 --- a/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js.diff +++ b/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js.diff @@ -1,11 +1,11 @@ --- old.constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js +++ new.constEnumNamespaceReferenceCausesNoImport(isolatedmodules=true).js -@@= skipped -32, +32 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -65, +65 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var Foo = require("./foo"); -+const Foo = require("./foo"); +-var Foo = __importStar(require("./foo")); ++const Foo = __importStar(require("./foo")); function check(x) { switch (x) { case Foo.ConstFooEnum.Some: \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport2.js b/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport2.js index 19bf2acc7d..c7fecdfa82 100644 --- a/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport2.js +++ b/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport2.js @@ -37,7 +37,40 @@ var ConstEnumOnlyModule; })(ConstEnumOnlyModule || (exports.ConstEnumOnlyModule = ConstEnumOnlyModule = {})); //// [reexport.js] "use strict"; -const Foo = require("./foo"); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +const Foo = __importStar(require("./foo")); module.exports = Foo.ConstEnumOnlyModule; //// [index.js] "use strict"; diff --git a/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport2.js.diff b/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport2.js.diff index 83b57bd3ed..442a70cd5e 100644 --- a/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/constEnumNamespaceReferenceCausesNoImport2.js.diff @@ -1,11 +1,11 @@ --- old.constEnumNamespaceReferenceCausesNoImport2.js +++ new.constEnumNamespaceReferenceCausesNoImport2.js -@@= skipped -36, +36 lines =@@ - })(ConstEnumOnlyModule || (exports.ConstEnumOnlyModule = ConstEnumOnlyModule = {})); - //// [reexport.js] - "use strict"; --var Foo = require("./foo"); -+const Foo = require("./foo"); +@@= skipped -69, +69 lines =@@ + return result; + }; + })(); +-var Foo = __importStar(require("./foo")); ++const Foo = __importStar(require("./foo")); module.exports = Foo.ConstEnumOnlyModule; //// [index.js] "use strict"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.errors.txt b/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.errors.txt deleted file mode 100644 index 5bb0b8e7eb..0000000000 --- a/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.errors.txt +++ /dev/null @@ -1,113 +0,0 @@ -error TS5055: Cannot write file 'controlFlowJavascript.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'controlFlowJavascript.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== controlFlowJavascript.js (0 errors) ==== - let cond = true; - - // CFA for 'let' and no initializer - function f1() { - let x; - if (cond) { - x = 1; - } - if (cond) { - x = "hello"; - } - const y = x; // string | number | undefined - } - - // CFA for 'let' and 'undefined' initializer - function f2() { - let x = undefined; - if (cond) { - x = 1; - } - if (cond) { - x = "hello"; - } - const y = x; // string | number | undefined - } - - // CFA for 'let' and 'null' initializer - function f3() { - let x = null; - if (cond) { - x = 1; - } - if (cond) { - x = "hello"; - } - const y = x; // string | number | null - } - - // CFA for 'var' with no initializer - function f5() { - var x; - if (cond) { - x = 1; - } - if (cond) { - x = "hello"; - } - const y = x; // string | number | undefined - } - - // CFA for 'var' with 'undefined' initializer - function f6() { - var x = undefined; - if (cond) { - x = 1; - } - if (cond) { - x = "hello"; - } - const y = x; // string | number | undefined - } - - // CFA for 'var' with 'null' initializer - function f7() { - var x = null; - if (cond) { - x = 1; - } - if (cond) { - x = "hello"; - } - const y = x; // string | number | null - } - - // No CFA for captured outer variables - function f9() { - let x; - if (cond) { - x = 1; - } - if (cond) { - x = "hello"; - } - const y = x; // string | number | undefined - function f() { - const z = x; // any - } - } - - // No CFA for captured outer variables - function f10() { - let x; - if (cond) { - x = 1; - } - if (cond) { - x = "hello"; - } - const y = x; // string | number | undefined - const f = () => { - const z = x; // any - }; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.symbols b/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.symbols deleted file mode 100644 index fc5feaf282..0000000000 --- a/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.symbols +++ /dev/null @@ -1,217 +0,0 @@ -//// [tests/cases/compiler/controlFlowJavascript.ts] //// - -=== controlFlowJavascript.js === -let cond = true; ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - -// CFA for 'let' and no initializer -function f1() { ->f1 : Symbol(f1, Decl(controlFlowJavascript.js, 0, 16)) - - let x; ->x : Symbol(x, Decl(controlFlowJavascript.js, 4, 7)) - - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = 1; ->x : Symbol(x, Decl(controlFlowJavascript.js, 4, 7)) - } - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = "hello"; ->x : Symbol(x, Decl(controlFlowJavascript.js, 4, 7)) - } - const y = x; // string | number | undefined ->y : Symbol(y, Decl(controlFlowJavascript.js, 11, 9)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 4, 7)) -} - -// CFA for 'let' and 'undefined' initializer -function f2() { ->f2 : Symbol(f2, Decl(controlFlowJavascript.js, 12, 1)) - - let x = undefined; ->x : Symbol(x, Decl(controlFlowJavascript.js, 16, 7)) ->undefined : Symbol(undefined) - - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = 1; ->x : Symbol(x, Decl(controlFlowJavascript.js, 16, 7)) - } - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = "hello"; ->x : Symbol(x, Decl(controlFlowJavascript.js, 16, 7)) - } - const y = x; // string | number | undefined ->y : Symbol(y, Decl(controlFlowJavascript.js, 23, 9)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 16, 7)) -} - -// CFA for 'let' and 'null' initializer -function f3() { ->f3 : Symbol(f3, Decl(controlFlowJavascript.js, 24, 1)) - - let x = null; ->x : Symbol(x, Decl(controlFlowJavascript.js, 28, 7)) - - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = 1; ->x : Symbol(x, Decl(controlFlowJavascript.js, 28, 7)) - } - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = "hello"; ->x : Symbol(x, Decl(controlFlowJavascript.js, 28, 7)) - } - const y = x; // string | number | null ->y : Symbol(y, Decl(controlFlowJavascript.js, 35, 9)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 28, 7)) -} - -// CFA for 'var' with no initializer -function f5() { ->f5 : Symbol(f5, Decl(controlFlowJavascript.js, 36, 1)) - - var x; ->x : Symbol(x, Decl(controlFlowJavascript.js, 40, 7)) - - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = 1; ->x : Symbol(x, Decl(controlFlowJavascript.js, 40, 7)) - } - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = "hello"; ->x : Symbol(x, Decl(controlFlowJavascript.js, 40, 7)) - } - const y = x; // string | number | undefined ->y : Symbol(y, Decl(controlFlowJavascript.js, 47, 9)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 40, 7)) -} - -// CFA for 'var' with 'undefined' initializer -function f6() { ->f6 : Symbol(f6, Decl(controlFlowJavascript.js, 48, 1)) - - var x = undefined; ->x : Symbol(x, Decl(controlFlowJavascript.js, 52, 7)) ->undefined : Symbol(undefined) - - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = 1; ->x : Symbol(x, Decl(controlFlowJavascript.js, 52, 7)) - } - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = "hello"; ->x : Symbol(x, Decl(controlFlowJavascript.js, 52, 7)) - } - const y = x; // string | number | undefined ->y : Symbol(y, Decl(controlFlowJavascript.js, 59, 9)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 52, 7)) -} - -// CFA for 'var' with 'null' initializer -function f7() { ->f7 : Symbol(f7, Decl(controlFlowJavascript.js, 60, 1)) - - var x = null; ->x : Symbol(x, Decl(controlFlowJavascript.js, 64, 7)) - - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = 1; ->x : Symbol(x, Decl(controlFlowJavascript.js, 64, 7)) - } - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = "hello"; ->x : Symbol(x, Decl(controlFlowJavascript.js, 64, 7)) - } - const y = x; // string | number | null ->y : Symbol(y, Decl(controlFlowJavascript.js, 71, 9)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 64, 7)) -} - -// No CFA for captured outer variables -function f9() { ->f9 : Symbol(f9, Decl(controlFlowJavascript.js, 72, 1)) - - let x; ->x : Symbol(x, Decl(controlFlowJavascript.js, 76, 7)) - - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = 1; ->x : Symbol(x, Decl(controlFlowJavascript.js, 76, 7)) - } - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = "hello"; ->x : Symbol(x, Decl(controlFlowJavascript.js, 76, 7)) - } - const y = x; // string | number | undefined ->y : Symbol(y, Decl(controlFlowJavascript.js, 83, 9)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 76, 7)) - - function f() { ->f : Symbol(f, Decl(controlFlowJavascript.js, 83, 16)) - - const z = x; // any ->z : Symbol(z, Decl(controlFlowJavascript.js, 85, 13)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 76, 7)) - } -} - -// No CFA for captured outer variables -function f10() { ->f10 : Symbol(f10, Decl(controlFlowJavascript.js, 87, 1)) - - let x; ->x : Symbol(x, Decl(controlFlowJavascript.js, 91, 7)) - - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = 1; ->x : Symbol(x, Decl(controlFlowJavascript.js, 91, 7)) - } - if (cond) { ->cond : Symbol(cond, Decl(controlFlowJavascript.js, 0, 3)) - - x = "hello"; ->x : Symbol(x, Decl(controlFlowJavascript.js, 91, 7)) - } - const y = x; // string | number | undefined ->y : Symbol(y, Decl(controlFlowJavascript.js, 98, 9)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 91, 7)) - - const f = () => { ->f : Symbol(f, Decl(controlFlowJavascript.js, 99, 9)) - - const z = x; // any ->z : Symbol(z, Decl(controlFlowJavascript.js, 100, 13)) ->x : Symbol(x, Decl(controlFlowJavascript.js, 91, 7)) - - }; -} - diff --git a/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.types b/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.types deleted file mode 100644 index dfae20707c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/controlFlowJavascript.types +++ /dev/null @@ -1,251 +0,0 @@ -//// [tests/cases/compiler/controlFlowJavascript.ts] //// - -=== controlFlowJavascript.js === -let cond = true; ->cond : boolean ->true : true - -// CFA for 'let' and no initializer -function f1() { ->f1 : () => void - - let x; ->x : any - - if (cond) { ->cond : boolean - - x = 1; ->x = 1 : 1 ->x : any ->1 : 1 - } - if (cond) { ->cond : boolean - - x = "hello"; ->x = "hello" : "hello" ->x : any ->"hello" : "hello" - } - const y = x; // string | number | undefined ->y : any ->x : any -} - -// CFA for 'let' and 'undefined' initializer -function f2() { ->f2 : () => void - - let x = undefined; ->x : any ->undefined : undefined - - if (cond) { ->cond : boolean - - x = 1; ->x = 1 : 1 ->x : any ->1 : 1 - } - if (cond) { ->cond : boolean - - x = "hello"; ->x = "hello" : "hello" ->x : any ->"hello" : "hello" - } - const y = x; // string | number | undefined ->y : any ->x : any -} - -// CFA for 'let' and 'null' initializer -function f3() { ->f3 : () => void - - let x = null; ->x : any - - if (cond) { ->cond : boolean - - x = 1; ->x = 1 : 1 ->x : any ->1 : 1 - } - if (cond) { ->cond : boolean - - x = "hello"; ->x = "hello" : "hello" ->x : any ->"hello" : "hello" - } - const y = x; // string | number | null ->y : any ->x : any -} - -// CFA for 'var' with no initializer -function f5() { ->f5 : () => void - - var x; ->x : any - - if (cond) { ->cond : boolean - - x = 1; ->x = 1 : 1 ->x : any ->1 : 1 - } - if (cond) { ->cond : boolean - - x = "hello"; ->x = "hello" : "hello" ->x : any ->"hello" : "hello" - } - const y = x; // string | number | undefined ->y : any ->x : any -} - -// CFA for 'var' with 'undefined' initializer -function f6() { ->f6 : () => void - - var x = undefined; ->x : any ->undefined : undefined - - if (cond) { ->cond : boolean - - x = 1; ->x = 1 : 1 ->x : any ->1 : 1 - } - if (cond) { ->cond : boolean - - x = "hello"; ->x = "hello" : "hello" ->x : any ->"hello" : "hello" - } - const y = x; // string | number | undefined ->y : any ->x : any -} - -// CFA for 'var' with 'null' initializer -function f7() { ->f7 : () => void - - var x = null; ->x : any - - if (cond) { ->cond : boolean - - x = 1; ->x = 1 : 1 ->x : any ->1 : 1 - } - if (cond) { ->cond : boolean - - x = "hello"; ->x = "hello" : "hello" ->x : any ->"hello" : "hello" - } - const y = x; // string | number | null ->y : any ->x : any -} - -// No CFA for captured outer variables -function f9() { ->f9 : () => void - - let x; ->x : any - - if (cond) { ->cond : boolean - - x = 1; ->x = 1 : 1 ->x : any ->1 : 1 - } - if (cond) { ->cond : boolean - - x = "hello"; ->x = "hello" : "hello" ->x : any ->"hello" : "hello" - } - const y = x; // string | number | undefined ->y : any ->x : any - - function f() { ->f : () => void - - const z = x; // any ->z : any ->x : any - } -} - -// No CFA for captured outer variables -function f10() { ->f10 : () => void - - let x; ->x : any - - if (cond) { ->cond : boolean - - x = 1; ->x = 1 : 1 ->x : any ->1 : 1 - } - if (cond) { ->cond : boolean - - x = "hello"; ->x = "hello" : "hello" ->x : any ->"hello" : "hello" - } - const y = x; // string | number | undefined ->y : any ->x : any - - const f = () => { ->f : () => void ->() => { const z = x; // any } : () => void - - const z = x; // any ->z : any ->x : any - - }; -} - diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.errors.txt b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.errors.txt new file mode 100644 index 0000000000..c091aec88b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.errors.txt @@ -0,0 +1,15 @@ +copyrightWithNewLine1.ts(5,24): error TS2307: Cannot find module './greeter' or its corresponding type declarations. + + +==== copyrightWithNewLine1.ts (1 errors) ==== + /***************************** + * (c) Copyright - Important + ****************************/ + + import model = require("./greeter") + ~~~~~~~~~~~ +!!! error TS2307: Cannot find module './greeter' or its corresponding type declarations. + var el = document.getElementById('content'); + var greeter = new model.Greeter(el); + /** things */ + greeter.start(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.js b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.js new file mode 100644 index 0000000000..42ccf6c2d5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.js @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/copyrightWithNewLine1.ts] //// + +//// [copyrightWithNewLine1.ts] +/***************************** +* (c) Copyright - Important +****************************/ + +import model = require("./greeter") +var el = document.getElementById('content'); +var greeter = new model.Greeter(el); +/** things */ +greeter.start(); + +//// [copyrightWithNewLine1.js] +"use strict"; +/***************************** +* (c) Copyright - Important +****************************/ +Object.defineProperty(exports, "__esModule", { value: true }); +const model = require("./greeter"); +var el = document.getElementById('content'); +var greeter = new model.Greeter(el); +/** things */ +greeter.start(); diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.js.diff b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.js.diff new file mode 100644 index 0000000000..96e6e80b5b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.js.diff @@ -0,0 +1,11 @@ +--- old.copyrightWithNewLine1.js ++++ new.copyrightWithNewLine1.js +@@= skipped -16, +16 lines =@@ + * (c) Copyright - Important + ****************************/ + Object.defineProperty(exports, "__esModule", { value: true }); +-var model = require("./greeter"); ++const model = require("./greeter"); + var el = document.getElementById('content'); + var greeter = new model.Greeter(el); + /** things */ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.symbols b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.symbols new file mode 100644 index 0000000000..974ef3f5da --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.symbols @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/copyrightWithNewLine1.ts] //// + +=== copyrightWithNewLine1.ts === +/***************************** +* (c) Copyright - Important +****************************/ + +import model = require("./greeter") +>model : Symbol(model, Decl(copyrightWithNewLine1.ts, 0, 0)) + +var el = document.getElementById('content'); +>el : Symbol(el, Decl(copyrightWithNewLine1.ts, 5, 3)) +>document.getElementById : Symbol(Document.getElementById, Decl(lib.dom.d.ts, --, --)) +>document : Symbol(document, Decl(lib.dom.d.ts, --, --)) +>getElementById : Symbol(Document.getElementById, Decl(lib.dom.d.ts, --, --)) + +var greeter = new model.Greeter(el); +>greeter : Symbol(greeter, Decl(copyrightWithNewLine1.ts, 6, 3)) +>model : Symbol(model, Decl(copyrightWithNewLine1.ts, 0, 0)) +>el : Symbol(el, Decl(copyrightWithNewLine1.ts, 5, 3)) + +/** things */ +greeter.start(); +>greeter : Symbol(greeter, Decl(copyrightWithNewLine1.ts, 6, 3)) + diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.types b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.types new file mode 100644 index 0000000000..dc3d898176 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.types @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/copyrightWithNewLine1.ts] //// + +=== copyrightWithNewLine1.ts === +/***************************** +* (c) Copyright - Important +****************************/ + +import model = require("./greeter") +>model : any + +var el = document.getElementById('content'); +>el : HTMLElement +>document.getElementById('content') : HTMLElement +>document.getElementById : (elementId: string) => HTMLElement +>document : Document +>getElementById : (elementId: string) => HTMLElement +>'content' : "content" + +var greeter = new model.Greeter(el); +>greeter : any +>new model.Greeter(el) : any +>model.Greeter : any +>model : any +>Greeter : any +>el : HTMLElement + +/** things */ +greeter.start(); +>greeter.start() : any +>greeter.start : any +>greeter : any +>start : any + diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.types.diff b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.types.diff new file mode 100644 index 0000000000..7f035155b6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithNewLine1.types.diff @@ -0,0 +1,14 @@ +--- old.copyrightWithNewLine1.types ++++ new.copyrightWithNewLine1.types +@@= skipped -10, +10 lines =@@ + var el = document.getElementById('content'); + >el : HTMLElement + >document.getElementById('content') : HTMLElement +->document.getElementById : (elementId: string) => HTMLElement | null ++>document.getElementById : (elementId: string) => HTMLElement + >document : Document +->getElementById : (elementId: string) => HTMLElement | null ++>getElementById : (elementId: string) => HTMLElement + >'content' : "content" + + var greeter = new model.Greeter(el); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.errors.txt b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.errors.txt new file mode 100644 index 0000000000..cc9d2adb14 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.errors.txt @@ -0,0 +1,14 @@ +copyrightWithoutNewLine1.ts(4,24): error TS2307: Cannot find module './greeter' or its corresponding type declarations. + + +==== copyrightWithoutNewLine1.ts (1 errors) ==== + /***************************** + * (c) Copyright - Important + ****************************/ + import model = require("./greeter") + ~~~~~~~~~~~ +!!! error TS2307: Cannot find module './greeter' or its corresponding type declarations. + var el = document.getElementById('content'); + var greeter = new model.Greeter(el); + /** things */ + greeter.start(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.js b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.js new file mode 100644 index 0000000000..1076a5c98b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.js @@ -0,0 +1,23 @@ +//// [tests/cases/compiler/copyrightWithoutNewLine1.ts] //// + +//// [copyrightWithoutNewLine1.ts] +/***************************** +* (c) Copyright - Important +****************************/ +import model = require("./greeter") +var el = document.getElementById('content'); +var greeter = new model.Greeter(el); +/** things */ +greeter.start(); + +//// [copyrightWithoutNewLine1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +/***************************** +* (c) Copyright - Important +****************************/ +const model = require("./greeter"); +var el = document.getElementById('content'); +var greeter = new model.Greeter(el); +/** things */ +greeter.start(); diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.js.diff b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.js.diff new file mode 100644 index 0000000000..f7d1d0ec44 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.js.diff @@ -0,0 +1,11 @@ +--- old.copyrightWithoutNewLine1.js ++++ new.copyrightWithoutNewLine1.js +@@= skipped -15, +15 lines =@@ + /***************************** + * (c) Copyright - Important + ****************************/ +-var model = require("./greeter"); ++const model = require("./greeter"); + var el = document.getElementById('content'); + var greeter = new model.Greeter(el); + /** things */ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.symbols b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.symbols new file mode 100644 index 0000000000..dd0f44d65a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.symbols @@ -0,0 +1,24 @@ +//// [tests/cases/compiler/copyrightWithoutNewLine1.ts] //// + +=== copyrightWithoutNewLine1.ts === +/***************************** +* (c) Copyright - Important +****************************/ +import model = require("./greeter") +>model : Symbol(model, Decl(copyrightWithoutNewLine1.ts, 0, 0)) + +var el = document.getElementById('content'); +>el : Symbol(el, Decl(copyrightWithoutNewLine1.ts, 4, 3)) +>document.getElementById : Symbol(Document.getElementById, Decl(lib.dom.d.ts, --, --)) +>document : Symbol(document, Decl(lib.dom.d.ts, --, --)) +>getElementById : Symbol(Document.getElementById, Decl(lib.dom.d.ts, --, --)) + +var greeter = new model.Greeter(el); +>greeter : Symbol(greeter, Decl(copyrightWithoutNewLine1.ts, 5, 3)) +>model : Symbol(model, Decl(copyrightWithoutNewLine1.ts, 0, 0)) +>el : Symbol(el, Decl(copyrightWithoutNewLine1.ts, 4, 3)) + +/** things */ +greeter.start(); +>greeter : Symbol(greeter, Decl(copyrightWithoutNewLine1.ts, 5, 3)) + diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.types b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.types new file mode 100644 index 0000000000..bd63301458 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.types @@ -0,0 +1,32 @@ +//// [tests/cases/compiler/copyrightWithoutNewLine1.ts] //// + +=== copyrightWithoutNewLine1.ts === +/***************************** +* (c) Copyright - Important +****************************/ +import model = require("./greeter") +>model : any + +var el = document.getElementById('content'); +>el : HTMLElement +>document.getElementById('content') : HTMLElement +>document.getElementById : (elementId: string) => HTMLElement +>document : Document +>getElementById : (elementId: string) => HTMLElement +>'content' : "content" + +var greeter = new model.Greeter(el); +>greeter : any +>new model.Greeter(el) : any +>model.Greeter : any +>model : any +>Greeter : any +>el : HTMLElement + +/** things */ +greeter.start(); +>greeter.start() : any +>greeter.start : any +>greeter : any +>start : any + diff --git a/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.types.diff b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.types.diff new file mode 100644 index 0000000000..d0f7e11616 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/copyrightWithoutNewLine1.types.diff @@ -0,0 +1,14 @@ +--- old.copyrightWithoutNewLine1.types ++++ new.copyrightWithoutNewLine1.types +@@= skipped -9, +9 lines =@@ + var el = document.getElementById('content'); + >el : HTMLElement + >document.getElementById('content') : HTMLElement +->document.getElementById : (elementId: string) => HTMLElement | null ++>document.getElementById : (elementId: string) => HTMLElement + >document : Document +->getElementById : (elementId: string) => HTMLElement | null ++>getElementById : (elementId: string) => HTMLElement + >'content' : "content" + + var greeter = new model.Greeter(el); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.errors.txt b/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.errors.txt new file mode 100644 index 0000000000..d8e595afe5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.errors.txt @@ -0,0 +1,27 @@ +crashIntypeCheckInvocationExpression.ts(6,28): error TS2304: Cannot find name 'task'. +crashIntypeCheckInvocationExpression.ts(8,18): error TS2304: Cannot find name 'path'. +crashIntypeCheckInvocationExpression.ts(9,19): error TS2347: Untyped function calls may not accept type arguments. +crashIntypeCheckInvocationExpression.ts(10,50): error TS2304: Cannot find name 'moduleType'. + + +==== crashIntypeCheckInvocationExpression.ts (4 errors) ==== + var nake; + function doCompile(fileset: P0, moduleType: P1) { + + return undefined; + } + export var compileServer = task(() => { + ~~~~ +!!! error TS2304: Cannot find name 'task'. + + var folder = path.join(), + ~~~~ +!!! error TS2304: Cannot find name 'path'. + fileset = nake.fileSetSync(folder) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2347: Untyped function calls may not accept type arguments. + return doCompile(fileset, moduleType); + ~~~~~~~~~~ +!!! error TS2304: Cannot find name 'moduleType'. + }); + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.js b/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.js new file mode 100644 index 0000000000..00578e70fa --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.js @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/crashIntypeCheckInvocationExpression.ts] //// + +//// [crashIntypeCheckInvocationExpression.ts] +var nake; +function doCompile(fileset: P0, moduleType: P1) { + + return undefined; +} +export var compileServer = task(() => { + + var folder = path.join(), + fileset = nake.fileSetSync(folder) + return doCompile(fileset, moduleType); +}); + + +//// [crashIntypeCheckInvocationExpression.js] +var nake; +function doCompile(fileset, moduleType) { + return undefined; +} +export var compileServer = task(() => { + var folder = path.join(), fileset = nake.fileSetSync(folder); + return doCompile(fileset, moduleType); +}); diff --git a/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.symbols b/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.symbols new file mode 100644 index 0000000000..b53dae3997 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.symbols @@ -0,0 +1,39 @@ +//// [tests/cases/compiler/crashIntypeCheckInvocationExpression.ts] //// + +=== crashIntypeCheckInvocationExpression.ts === +var nake; +>nake : Symbol(nake, Decl(crashIntypeCheckInvocationExpression.ts, 0, 3)) + +function doCompile(fileset: P0, moduleType: P1) { +>doCompile : Symbol(doCompile, Decl(crashIntypeCheckInvocationExpression.ts, 0, 9)) +>P0 : Symbol(P0, Decl(crashIntypeCheckInvocationExpression.ts, 1, 19)) +>P1 : Symbol(P1, Decl(crashIntypeCheckInvocationExpression.ts, 1, 22)) +>P2 : Symbol(P2, Decl(crashIntypeCheckInvocationExpression.ts, 1, 26)) +>fileset : Symbol(fileset, Decl(crashIntypeCheckInvocationExpression.ts, 1, 31)) +>P0 : Symbol(P0, Decl(crashIntypeCheckInvocationExpression.ts, 1, 19)) +>moduleType : Symbol(moduleType, Decl(crashIntypeCheckInvocationExpression.ts, 1, 43)) +>P1 : Symbol(P1, Decl(crashIntypeCheckInvocationExpression.ts, 1, 22)) + + return undefined; +>undefined : Symbol(undefined) +} +export var compileServer = task(() => { +>compileServer : Symbol(compileServer, Decl(crashIntypeCheckInvocationExpression.ts, 5, 10)) +>P0 : Symbol(P0, Decl(crashIntypeCheckInvocationExpression.ts, 5, 54)) +>P1 : Symbol(P1, Decl(crashIntypeCheckInvocationExpression.ts, 5, 57)) +>P2 : Symbol(P2, Decl(crashIntypeCheckInvocationExpression.ts, 5, 61)) + + var folder = path.join(), +>folder : Symbol(folder, Decl(crashIntypeCheckInvocationExpression.ts, 7, 7)) + + fileset = nake.fileSetSync(folder) +>fileset : Symbol(fileset, Decl(crashIntypeCheckInvocationExpression.ts, 7, 29)) +>nake : Symbol(nake, Decl(crashIntypeCheckInvocationExpression.ts, 0, 3)) +>folder : Symbol(folder, Decl(crashIntypeCheckInvocationExpression.ts, 7, 7)) + + return doCompile(fileset, moduleType); +>doCompile : Symbol(doCompile, Decl(crashIntypeCheckInvocationExpression.ts, 0, 9)) +>fileset : Symbol(fileset, Decl(crashIntypeCheckInvocationExpression.ts, 7, 29)) + +}); + diff --git a/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.types b/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.types new file mode 100644 index 0000000000..d35fd9a30d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/crashIntypeCheckInvocationExpression.types @@ -0,0 +1,43 @@ +//// [tests/cases/compiler/crashIntypeCheckInvocationExpression.ts] //// + +=== crashIntypeCheckInvocationExpression.ts === +var nake; +>nake : any + +function doCompile(fileset: P0, moduleType: P1) { +>doCompile : (fileset: P0, moduleType: P1) => any +>fileset : P0 +>moduleType : P1 + + return undefined; +>undefined : undefined +} +export var compileServer = task(() => { +>compileServer : any +>task(() => { var folder = path.join(), fileset = nake.fileSetSync(folder) return doCompile(fileset, moduleType);}) : any +>task : any +>() => { var folder = path.join(), fileset = nake.fileSetSync(folder) return doCompile(fileset, moduleType);} : () => any + + var folder = path.join(), +>folder : any +>path.join() : any +>path.join : any +>path : any +>join : any + + fileset = nake.fileSetSync(folder) +>fileset : any +>nake.fileSetSync(folder) : any +>nake.fileSetSync : any +>nake : any +>fileSetSync : any +>folder : any + + return doCompile(fileset, moduleType); +>doCompile(fileset, moduleType) : any +>doCompile : (fileset: P0_1, moduleType: P1_1) => any +>fileset : any +>moduleType : any + +}); + diff --git a/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt b/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt deleted file mode 100644 index 5e2e87f6f1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -declFile.d.ts(2,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. -declFile.d.ts(3,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. -declFile.d.ts(5,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. -declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== client.ts (0 errors) ==== - /// - var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file - -==== declFile.d.ts (4 errors) ==== - declare module M { - declare var x; - ~~~~~~~ -!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. - declare function f(); - ~~~~~~~ -!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. - - declare module N { } - ~~~~~~~ -!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. - - declare class C { } - ~~~~~~~ -!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.symbols b/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.symbols deleted file mode 100644 index 1a473d9c37..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.symbols +++ /dev/null @@ -1,27 +0,0 @@ -//// [tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts] //// - -=== client.ts === -/// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file ->x : Symbol(x, Decl(client.ts, 1, 3)) ->M.C : Symbol(M.C, Decl(declFile.d.ts, 4, 24)) ->M : Symbol(M, Decl(declFile.d.ts, 0, 0)) ->C : Symbol(M.C, Decl(declFile.d.ts, 4, 24)) - -=== declFile.d.ts === -declare module M { ->M : Symbol(M, Decl(declFile.d.ts, 0, 0)) - - declare var x; ->x : Symbol(x, Decl(declFile.d.ts, 1, 15)) - - declare function f(); ->f : Symbol(f, Decl(declFile.d.ts, 1, 18)) - - declare module N { } ->N : Symbol(N, Decl(declFile.d.ts, 2, 25)) - - declare class C { } ->C : Symbol(C, Decl(declFile.d.ts, 4, 24)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.types b/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.types deleted file mode 100644 index 6ac085b0bd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declFileWithErrorsInInputDeclarationFileWithOut.types +++ /dev/null @@ -1,27 +0,0 @@ -//// [tests/cases/compiler/declFileWithErrorsInInputDeclarationFileWithOut.ts] //// - -=== client.ts === -/// -var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file ->x : M.C ->new M.C() : M.C ->M.C : typeof M.C ->M : typeof M ->C : typeof M.C - -=== declFile.d.ts === -declare module M { ->M : typeof M - - declare var x; ->x : any - - declare function f(); ->f : () => any - - declare module N { } - - declare class C { } ->C : C -} - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAnyComputedPropertyInClass.js b/testdata/baselines/reference/submodule/compiler/declarationEmitAnyComputedPropertyInClass.js index 96def849ed..0247a9743c 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitAnyComputedPropertyInClass.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAnyComputedPropertyInClass.js @@ -13,9 +13,12 @@ export class C { //// [main.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.C = void 0; -const abcdefgh_1 = require("abcdefgh"); +const abcdefgh_1 = __importDefault(require("abcdefgh")); class C { [abcdefgh_1.default.someKey]() { } ; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitAnyComputedPropertyInClass.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitAnyComputedPropertyInClass.js.diff index 709671dfb3..fbcdc4678c 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitAnyComputedPropertyInClass.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitAnyComputedPropertyInClass.js.diff @@ -1,11 +1,11 @@ --- old.declarationEmitAnyComputedPropertyInClass.js +++ new.declarationEmitAnyComputedPropertyInClass.js -@@= skipped -14, +14 lines =@@ - "use strict"; +@@= skipped -17, +17 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.C = void 0; --var abcdefgh_1 = require("abcdefgh"); -+const abcdefgh_1 = require("abcdefgh"); +-var abcdefgh_1 = __importDefault(require("abcdefgh")); ++const abcdefgh_1 = __importDefault(require("abcdefgh")); class C { [abcdefgh_1.default.someKey]() { } ; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.errors.txt deleted file mode 100644 index 1f41036e73..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== extensions.ts (0 errors) ==== - /// - class Foo { - public: string; - } -==== core.ts (0 errors) ==== - interface Array {} - interface Boolean {} - interface Function {} - interface IArguments {} - interface Number {} - interface Object {} - interface RegExp {} - interface String {} - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.symbols deleted file mode 100644 index 6f95b6b583..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.symbols +++ /dev/null @@ -1,36 +0,0 @@ -//// [tests/cases/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.ts] //// - -=== extensions.ts === -/// -class Foo { ->Foo : Symbol(Foo, Decl(extensions.ts, 0, 0)) - - public: string; ->public : Symbol(Foo.public, Decl(extensions.ts, 1, 11)) -} -=== core.ts === -interface Array {} ->Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 0, 0)) ->T : Symbol(T, Decl(lib.es5.d.ts, --, --), Decl(core.ts, 0, 16)) - -interface Boolean {} ->Boolean : Symbol(Boolean, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 0, 21)) - -interface Function {} ->Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 1, 20)) - -interface IArguments {} ->IArguments : Symbol(IArguments, Decl(lib.es5.d.ts, --, --), Decl(core.ts, 2, 21)) - -interface Number {} ->Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 3, 23)) - -interface Object {} ->Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 4, 19)) - -interface RegExp {} ->RegExp : Symbol(RegExp, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 5, 19)) - -interface String {} ->String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 6, 19)) - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.symbols.diff deleted file mode 100644 index 5d58541e5d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.symbols.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- old.declarationEmitBundlePreservesHasNoDefaultLibDirective.symbols -+++ new.declarationEmitBundlePreservesHasNoDefaultLibDirective.symbols -@@= skipped -9, +9 lines =@@ - } - === core.ts === - interface Array {} -->Array : Symbol(Array, Decl(core.ts, 0, 0)) -->T : Symbol(T, Decl(core.ts, 0, 16)) -+>Array : Symbol(Array, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 0, 0)) -+>T : Symbol(T, Decl(lib.es5.d.ts, --, --), Decl(core.ts, 0, 16)) - - interface Boolean {} -->Boolean : Symbol(Boolean, Decl(core.ts, 0, 21)) -+>Boolean : Symbol(Boolean, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 0, 21)) - - interface Function {} -->Function : Symbol(Function, Decl(core.ts, 1, 20)) -+>Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 1, 20)) - - interface IArguments {} -->IArguments : Symbol(IArguments, Decl(core.ts, 2, 21)) -+>IArguments : Symbol(IArguments, Decl(lib.es5.d.ts, --, --), Decl(core.ts, 2, 21)) - - interface Number {} -->Number : Symbol(Number, Decl(core.ts, 3, 23)) -+>Number : Symbol(Number, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 3, 23)) - - interface Object {} -->Object : Symbol(Object, Decl(core.ts, 4, 19)) -+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 4, 19)) - - interface RegExp {} -->RegExp : Symbol(RegExp, Decl(core.ts, 5, 19)) -+>RegExp : Symbol(RegExp, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 5, 19)) - - interface String {} -->String : Symbol(String, Decl(core.ts, 6, 19)) -+>String : Symbol(String, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(core.ts, 6, 19)) diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.types b/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.types deleted file mode 100644 index 99e0fbcacf..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.types +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.ts] //// - -=== extensions.ts === -/// -class Foo { ->Foo : Foo - - public: string; ->public : string -} -=== core.ts === - -interface Array {} -interface Boolean {} -interface Function {} -interface IArguments {} -interface Number {} -interface Object {} -interface RegExp {} -interface String {} - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt deleted file mode 100644 index 3c20cd1201..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /a/index.ts (0 errors) ==== - export * from "./src/" -==== /b/index.ts (0 errors) ==== - export * from "./src/" -==== /b/src/index.ts (0 errors) ==== - export class B {} -==== /a/src/index.ts (0 errors) ==== - import { B } from "b"; - - export default function () { - return new B(); - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.symbols deleted file mode 100644 index 9ae3ad047f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.symbols +++ /dev/null @@ -1,20 +0,0 @@ -//// [tests/cases/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.ts] //// - -=== /a/index.ts === - -export * from "./src/" -=== /b/index.ts === - -export * from "./src/" -=== /b/src/index.ts === -export class B {} ->B : Symbol(B, Decl(index.ts, 0, 0)) - -=== /a/src/index.ts === -import { B } from "b"; ->B : Symbol(B, Decl(index.ts, 0, 8)) - -export default function () { - return new B(); ->B : Symbol(B, Decl(index.ts, 0, 8)) -} diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.types b/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.types deleted file mode 100644 index 632806b3a0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.types +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.ts] //// - -=== /a/index.ts === - -export * from "./src/" -=== /b/index.ts === - -export * from "./src/" -=== /b/src/index.ts === -export class B {} ->B : B - -=== /a/src/index.ts === -import { B } from "b"; ->B : typeof B - -export default function () { - return new B(); ->new B() : B ->B : typeof B -} diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitComputedNameConstEnumAlias.js b/testdata/baselines/reference/submodule/compiler/declarationEmitComputedNameConstEnumAlias.js index 5bc14cafc7..8dc7b39fea 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitComputedNameConstEnumAlias.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitComputedNameConstEnumAlias.js @@ -24,8 +24,11 @@ var EnumExample; exports.default = EnumExample; //// [index.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const EnumExample_1 = require("./EnumExample"); +const EnumExample_1 = __importDefault(require("./EnumExample")); exports.default = { [EnumExample_1.default.TEST]: {}, }; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitComputedNameConstEnumAlias.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitComputedNameConstEnumAlias.js.diff index 74e921c071..b45c5f33de 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitComputedNameConstEnumAlias.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitComputedNameConstEnumAlias.js.diff @@ -1,11 +1,11 @@ --- old.declarationEmitComputedNameConstEnumAlias.js +++ new.declarationEmitComputedNameConstEnumAlias.js -@@= skipped -24, +24 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -27, +27 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var EnumExample_1 = require("./EnumExample"); -+const EnumExample_1 = require("./EnumExample"); +-var EnumExample_1 = __importDefault(require("./EnumExample")); ++const EnumExample_1 = __importDefault(require("./EnumExample")); exports.default = { [EnumExample_1.default.TEST]: {}, }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.js b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.js index 5a4a06b5ac..7061c8bff5 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.js @@ -23,9 +23,42 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = (suit, rank) => ({ suit, rank }); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.lazyCard = void 0; -let lazyCard = () => Promise.resolve().then(() => require('./Card')).then(a => a.default); +let lazyCard = () => Promise.resolve().then(() => __importStar(require('./Card'))).then(a => a.default); exports.lazyCard = lazyCard; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.js.diff index ef7750cdf7..2fe590e41d 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExportAliasVisibiilityMarking.js.diff @@ -1,10 +1,10 @@ --- old.declarationEmitExportAliasVisibiilityMarking.js +++ new.declarationEmitExportAliasVisibiilityMarking.js -@@= skipped -24, +24 lines =@@ - "use strict"; +@@= skipped -57, +57 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.lazyCard = void 0; --let lazyCard = () => Promise.resolve().then(function () { return require('./Card'); }).then(a => a.default); -+let lazyCard = () => Promise.resolve().then(() => require('./Card')).then(a => a.default); +-let lazyCard = () => Promise.resolve().then(function () { return __importStar(require('./Card')); }).then(a => a.default); ++let lazyCard = () => Promise.resolve().then(() => __importStar(require('./Card'))).then(a => a.default); exports.lazyCard = lazyCard; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExpressionInExtends6.js b/testdata/baselines/reference/submodule/compiler/declarationEmitExpressionInExtends6.js index 0d449bd25d..7a4dcaa164 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitExpressionInExtends6.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExpressionInExtends6.js @@ -21,8 +21,41 @@ class Foo { exports.Foo = Foo; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const A = require("./a"); +const A = __importStar(require("./a")); const { Foo } = A; class default_1 extends Foo { } diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitExpressionInExtends6.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitExpressionInExtends6.js.diff index 9419006abe..36d7e179e1 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitExpressionInExtends6.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitExpressionInExtends6.js.diff @@ -1,11 +1,11 @@ --- old.declarationEmitExpressionInExtends6.js +++ new.declarationEmitExpressionInExtends6.js -@@= skipped -21, +21 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -54, +54 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var A = require("./a"); -+const A = require("./a"); +-var A = __importStar(require("./a")); ++const A = __importStar(require("./a")); const { Foo } = A; class default_1 extends Foo { } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.js b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.js index 62c571420a..7481133d71 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.js @@ -26,8 +26,11 @@ function fn(sliceIndex) { exports.default = { fn }; //// [reexport.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const types_1 = require("./types"); +const types_1 = __importDefault(require("./types")); exports.default = { test: types_1.default }; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.js.diff index 42e8128dfa..3ea7a9a561 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeDistributivityPreservesConstraints.js.diff @@ -1,11 +1,11 @@ --- old.declarationEmitMappedTypeDistributivityPreservesConstraints.js +++ new.declarationEmitMappedTypeDistributivityPreservesConstraints.js -@@= skipped -26, +26 lines =@@ - //// [reexport.js] - "use strict"; +@@= skipped -29, +29 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var types_1 = require("./types"); -+const types_1 = require("./types"); +-var types_1 = __importDefault(require("./types")); ++const types_1 = __importDefault(require("./types")); exports.default = { test: types_1.default }; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeTemplateTypeofSymbol.js b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeTemplateTypeofSymbol.js index 76349c988e..6ff7ed658a 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeTemplateTypeofSymbol.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeTemplateTypeofSymbol.js @@ -20,9 +20,42 @@ export const timestamp = now(); //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.timestamp = void 0; -const x = require("./a"); +const x = __importStar(require("./a")); exports.timestamp = x.now(); //// [c.js] "use strict"; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeTemplateTypeofSymbol.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeTemplateTypeofSymbol.js.diff index 2b1a1bc106..5f4af238eb 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeTemplateTypeofSymbol.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitMappedTypeTemplateTypeofSymbol.js.diff @@ -1,11 +1,11 @@ --- old.declarationEmitMappedTypeTemplateTypeofSymbol.js +++ new.declarationEmitMappedTypeTemplateTypeofSymbol.js -@@= skipped -21, +21 lines =@@ - "use strict"; +@@= skipped -54, +54 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.timestamp = void 0; --var x = require("./a"); -+const x = require("./a"); +-var x = __importStar(require("./a")); ++const x = __importStar(require("./a")); exports.timestamp = x.now(); //// [c.js] "use strict"; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.errors.txt deleted file mode 100644 index f2ffc82324..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.errors.txt +++ /dev/null @@ -1,59 +0,0 @@ -/tsconfig.json(6,5): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== /tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "module": "nodenext", - "declaration": true, - "outDir": "temp", - "baseUrl": "." - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - } - } - -==== /packages/compiler-core/src/index.ts (0 errors) ==== - import { PluginConfig } from "@babel/parser"; - -==== /packages/compiler-sfc/src/index.ts (0 errors) ==== - import { createPlugin } from "@babel/parser"; - export function resolveParserPlugins() { - return [createPlugin()]; - } - -==== /node_modules/.pnpm/@babel+parser@7.23.6/node_modules/@babel/parser/package.json (0 errors) ==== - { - "name": "@babel/parser", - "version": "7.23.6", - "main": "./lib/index.js", - "types": "./typings/babel-parser.d.ts" - } - -==== /node_modules/.pnpm/@babel+parser@7.23.6/node_modules/@babel/parser/typings/babel-parser.d.ts (0 errors) ==== - export declare function createPlugin(): PluginConfig; - export declare class PluginConfig {} - -==== /packages/compiler-core/package.json (0 errors) ==== - { - "name": "@vue/compiler-core", - "version": "3.0.0", - "main": "./src/index.ts", - "dependencies": { - "@babel/parser": "^7.0.0" - } - } - -==== /packages/compiler-sfc/package.json (0 errors) ==== - { - "name": "@vue/compiler-sfc", - "version": "3.0.0", - "main": "./src/index.ts", - "dependencies": { - "@babel/parser": "^7.0.0", - "@vue/compiler-core": "^3.0.0" - } - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js b/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js deleted file mode 100644 index de71b6c171..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitMonorepoBaseUrl.js +++ /dev/null @@ -1,62 +0,0 @@ -//// [tests/cases/compiler/declarationEmitMonorepoBaseUrl.ts] //// - -//// [package.json] -{ - "name": "@babel/parser", - "version": "7.23.6", - "main": "./lib/index.js", - "types": "./typings/babel-parser.d.ts" -} - -//// [babel-parser.d.ts] -export declare function createPlugin(): PluginConfig; -export declare class PluginConfig {} - -//// [package.json] -{ - "name": "@vue/compiler-core", - "version": "3.0.0", - "main": "./src/index.ts", - "dependencies": { - "@babel/parser": "^7.0.0" - } -} - -//// [package.json] -{ - "name": "@vue/compiler-sfc", - "version": "3.0.0", - "main": "./src/index.ts", - "dependencies": { - "@babel/parser": "^7.0.0", - "@vue/compiler-core": "^3.0.0" - } -} - -//// [index.ts] -import { PluginConfig } from "@babel/parser"; - -//// [index.ts] -import { createPlugin } from "@babel/parser"; -export function resolveParserPlugins() { - return [createPlugin()]; -} - - -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.resolveParserPlugins = resolveParserPlugins; -const parser_1 = require("@babel/parser"); -function resolveParserPlugins() { - return [(0, parser_1.createPlugin)()]; -} - - -//// [index.d.ts] -export {}; -//// [index.d.ts] -export declare function resolveParserPlugins(): import("@babel/parser").PluginConfig[]; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.js b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.js index c74996800f..ea6e9e7e15 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.js @@ -42,9 +42,12 @@ export default Object.assign(A, { //// [index.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.C = void 0; -const styled_components_1 = require("styled-components"); +const styled_components_1 = __importDefault(require("styled-components")); const A = styled_components_1.default.div ``; const B = styled_components_1.default.div ``; exports.C = styled_components_1.default.div ``; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.js.diff index c02a6ff8b7..ecdee06739 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitObjectAssignedDefaultExport.js.diff @@ -1,6 +1,6 @@ --- old.declarationEmitObjectAssignedDefaultExport.js +++ new.declarationEmitObjectAssignedDefaultExport.js -@@= skipped -51, +51 lines =@@ +@@= skipped -54, +54 lines =@@ B, C: exports.C }); diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitOfTypeofAliasedExport.js b/testdata/baselines/reference/submodule/compiler/declarationEmitOfTypeofAliasedExport.js index c462e07c28..1e1256834d 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitOfTypeofAliasedExport.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitOfTypeofAliasedExport.js @@ -18,8 +18,41 @@ class C { exports.D = C; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const a = require("./a"); +const a = __importStar(require("./a")); exports.default = a.D; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitOfTypeofAliasedExport.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitOfTypeofAliasedExport.js.diff index dcd3d7f9df..9c5fb28bb8 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitOfTypeofAliasedExport.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitOfTypeofAliasedExport.js.diff @@ -1,10 +1,10 @@ --- old.declarationEmitOfTypeofAliasedExport.js +++ new.declarationEmitOfTypeofAliasedExport.js -@@= skipped -18, +18 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -51, +51 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var a = require("./a"); -+const a = require("./a"); +-var a = __importStar(require("./a")); ++const a = __importStar(require("./a")); exports.default = a.D; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.errors.txt deleted file mode 100644 index a25077ced4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== js/versions.static.js (0 errors) ==== - export default { - "@a/b": "1.0.0", - "@a/c": "1.2.3" - }; -==== js/index.js (0 errors) ==== - import versions from './versions.static.js'; - - export { - versions - }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.symbols deleted file mode 100644 index f43de7b7b7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.symbols +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/declarationEmitOutFileBundlePaths.ts] //// - -=== js/versions.static.js === -export default { - "@a/b": "1.0.0", ->"@a/b" : Symbol("@a/b", Decl(versions.static.js, 0, 16)) - - "@a/c": "1.2.3" ->"@a/c" : Symbol("@a/c", Decl(versions.static.js, 1, 20)) - -}; -=== js/index.js === -import versions from './versions.static.js'; ->versions : Symbol(versions, Decl(index.js, 0, 6)) - -export { - versions ->versions : Symbol(versions, Decl(index.js, 2, 8)) - -}; - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.types b/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.types deleted file mode 100644 index bd72506d49..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitOutFileBundlePaths.types +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/compiler/declarationEmitOutFileBundlePaths.ts] //// - -=== js/versions.static.js === -export default { ->{ "@a/b": "1.0.0", "@a/c": "1.2.3"} : { "@a/b": string; "@a/c": string; } - - "@a/b": "1.0.0", ->"@a/b" : string ->"1.0.0" : "1.0.0" - - "@a/c": "1.2.3" ->"@a/c" : string ->"1.2.3" : "1.2.3" - -}; -=== js/index.js === -import versions from './versions.static.js'; ->versions : { "@a/b": string; "@a/c": string; } - -export { - versions ->versions : { "@a/b": string; "@a/c": string; } - -}; - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.errors.txt deleted file mode 100644 index 592759050a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.errors.txt +++ /dev/null @@ -1,34 +0,0 @@ -packages/b/tsconfig.json(5,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== packages/b/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "outDir": "dist", - "declaration": true, - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "@ts-bug/a": ["../a"] - } - } - } - - -==== packages/b/src/index.ts (0 errors) ==== - import { a } from "@ts-bug/a"; - - export function b(text: string) { - return a(text); - } -==== packages/a/index.d.ts (0 errors) ==== - declare module "@ts-bug/a" { - export type AText = { - value: string; - }; - export function a(text: string): AText; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.js b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.js deleted file mode 100644 index d38396f12a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.js +++ /dev/null @@ -1,29 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPathMappingMonorepo.ts] //// - -//// [index.d.ts] -declare module "@ts-bug/a" { - export type AText = { - value: string; - }; - export function a(text: string): AText; - } - -//// [index.ts] -import { a } from "@ts-bug/a"; - -export function b(text: string) { - return a(text); -} - -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.b = b; -const a_1 = require("@ts-bug/a"); -function b(text) { - return (0, a_1.a)(text); -} - - -//// [index.d.ts] -export declare function b(text: string): import("@ts-bug/a").AText; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.js.diff deleted file mode 100644 index 1df569beed..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.js.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.declarationEmitPathMappingMonorepo.js -+++ new.declarationEmitPathMappingMonorepo.js -@@= skipped -18, +18 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.b = b; --var a_1 = require("@ts-bug/a"); -+const a_1 = require("@ts-bug/a"); - function b(text) { - return (0, a_1.a)(text); - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.symbols deleted file mode 100644 index 5adce47bb0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.symbols +++ /dev/null @@ -1,31 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPathMappingMonorepo.ts] //// - -=== packages/b/src/index.ts === -import { a } from "@ts-bug/a"; ->a : Symbol(a, Decl(index.ts, 0, 8)) - -export function b(text: string) { ->b : Symbol(b, Decl(index.ts, 0, 30)) ->text : Symbol(text, Decl(index.ts, 2, 18)) - - return a(text); ->a : Symbol(a, Decl(index.ts, 0, 8)) ->text : Symbol(text, Decl(index.ts, 2, 18)) -} -=== packages/a/index.d.ts === -declare module "@ts-bug/a" { ->"@ts-bug/a" : Symbol("@ts-bug/a", Decl(index.d.ts, 0, 0)) - - export type AText = { ->AText : Symbol(AText, Decl(index.d.ts, 0, 28)) - - value: string; ->value : Symbol(value, Decl(index.d.ts, 1, 25)) - - }; - export function a(text: string): AText; ->a : Symbol(a, Decl(index.d.ts, 3, 6)) ->text : Symbol(text, Decl(index.d.ts, 4, 22)) ->AText : Symbol(AText, Decl(index.d.ts, 0, 28)) - } - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.types b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.types deleted file mode 100644 index 723c8c88d3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo.types +++ /dev/null @@ -1,31 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPathMappingMonorepo.ts] //// - -=== packages/b/src/index.ts === -import { a } from "@ts-bug/a"; ->a : (text: string) => import("@ts-bug/a").AText - -export function b(text: string) { ->b : (text: string) => import("@ts-bug/a").AText ->text : string - - return a(text); ->a(text) : import("@ts-bug/a").AText ->a : (text: string) => import("@ts-bug/a").AText ->text : string -} -=== packages/a/index.d.ts === -declare module "@ts-bug/a" { ->"@ts-bug/a" : typeof import("@ts-bug/a") - - export type AText = { ->AText : AText - - value: string; ->value : string - - }; - export function a(text: string): AText; ->a : (text: string) => AText ->text : string - } - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.errors.txt deleted file mode 100644 index ab846fb975..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.errors.txt +++ /dev/null @@ -1,54 +0,0 @@ -packages/lab/src/index.ts(1,31): error TS2307: Cannot find module '@ts-bug/core/utils' or its corresponding type declarations. -packages/lab/tsconfig.json(5,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./../*"]}' instead. - - -==== packages/lab/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "outDir": "dist", - "declaration": true, - "baseUrl": "../", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./../*"]}' instead. - "paths": { - "@ts-bug/core": ["./core/src"], - "@ts-bug/core/*": ["./core/src/*"], - "@ts-bug/lab": ["./lab/src"], - "@ts-bug/lab/*": ["./lab/src/*"], - "@ts-bug/styles": ["./styles/src"], - "@ts-bug/styles/*": ["./styles/src/*"] - } - } - } -==== packages/lab/src/index.ts (1 errors) ==== - import { createSvgIcon } from "@ts-bug/core/utils"; - ~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module '@ts-bug/core/utils' or its corresponding type declarations. - export default createSvgIcon("Hello", "ArrowLeft"); - -==== packages/core/src/index.d.ts (0 errors) ==== - export * from "./utils"; - export { default as SvgIcon } from "./SvgIcon"; - -==== packages/core/src/SvgIcon.d.ts (0 errors) ==== - import { StyledComponentProps } from "@ts-bug/styles"; - export interface SvgIconProps extends StyledComponentProps<"root"> { - children?: string[]; - } - export interface SomeInterface { - myProp: string; - } - declare const SvgIcon: SomeInterface; - export default SvgIcon; - -==== packages/core/src/utils.d.ts (0 errors) ==== - import SvgIcon from "./SvgIcon"; - export function createSvgIcon(path: string, displayName: string): typeof SvgIcon; - -==== packages/styles/src/index.d.ts (0 errors) ==== - export interface StyledComponentProps { - classes?: Record; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.js b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.js deleted file mode 100644 index f6b97b76d2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.js +++ /dev/null @@ -1,41 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPathMappingMonorepo2.ts] //// - -//// [index.d.ts] -export * from "./utils"; -export { default as SvgIcon } from "./SvgIcon"; - -//// [SvgIcon.d.ts] -import { StyledComponentProps } from "@ts-bug/styles"; -export interface SvgIconProps extends StyledComponentProps<"root"> { - children?: string[]; -} -export interface SomeInterface { - myProp: string; -} -declare const SvgIcon: SomeInterface; -export default SvgIcon; - -//// [utils.d.ts] -import SvgIcon from "./SvgIcon"; -export function createSvgIcon(path: string, displayName: string): typeof SvgIcon; - -//// [index.d.ts] -export interface StyledComponentProps { - classes?: Record; -} - -//// [index.ts] -import { createSvgIcon } from "@ts-bug/core/utils"; -export default createSvgIcon("Hello", "ArrowLeft"); - - -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const utils_1 = require("@ts-bug/core/utils"); -exports.default = (0, utils_1.createSvgIcon)("Hello", "ArrowLeft"); - - -//// [index.d.ts] -declare const _default: any; -export default _default; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.js.diff deleted file mode 100644 index 2230bdf2d8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.js.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.declarationEmitPathMappingMonorepo2.js -+++ new.declarationEmitPathMappingMonorepo2.js -@@= skipped -31, +31 lines =@@ - //// [index.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --var utils_1 = require("@ts-bug/core/utils"); -+const utils_1 = require("@ts-bug/core/utils"); - exports.default = (0, utils_1.createSvgIcon)("Hello", "ArrowLeft"); - - - //// [index.d.ts] --declare const _default: import("@ts-bug/core/SvgIcon").SomeInterface; -+declare const _default: any; - export default _default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.symbols deleted file mode 100644 index ca75fa3b37..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.symbols +++ /dev/null @@ -1,9 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPathMappingMonorepo2.ts] //// - -=== packages/lab/src/index.ts === -import { createSvgIcon } from "@ts-bug/core/utils"; ->createSvgIcon : Symbol(createSvgIcon, Decl(index.ts, 0, 8)) - -export default createSvgIcon("Hello", "ArrowLeft"); ->createSvgIcon : Symbol(createSvgIcon, Decl(index.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.symbols.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.symbols.diff deleted file mode 100644 index fbb48fd5df..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.symbols.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- old.declarationEmitPathMappingMonorepo2.symbols -+++ new.declarationEmitPathMappingMonorepo2.symbols -@@= skipped -6, +6 lines =@@ - export default createSvgIcon("Hello", "ArrowLeft"); - >createSvgIcon : Symbol(createSvgIcon, Decl(index.ts, 0, 8)) - --=== packages/core/src/SvgIcon.d.ts === --import { StyledComponentProps } from "@ts-bug/styles"; -->StyledComponentProps : Symbol(StyledComponentProps, Decl(SvgIcon.d.ts, 0, 8)) -- --export interface SvgIconProps extends StyledComponentProps<"root"> { -->SvgIconProps : Symbol(SvgIconProps, Decl(SvgIcon.d.ts, 0, 54)) -->StyledComponentProps : Symbol(StyledComponentProps, Decl(SvgIcon.d.ts, 0, 8)) -- -- children?: string[]; -->children : Symbol(SvgIconProps.children, Decl(SvgIcon.d.ts, 1, 68)) --} --export interface SomeInterface { -->SomeInterface : Symbol(SomeInterface, Decl(SvgIcon.d.ts, 3, 1)) -- -- myProp: string; -->myProp : Symbol(SomeInterface.myProp, Decl(SvgIcon.d.ts, 4, 32)) --} --declare const SvgIcon: SomeInterface; -->SvgIcon : Symbol(SvgIcon, Decl(SvgIcon.d.ts, 7, 13)) -->SomeInterface : Symbol(SomeInterface, Decl(SvgIcon.d.ts, 3, 1)) -- --export default SvgIcon; -->SvgIcon : Symbol(SvgIcon, Decl(SvgIcon.d.ts, 7, 13)) -- --=== packages/core/src/utils.d.ts === --import SvgIcon from "./SvgIcon"; -->SvgIcon : Symbol(SvgIcon, Decl(utils.d.ts, 0, 6)) -- --export function createSvgIcon(path: string, displayName: string): typeof SvgIcon; -->createSvgIcon : Symbol(createSvgIcon, Decl(utils.d.ts, 0, 32)) -->path : Symbol(path, Decl(utils.d.ts, 1, 30)) -->displayName : Symbol(displayName, Decl(utils.d.ts, 1, 43)) -->SvgIcon : Symbol(SvgIcon, Decl(utils.d.ts, 0, 6)) -- --=== packages/styles/src/index.d.ts === --export interface StyledComponentProps { -->StyledComponentProps : Symbol(StyledComponentProps, Decl(index.d.ts, 0, 0)) -->ClassKey : Symbol(ClassKey, Decl(index.d.ts, 0, 38)) -- -- classes?: Record; -->classes : Symbol(StyledComponentProps.classes, Decl(index.d.ts, 0, 64)) -->Record : Symbol(Record, Decl(lib.es5.d.ts, --, --)) -->ClassKey : Symbol(ClassKey, Decl(index.d.ts, 0, 38)) --} -- \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.types b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.types deleted file mode 100644 index edd6912a35..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPathMappingMonorepo2.ts] //// - -=== packages/lab/src/index.ts === -import { createSvgIcon } from "@ts-bug/core/utils"; ->createSvgIcon : any - -export default createSvgIcon("Hello", "ArrowLeft"); ->createSvgIcon("Hello", "ArrowLeft") : any ->createSvgIcon : any ->"Hello" : "Hello" ->"ArrowLeft" : "ArrowLeft" - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.types.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.types.diff deleted file mode 100644 index 6c1d99ed73..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPathMappingMonorepo2.types.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- old.declarationEmitPathMappingMonorepo2.types -+++ new.declarationEmitPathMappingMonorepo2.types -@@= skipped -1, +1 lines =@@ - - === packages/lab/src/index.ts === - import { createSvgIcon } from "@ts-bug/core/utils"; -->createSvgIcon : (path: string, displayName: string) => import("packages/core/src/SvgIcon").SomeInterface -+>createSvgIcon : any - - export default createSvgIcon("Hello", "ArrowLeft"); -->createSvgIcon("Hello", "ArrowLeft") : import("packages/core/src/SvgIcon").SomeInterface -->createSvgIcon : (path: string, displayName: string) => import("packages/core/src/SvgIcon").SomeInterface -+>createSvgIcon("Hello", "ArrowLeft") : any -+>createSvgIcon : any - >"Hello" : "Hello" - >"ArrowLeft" : "ArrowLeft" -- --=== packages/core/src/SvgIcon.d.ts === --import { StyledComponentProps } from "@ts-bug/styles"; -->StyledComponentProps : any -- --export interface SvgIconProps extends StyledComponentProps<"root"> { -- children?: string[]; -->children : string[] --} --export interface SomeInterface { -- myProp: string; -->myProp : string --} --declare const SvgIcon: SomeInterface; -->SvgIcon : SomeInterface -- --export default SvgIcon; -->SvgIcon : SomeInterface -- --=== packages/core/src/utils.d.ts === --import SvgIcon from "./SvgIcon"; -->SvgIcon : import("packages/core/src/SvgIcon").SomeInterface -- --export function createSvgIcon(path: string, displayName: string): typeof SvgIcon; -->createSvgIcon : (path: string, displayName: string) => typeof SvgIcon -->path : string -->displayName : string -->SvgIcon : import("packages/core/src/SvgIcon").SomeInterface -- --=== packages/styles/src/index.d.ts === --export interface StyledComponentProps { -- classes?: Record; -->classes : Record --} diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.errors.txt deleted file mode 100644 index 2a2158debf..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -==== src/lib/operators/scalar.ts (0 errors) ==== - export interface Scalar { - (): string; - value: number; - } - - export function scalar(value: string): Scalar { - return null as any; - } -==== src/settings/spacing.ts (0 errors) ==== - import { scalar } from '../lib/operators/scalar'; - - export default { - get xs() { - return scalar("14px"); - } - }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.js b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.js deleted file mode 100644 index db59c23bec..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.js +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPrefersPathKindBasedOnBundling.ts] //// - -//// [scalar.ts] -export interface Scalar { - (): string; - value: number; -} - -export function scalar(value: string): Scalar { - return null as any; -} -//// [spacing.ts] -import { scalar } from '../lib/operators/scalar'; - -export default { - get xs() { - return scalar("14px"); - } -}; - - -//// [scalar.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.scalar = scalar; -function scalar(value) { - return null; -} -//// [spacing.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const scalar_1 = require("../lib/operators/scalar"); -exports.default = { - get xs() { - return (0, scalar_1.scalar)("14px"); - } -}; - - -//// [scalar.d.ts] -export interface Scalar { - (): string; - value: number; -} -export declare function scalar(value: string): Scalar; -//// [spacing.d.ts] -declare const _default: { - readonly xs: import("../lib/operators/scalar").Scalar; -}; -export default _default; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.js.diff deleted file mode 100644 index 16adf24359..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.js.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.declarationEmitPrefersPathKindBasedOnBundling.js -+++ new.declarationEmitPrefersPathKindBasedOnBundling.js -@@= skipped -28, +28 lines =@@ - //// [spacing.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --var scalar_1 = require("../lib/operators/scalar"); -+const scalar_1 = require("../lib/operators/scalar"); - exports.default = { - get xs() { - return (0, scalar_1.scalar)("14px"); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.symbols b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.symbols deleted file mode 100644 index c8a925c145..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.symbols +++ /dev/null @@ -1,31 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPrefersPathKindBasedOnBundling.ts] //// - -=== src/lib/operators/scalar.ts === -export interface Scalar { ->Scalar : Symbol(Scalar, Decl(scalar.ts, 0, 0)) - - (): string; - value: number; ->value : Symbol(Scalar.value, Decl(scalar.ts, 1, 12)) -} - -export function scalar(value: string): Scalar { ->scalar : Symbol(scalar, Decl(scalar.ts, 3, 1)) ->value : Symbol(value, Decl(scalar.ts, 5, 23)) ->Scalar : Symbol(Scalar, Decl(scalar.ts, 0, 0)) - - return null as any; -} -=== src/settings/spacing.ts === -import { scalar } from '../lib/operators/scalar'; ->scalar : Symbol(scalar, Decl(spacing.ts, 0, 8)) - -export default { - get xs() { ->xs : Symbol(xs, Decl(spacing.ts, 2, 16)) - - return scalar("14px"); ->scalar : Symbol(scalar, Decl(spacing.ts, 0, 8)) - } -}; - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types b/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types deleted file mode 100644 index 5ae200962a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitPrefersPathKindBasedOnBundling.types +++ /dev/null @@ -1,33 +0,0 @@ -//// [tests/cases/compiler/declarationEmitPrefersPathKindBasedOnBundling.ts] //// - -=== src/lib/operators/scalar.ts === -export interface Scalar { - (): string; - value: number; ->value : number -} - -export function scalar(value: string): Scalar { ->scalar : (value: string) => Scalar ->value : string - - return null as any; ->null as any : any -} -=== src/settings/spacing.ts === -import { scalar } from '../lib/operators/scalar'; ->scalar : (value: string) => import("src/lib/operators/scalar").Scalar - -export default { ->{ get xs() { return scalar("14px"); }} : { readonly xs: import("src/lib/operators/scalar").Scalar; } - - get xs() { ->xs : import("src/lib/operators/scalar").Scalar - - return scalar("14px"); ->scalar("14px") : import("src/lib/operators/scalar").Scalar ->scalar : (value: string) => import("src/lib/operators/scalar").Scalar ->"14px" : "14px" - } -}; - diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.js b/testdata/baselines/reference/submodule/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.js index dfe577cd87..de528003e1 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.js @@ -11,9 +11,42 @@ export const run = (i: () => E.Whatever): E.Whatever => E.something(i); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.run = void 0; -const E = require("whatever"); +const E = __importStar(require("whatever")); const run = (i) => E.something(i); exports.run = run; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.js.diff index 69daf85b04..a55c73011a 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitRetainedAnnotationRetainsImportInOutput.js.diff @@ -1,10 +1,10 @@ --- old.declarationEmitRetainedAnnotationRetainsImportInOutput.js +++ new.declarationEmitRetainedAnnotationRetainsImportInOutput.js -@@= skipped -12, +12 lines =@@ - "use strict"; +@@= skipped -45, +45 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.run = void 0; --var E = require("whatever"); -+const E = require("whatever"); +-var E = __importStar(require("whatever")); ++const E = __importStar(require("whatever")); const run = (i) => E.something(i); exports.run = run; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTypeofDefaultExport.js b/testdata/baselines/reference/submodule/compiler/declarationEmitTypeofDefaultExport.js index 9c69967a86..ba95fc4d44 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitTypeofDefaultExport.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTypeofDefaultExport.js @@ -17,8 +17,41 @@ exports.default = C; ; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const a = require("./a"); +const a = __importStar(require("./a")); exports.default = a.default; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitTypeofDefaultExport.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitTypeofDefaultExport.js.diff index dd076f5639..825f4f6ab5 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitTypeofDefaultExport.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitTypeofDefaultExport.js.diff @@ -1,10 +1,10 @@ --- old.declarationEmitTypeofDefaultExport.js +++ new.declarationEmitTypeofDefaultExport.js -@@= skipped -17, +17 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -50, +50 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var a = require("./a"); -+const a = require("./a"); +-var a = __importStar(require("./a")); ++const a = __importStar(require("./a")); exports.default = a.default; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName.js b/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName.js index 195ad857cb..ad6cdb16f5 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName.js @@ -25,9 +25,12 @@ exports.default = createExperiment({ }); //// [main.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.obj = void 0; -const other_1 = require("./other"); +const other_1 = __importDefault(require("./other")); exports.obj = { [other_1.default.name]: 1, }; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName.js.diff index c78674f754..82c1d39bcd 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName.js.diff @@ -1,11 +1,11 @@ --- old.declarationEmitWithDefaultAsComputedName.js +++ new.declarationEmitWithDefaultAsComputedName.js -@@= skipped -26, +26 lines =@@ - "use strict"; +@@= skipped -29, +29 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.obj = void 0; --var other_1 = require("./other"); -+const other_1 = require("./other"); +-var other_1 = __importDefault(require("./other")); ++const other_1 = __importDefault(require("./other")); exports.obj = { [other_1.default.name]: 1, }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName2.js b/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName2.js index 4c2abfbbda..30de49c199 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName2.js +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName2.js @@ -25,9 +25,42 @@ exports.default = createExperiment({ }); //// [main.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.obj = void 0; -const other2 = require("./other"); +const other2 = __importStar(require("./other")); exports.obj = { [other2.default.name]: 1 }; diff --git a/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName2.js.diff b/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName2.js.diff index 150c2f5a62..db93e12166 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationEmitWithDefaultAsComputedName2.js.diff @@ -1,11 +1,11 @@ --- old.declarationEmitWithDefaultAsComputedName2.js +++ new.declarationEmitWithDefaultAsComputedName2.js -@@= skipped -26, +26 lines =@@ - "use strict"; +@@= skipped -59, +59 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.obj = void 0; --var other2 = require("./other"); -+const other2 = require("./other"); +-var other2 = __importStar(require("./other")); ++const other2 = __importStar(require("./other")); exports.obj = { [other2.default.name]: 1 }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.errors.txt deleted file mode 100644 index 7d282537b9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /out.d.ts (0 errors) ==== - declare class c { - } - -==== /a.ts (0 errors) ==== - class d { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.symbols b/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.symbols deleted file mode 100644 index 37e4014855..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.symbols +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts] //// - -=== /out.d.ts === -declare class c { ->c : Symbol(c, Decl(out.d.ts, 0, 0)) -} - -=== /a.ts === -class d { ->d : Symbol(d, Decl(a.ts, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.types b/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.types deleted file mode 100644 index 782a7001f3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationFileOverwriteErrorWithOut.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/declarationFileOverwriteErrorWithOut.ts] //// - -=== /out.d.ts === -declare class c { ->c : c -} - -=== /a.ts === -class d { ->d : d -} - diff --git a/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.errors.txt deleted file mode 100644 index 6a8d2c1cec..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /a/node_modules/@types/jquery/index.d.ts (0 errors) ==== - interface JQuery { - - } - -==== /a/app.ts (0 errors) ==== - /// - namespace Test { - export var x: JQuery; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.symbols b/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.symbols deleted file mode 100644 index 43deeeb86e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.symbols +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts] //// - -=== /a/node_modules/@types/jquery/index.d.ts === -interface JQuery { ->JQuery : Symbol(JQuery, Decl(index.d.ts, 0, 0)) - -} - -=== /a/app.ts === -/// -namespace Test { ->Test : Symbol(Test, Decl(app.ts, 0, 0)) - - export var x: JQuery; ->x : Symbol(x, Decl(app.ts, 2, 14)) ->JQuery : Symbol(JQuery, Decl(index.d.ts, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.types b/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.types deleted file mode 100644 index c75d2a039b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationFilesGeneratingTypeReferences.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/declarationFilesGeneratingTypeReferences.ts] //// - -=== /a/node_modules/@types/jquery/index.d.ts === - -interface JQuery { - -} - -=== /a/app.ts === -/// -namespace Test { ->Test : typeof Test - - export var x: JQuery; ->x : JQuery -} - diff --git a/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.errors.txt deleted file mode 100644 index a4cab2ae02..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class Foo { - doThing(x: {a: number}) { - return {b: x.a}; - } - static make() { - return new Foo(); - } - } -==== index.ts (0 errors) ==== - const c = new Foo(); - c.doThing({a: 42}); - - let x = c.doThing({a: 12}); - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.symbols b/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.symbols deleted file mode 100644 index 9e84d10378..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.symbols +++ /dev/null @@ -1,42 +0,0 @@ -//// [tests/cases/compiler/declarationMapsOutFile2.ts] //// - -=== a.ts === -class Foo { ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - - doThing(x: {a: number}) { ->doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->x : Symbol(x, Decl(a.ts, 1, 12)) ->a : Symbol(a, Decl(a.ts, 1, 16)) - - return {b: x.a}; ->b : Symbol(b, Decl(a.ts, 2, 16)) ->x.a : Symbol(a, Decl(a.ts, 1, 16)) ->x : Symbol(x, Decl(a.ts, 1, 12)) ->a : Symbol(a, Decl(a.ts, 1, 16)) - } - static make() { ->make : Symbol(Foo.make, Decl(a.ts, 3, 5)) - - return new Foo(); ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - } -} -=== index.ts === -const c = new Foo(); ->c : Symbol(c, Decl(index.ts, 0, 5)) ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -c.doThing({a: 42}); ->c.doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->c : Symbol(c, Decl(index.ts, 0, 5)) ->doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->a : Symbol(a, Decl(index.ts, 1, 11)) - -let x = c.doThing({a: 12}); ->x : Symbol(x, Decl(index.ts, 3, 3)) ->c.doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->c : Symbol(c, Decl(index.ts, 0, 5)) ->doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->a : Symbol(a, Decl(index.ts, 3, 19)) - diff --git a/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.types b/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.types deleted file mode 100644 index d739e4cbb4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationMapsOutFile2.types +++ /dev/null @@ -1,51 +0,0 @@ -//// [tests/cases/compiler/declarationMapsOutFile2.ts] //// - -=== a.ts === -class Foo { ->Foo : Foo - - doThing(x: {a: number}) { ->doThing : (x: { a: number; }) => { b: number; } ->x : { a: number; } ->a : number - - return {b: x.a}; ->{b: x.a} : { b: number; } ->b : number ->x.a : number ->x : { a: number; } ->a : number - } - static make() { ->make : () => Foo - - return new Foo(); ->new Foo() : Foo ->Foo : typeof Foo - } -} -=== index.ts === -const c = new Foo(); ->c : Foo ->new Foo() : Foo ->Foo : typeof Foo - -c.doThing({a: 42}); ->c.doThing({a: 42}) : { b: number; } ->c.doThing : (x: { a: number; }) => { b: number; } ->c : Foo ->doThing : (x: { a: number; }) => { b: number; } ->{a: 42} : { a: number; } ->a : number ->42 : 42 - -let x = c.doThing({a: 12}); ->x : { b: number; } ->c.doThing({a: 12}) : { b: number; } ->c.doThing : (x: { a: number; }) => { b: number; } ->c : Foo ->doThing : (x: { a: number; }) => { b: number; } ->{a: 12} : { a: number; } ->a : number ->12 : 12 - diff --git a/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.errors.txt b/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.errors.txt deleted file mode 100644 index a4cab2ae02..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class Foo { - doThing(x: {a: number}) { - return {b: x.a}; - } - static make() { - return new Foo(); - } - } -==== index.ts (0 errors) ==== - const c = new Foo(); - c.doThing({a: 42}); - - let x = c.doThing({a: 12}); - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.symbols b/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.symbols deleted file mode 100644 index 0111155c73..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.symbols +++ /dev/null @@ -1,42 +0,0 @@ -//// [tests/cases/compiler/declarationMapsWithSourceMap.ts] //// - -=== a.ts === -class Foo { ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - - doThing(x: {a: number}) { ->doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->x : Symbol(x, Decl(a.ts, 1, 12)) ->a : Symbol(a, Decl(a.ts, 1, 16)) - - return {b: x.a}; ->b : Symbol(b, Decl(a.ts, 2, 16)) ->x.a : Symbol(a, Decl(a.ts, 1, 16)) ->x : Symbol(x, Decl(a.ts, 1, 12)) ->a : Symbol(a, Decl(a.ts, 1, 16)) - } - static make() { ->make : Symbol(Foo.make, Decl(a.ts, 3, 5)) - - return new Foo(); ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - } -} -=== index.ts === -const c = new Foo(); ->c : Symbol(c, Decl(index.ts, 0, 5)) ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -c.doThing({a: 42}); ->c.doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->c : Symbol(c, Decl(index.ts, 0, 5)) ->doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->a : Symbol(a, Decl(index.ts, 1, 11)) - -let x = c.doThing({a: 12}); ->x : Symbol(x, Decl(index.ts, 3, 3)) ->c.doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->c : Symbol(c, Decl(index.ts, 0, 5)) ->doThing : Symbol(Foo.doThing, Decl(a.ts, 0, 11)) ->a : Symbol(a, Decl(index.ts, 3, 19)) - diff --git a/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.types b/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.types deleted file mode 100644 index c98f45dde6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/declarationMapsWithSourceMap.types +++ /dev/null @@ -1,51 +0,0 @@ -//// [tests/cases/compiler/declarationMapsWithSourceMap.ts] //// - -=== a.ts === -class Foo { ->Foo : Foo - - doThing(x: {a: number}) { ->doThing : (x: { a: number; }) => { b: number; } ->x : { a: number; } ->a : number - - return {b: x.a}; ->{b: x.a} : { b: number; } ->b : number ->x.a : number ->x : { a: number; } ->a : number - } - static make() { ->make : () => Foo - - return new Foo(); ->new Foo() : Foo ->Foo : typeof Foo - } -} -=== index.ts === -const c = new Foo(); ->c : Foo ->new Foo() : Foo ->Foo : typeof Foo - -c.doThing({a: 42}); ->c.doThing({a: 42}) : { b: number; } ->c.doThing : (x: { a: number; }) => { b: number; } ->c : Foo ->doThing : (x: { a: number; }) => { b: number; } ->{a: 42} : { a: number; } ->a : number ->42 : 42 - -let x = c.doThing({a: 12}); ->x : { b: number; } ->c.doThing({a: 12}) : { b: number; } ->c.doThing : (x: { a: number; }) => { b: number; } ->c : Foo ->doThing : (x: { a: number; }) => { b: number; } ->{a: 12} : { a: number; } ->a : number ->12 : 12 - diff --git a/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.js b/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.js index 37a14c819a..50a1fa7882 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.js +++ b/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.js @@ -20,13 +20,45 @@ export const MyComp = Ctor.extends({foo: "bar"}); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.MyComp = void 0; -const ns = require("mod"); +const ns = __importStar(require("mod")); const Ctor = ns.default; exports.MyComp = Ctor.extends({ foo: "bar" }); //// [index.d.ts] -import * as ns from "mod"; -export declare const MyComp: import("mod/ctor").ExtendedCtor; +export declare const MyComp: import("mod/ctor").ExtendedCtor; diff --git a/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.js.diff b/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.js.diff index 0d1946d9ee..3a61d94d5c 100644 --- a/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.js.diff +++ b/testdata/baselines/reference/submodule/compiler/declarationsIndirectGeneratedAliasReference.js.diff @@ -1,10 +1,10 @@ --- old.declarationsIndirectGeneratedAliasReference.js +++ new.declarationsIndirectGeneratedAliasReference.js -@@= skipped -21, +21 lines =@@ - "use strict"; +@@= skipped -54, +54 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.MyComp = void 0; --var ns = require("mod"); -+const ns = require("mod"); +-var ns = __importStar(require("mod")); ++const ns = __importStar(require("mod")); const Ctor = ns.default; exports.MyComp = Ctor.extends({ foo: "bar" }); diff --git a/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision4.js.diff b/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision4.js.diff index 1874b1d5e5..33cd58ddcf 100644 --- a/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision4.js.diff +++ b/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision4.js.diff @@ -4,7 +4,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MyClass = void 0; --var db_1 = require("./db"); // error no default export +-var db_1 = __importDefault(require("./db")); // error no default export function someDecorator(target) { return target; } diff --git a/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision5.js.diff b/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision5.js.diff index 54b82621a7..f5402ef4ab 100644 --- a/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision5.js.diff +++ b/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision5.js.diff @@ -4,7 +4,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MyClass = void 0; --var db_1 = require("./db"); +-var db_1 = __importDefault(require("./db")); function someDecorator(target) { return target; } diff --git a/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision6.js.diff b/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision6.js.diff index e4e4bd26fd..57d51ce2dd 100644 --- a/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision6.js.diff +++ b/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision6.js.diff @@ -4,7 +4,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MyClass = void 0; --var db_1 = require("./db"); +-var db_1 = __importDefault(require("./db")); function someDecorator(target) { return target; } diff --git a/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision7.js.diff b/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision7.js.diff index 5bf4140db7..c1441cd345 100644 --- a/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision7.js.diff +++ b/testdata/baselines/reference/submodule/compiler/decoratorMetadataWithImportDeclarationNameCollision7.js.diff @@ -4,7 +4,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.MyClass = void 0; --var db_1 = require("./db"); +-var db_1 = __importDefault(require("./db")); function someDecorator(target) { return target; } diff --git a/testdata/baselines/reference/submodule/compiler/defaultDeclarationEmitShadowedNamedCorrectly.js b/testdata/baselines/reference/submodule/compiler/defaultDeclarationEmitShadowedNamedCorrectly.js index c918e21907..cadcf34d75 100644 --- a/testdata/baselines/reference/submodule/compiler/defaultDeclarationEmitShadowedNamedCorrectly.js +++ b/testdata/baselines/reference/submodule/compiler/defaultDeclarationEmitShadowedNamedCorrectly.js @@ -23,10 +23,43 @@ export namespace Something { //// [this.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Something = void 0; exports.make = make; -const me = require("./this"); +const me = __importStar(require("./this")); function make(x) { return null; } diff --git a/testdata/baselines/reference/submodule/compiler/defaultDeclarationEmitShadowedNamedCorrectly.js.diff b/testdata/baselines/reference/submodule/compiler/defaultDeclarationEmitShadowedNamedCorrectly.js.diff index 6718c3ad88..6d9089577b 100644 --- a/testdata/baselines/reference/submodule/compiler/defaultDeclarationEmitShadowedNamedCorrectly.js.diff +++ b/testdata/baselines/reference/submodule/compiler/defaultDeclarationEmitShadowedNamedCorrectly.js.diff @@ -1,11 +1,11 @@ --- old.defaultDeclarationEmitShadowedNamedCorrectly.js +++ new.defaultDeclarationEmitShadowedNamedCorrectly.js -@@= skipped -25, +25 lines =@@ +@@= skipped -58, +58 lines =@@ Object.defineProperty(exports, "__esModule", { value: true }); exports.Something = void 0; exports.make = make; --var me = require("./this"); -+const me = require("./this"); +-var me = __importStar(require("./this")); ++const me = __importStar(require("./this")); function make(x) { return null; } diff --git a/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.errors.txt b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.errors.txt new file mode 100644 index 0000000000..4760ee1c0a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.errors.txt @@ -0,0 +1,48 @@ +duplicateLocalVariable2.ts(27,22): error TS2403: Subsequent variable declarations must have the same type. Variable 'i' must be of type 'string', but here has type 'number'. +duplicateLocalVariable2.ts(27,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'. +duplicateLocalVariable2.ts(27,37): error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type. + + +==== duplicateLocalVariable2.ts (3 errors) ==== + export class TestCase { + constructor (public name: string, public test: ()=>boolean, public errorMessageRegEx?: string) { + } + } + export class TestRunner { + static arrayCompare(arg1: any[], arg2: any[]): boolean { + return false; + } + + public addTest(test: TestCase) { + } + } + + export var tests: TestRunner = (function () { + var testRunner = new TestRunner(); + + testRunner.addTest(new TestCase("Check UTF8 encoding", + function () { + var fb: any; + fb.writeUtf8Bom(); + var chars = [0x0054]; + for (var i in chars) { + fb.writeUtf8CodePoint(chars[i]); + } + fb.index = 0; + var bytes = []; + for (var i = 0; i < 14; i++) { + ~ +!!! error TS2403: Subsequent variable declarations must have the same type. Variable 'i' must be of type 'string', but here has type 'number'. +!!! related TS6203 duplicateLocalVariable2.ts:22:22: 'i' was also declared here. + ~~~~~~ +!!! error TS2365: Operator '<' cannot be applied to types 'string' and 'number'. + ~ +!!! error TS2356: An arithmetic operand must be of type 'any', 'number', 'bigint' or an enum type. + bytes.push(fb.readByte()); + } + var expected = [0xEF]; + return TestRunner.arrayCompare(bytes, expected); + })); + + return testRunner; + })(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.js b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.js new file mode 100644 index 0000000000..d43d0f6af3 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.js @@ -0,0 +1,76 @@ +//// [tests/cases/compiler/duplicateLocalVariable2.ts] //// + +//// [duplicateLocalVariable2.ts] +export class TestCase { + constructor (public name: string, public test: ()=>boolean, public errorMessageRegEx?: string) { + } +} +export class TestRunner { + static arrayCompare(arg1: any[], arg2: any[]): boolean { + return false; + } + + public addTest(test: TestCase) { + } +} + +export var tests: TestRunner = (function () { + var testRunner = new TestRunner(); + + testRunner.addTest(new TestCase("Check UTF8 encoding", + function () { + var fb: any; + fb.writeUtf8Bom(); + var chars = [0x0054]; + for (var i in chars) { + fb.writeUtf8CodePoint(chars[i]); + } + fb.index = 0; + var bytes = []; + for (var i = 0; i < 14; i++) { + bytes.push(fb.readByte()); + } + var expected = [0xEF]; + return TestRunner.arrayCompare(bytes, expected); + })); + + return testRunner; +})(); + +//// [duplicateLocalVariable2.js] +export class TestCase { + name; + test; + errorMessageRegEx; + constructor(name, test, errorMessageRegEx) { + this.name = name; + this.test = test; + this.errorMessageRegEx = errorMessageRegEx; + } +} +export class TestRunner { + static arrayCompare(arg1, arg2) { + return false; + } + addTest(test) { + } +} +export var tests = (function () { + var testRunner = new TestRunner(); + testRunner.addTest(new TestCase("Check UTF8 encoding", function () { + var fb; + fb.writeUtf8Bom(); + var chars = [0x0054]; + for (var i in chars) { + fb.writeUtf8CodePoint(chars[i]); + } + fb.index = 0; + var bytes = []; + for (var i = 0; i < 14; i++) { + bytes.push(fb.readByte()); + } + var expected = [0xEF]; + return TestRunner.arrayCompare(bytes, expected); + })); + return testRunner; +})(); diff --git a/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.js.diff b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.js.diff new file mode 100644 index 0000000000..66d761a936 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.js.diff @@ -0,0 +1,12 @@ +--- old.duplicateLocalVariable2.js ++++ new.duplicateLocalVariable2.js +@@= skipped -38, +38 lines =@@ + + //// [duplicateLocalVariable2.js] + export class TestCase { ++ name; ++ test; ++ errorMessageRegEx; + constructor(name, test, errorMessageRegEx) { + this.name = name; + this.test = test; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.symbols b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.symbols new file mode 100644 index 0000000000..30f8e4a990 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.symbols @@ -0,0 +1,96 @@ +//// [tests/cases/compiler/duplicateLocalVariable2.ts] //// + +=== duplicateLocalVariable2.ts === +export class TestCase { +>TestCase : Symbol(TestCase, Decl(duplicateLocalVariable2.ts, 0, 0)) + + constructor (public name: string, public test: ()=>boolean, public errorMessageRegEx?: string) { +>name : Symbol(TestCase.name, Decl(duplicateLocalVariable2.ts, 1, 17)) +>test : Symbol(TestCase.test, Decl(duplicateLocalVariable2.ts, 1, 37)) +>errorMessageRegEx : Symbol(TestCase.errorMessageRegEx, Decl(duplicateLocalVariable2.ts, 1, 63)) + } +} +export class TestRunner { +>TestRunner : Symbol(TestRunner, Decl(duplicateLocalVariable2.ts, 3, 1)) + + static arrayCompare(arg1: any[], arg2: any[]): boolean { +>arrayCompare : Symbol(TestRunner.arrayCompare, Decl(duplicateLocalVariable2.ts, 4, 25)) +>arg1 : Symbol(arg1, Decl(duplicateLocalVariable2.ts, 5, 24)) +>arg2 : Symbol(arg2, Decl(duplicateLocalVariable2.ts, 5, 36)) + + return false; + } + + public addTest(test: TestCase) { +>addTest : Symbol(TestRunner.addTest, Decl(duplicateLocalVariable2.ts, 7, 5)) +>test : Symbol(test, Decl(duplicateLocalVariable2.ts, 9, 19)) +>TestCase : Symbol(TestCase, Decl(duplicateLocalVariable2.ts, 0, 0)) + } +} + +export var tests: TestRunner = (function () { +>tests : Symbol(tests, Decl(duplicateLocalVariable2.ts, 13, 10)) +>TestRunner : Symbol(TestRunner, Decl(duplicateLocalVariable2.ts, 3, 1)) + + var testRunner = new TestRunner(); +>testRunner : Symbol(testRunner, Decl(duplicateLocalVariable2.ts, 14, 7)) +>TestRunner : Symbol(TestRunner, Decl(duplicateLocalVariable2.ts, 3, 1)) + + testRunner.addTest(new TestCase("Check UTF8 encoding", +>testRunner.addTest : Symbol(TestRunner.addTest, Decl(duplicateLocalVariable2.ts, 7, 5)) +>testRunner : Symbol(testRunner, Decl(duplicateLocalVariable2.ts, 14, 7)) +>addTest : Symbol(TestRunner.addTest, Decl(duplicateLocalVariable2.ts, 7, 5)) +>TestCase : Symbol(TestCase, Decl(duplicateLocalVariable2.ts, 0, 0)) + + function () { + var fb: any; +>fb : Symbol(fb, Decl(duplicateLocalVariable2.ts, 18, 15)) + + fb.writeUtf8Bom(); +>fb : Symbol(fb, Decl(duplicateLocalVariable2.ts, 18, 15)) + + var chars = [0x0054]; +>chars : Symbol(chars, Decl(duplicateLocalVariable2.ts, 20, 15)) + + for (var i in chars) { +>i : Symbol(i, Decl(duplicateLocalVariable2.ts, 21, 20), Decl(duplicateLocalVariable2.ts, 26, 20)) +>chars : Symbol(chars, Decl(duplicateLocalVariable2.ts, 20, 15)) + + fb.writeUtf8CodePoint(chars[i]); +>fb : Symbol(fb, Decl(duplicateLocalVariable2.ts, 18, 15)) +>chars : Symbol(chars, Decl(duplicateLocalVariable2.ts, 20, 15)) +>i : Symbol(i, Decl(duplicateLocalVariable2.ts, 21, 20), Decl(duplicateLocalVariable2.ts, 26, 20)) + } + fb.index = 0; +>fb : Symbol(fb, Decl(duplicateLocalVariable2.ts, 18, 15)) + + var bytes = []; +>bytes : Symbol(bytes, Decl(duplicateLocalVariable2.ts, 25, 15)) + + for (var i = 0; i < 14; i++) { +>i : Symbol(i, Decl(duplicateLocalVariable2.ts, 21, 20), Decl(duplicateLocalVariable2.ts, 26, 20)) +>i : Symbol(i, Decl(duplicateLocalVariable2.ts, 21, 20), Decl(duplicateLocalVariable2.ts, 26, 20)) +>i : Symbol(i, Decl(duplicateLocalVariable2.ts, 21, 20), Decl(duplicateLocalVariable2.ts, 26, 20)) + + bytes.push(fb.readByte()); +>bytes.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) +>bytes : Symbol(bytes, Decl(duplicateLocalVariable2.ts, 25, 15)) +>push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) +>fb : Symbol(fb, Decl(duplicateLocalVariable2.ts, 18, 15)) + } + var expected = [0xEF]; +>expected : Symbol(expected, Decl(duplicateLocalVariable2.ts, 29, 15)) + + return TestRunner.arrayCompare(bytes, expected); +>TestRunner.arrayCompare : Symbol(TestRunner.arrayCompare, Decl(duplicateLocalVariable2.ts, 4, 25)) +>TestRunner : Symbol(TestRunner, Decl(duplicateLocalVariable2.ts, 3, 1)) +>arrayCompare : Symbol(TestRunner.arrayCompare, Decl(duplicateLocalVariable2.ts, 4, 25)) +>bytes : Symbol(bytes, Decl(duplicateLocalVariable2.ts, 25, 15)) +>expected : Symbol(expected, Decl(duplicateLocalVariable2.ts, 29, 15)) + + })); + + return testRunner; +>testRunner : Symbol(testRunner, Decl(duplicateLocalVariable2.ts, 14, 7)) + +})(); diff --git a/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.types b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.types new file mode 100644 index 0000000000..1a01a2099b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateLocalVariable2.types @@ -0,0 +1,129 @@ +//// [tests/cases/compiler/duplicateLocalVariable2.ts] //// + +=== duplicateLocalVariable2.ts === +export class TestCase { +>TestCase : TestCase + + constructor (public name: string, public test: ()=>boolean, public errorMessageRegEx?: string) { +>name : string +>test : () => boolean +>errorMessageRegEx : string + } +} +export class TestRunner { +>TestRunner : TestRunner + + static arrayCompare(arg1: any[], arg2: any[]): boolean { +>arrayCompare : (arg1: any[], arg2: any[]) => boolean +>arg1 : any[] +>arg2 : any[] + + return false; +>false : false + } + + public addTest(test: TestCase) { +>addTest : (test: TestCase) => void +>test : TestCase + } +} + +export var tests: TestRunner = (function () { +>tests : TestRunner +>(function () { var testRunner = new TestRunner(); testRunner.addTest(new TestCase("Check UTF8 encoding", function () { var fb: any; fb.writeUtf8Bom(); var chars = [0x0054]; for (var i in chars) { fb.writeUtf8CodePoint(chars[i]); } fb.index = 0; var bytes = []; for (var i = 0; i < 14; i++) { bytes.push(fb.readByte()); } var expected = [0xEF]; return TestRunner.arrayCompare(bytes, expected); })); return testRunner;})() : TestRunner +>(function () { var testRunner = new TestRunner(); testRunner.addTest(new TestCase("Check UTF8 encoding", function () { var fb: any; fb.writeUtf8Bom(); var chars = [0x0054]; for (var i in chars) { fb.writeUtf8CodePoint(chars[i]); } fb.index = 0; var bytes = []; for (var i = 0; i < 14; i++) { bytes.push(fb.readByte()); } var expected = [0xEF]; return TestRunner.arrayCompare(bytes, expected); })); return testRunner;}) : () => TestRunner +>function () { var testRunner = new TestRunner(); testRunner.addTest(new TestCase("Check UTF8 encoding", function () { var fb: any; fb.writeUtf8Bom(); var chars = [0x0054]; for (var i in chars) { fb.writeUtf8CodePoint(chars[i]); } fb.index = 0; var bytes = []; for (var i = 0; i < 14; i++) { bytes.push(fb.readByte()); } var expected = [0xEF]; return TestRunner.arrayCompare(bytes, expected); })); return testRunner;} : () => TestRunner + + var testRunner = new TestRunner(); +>testRunner : TestRunner +>new TestRunner() : TestRunner +>TestRunner : typeof TestRunner + + testRunner.addTest(new TestCase("Check UTF8 encoding", +>testRunner.addTest(new TestCase("Check UTF8 encoding", function () { var fb: any; fb.writeUtf8Bom(); var chars = [0x0054]; for (var i in chars) { fb.writeUtf8CodePoint(chars[i]); } fb.index = 0; var bytes = []; for (var i = 0; i < 14; i++) { bytes.push(fb.readByte()); } var expected = [0xEF]; return TestRunner.arrayCompare(bytes, expected); })) : void +>testRunner.addTest : (test: TestCase) => void +>testRunner : TestRunner +>addTest : (test: TestCase) => void +>new TestCase("Check UTF8 encoding", function () { var fb: any; fb.writeUtf8Bom(); var chars = [0x0054]; for (var i in chars) { fb.writeUtf8CodePoint(chars[i]); } fb.index = 0; var bytes = []; for (var i = 0; i < 14; i++) { bytes.push(fb.readByte()); } var expected = [0xEF]; return TestRunner.arrayCompare(bytes, expected); }) : TestCase +>TestCase : typeof TestCase +>"Check UTF8 encoding" : "Check UTF8 encoding" + + function () { +>function () { var fb: any; fb.writeUtf8Bom(); var chars = [0x0054]; for (var i in chars) { fb.writeUtf8CodePoint(chars[i]); } fb.index = 0; var bytes = []; for (var i = 0; i < 14; i++) { bytes.push(fb.readByte()); } var expected = [0xEF]; return TestRunner.arrayCompare(bytes, expected); } : () => boolean + + var fb: any; +>fb : any + + fb.writeUtf8Bom(); +>fb.writeUtf8Bom() : any +>fb.writeUtf8Bom : any +>fb : any +>writeUtf8Bom : any + + var chars = [0x0054]; +>chars : number[] +>[0x0054] : number[] +>0x0054 : 84 + + for (var i in chars) { +>i : string +>chars : number[] + + fb.writeUtf8CodePoint(chars[i]); +>fb.writeUtf8CodePoint(chars[i]) : any +>fb.writeUtf8CodePoint : any +>fb : any +>writeUtf8CodePoint : any +>chars[i] : number +>chars : number[] +>i : string + } + fb.index = 0; +>fb.index = 0 : 0 +>fb.index : any +>fb : any +>index : any +>0 : 0 + + var bytes = []; +>bytes : any[] +>[] : undefined[] + + for (var i = 0; i < 14; i++) { +>i : string +>0 : 0 +>i < 14 : boolean +>i : string +>14 : 14 +>i++ : number +>i : string + + bytes.push(fb.readByte()); +>bytes.push(fb.readByte()) : number +>bytes.push : (...items: any[]) => number +>bytes : any[] +>push : (...items: any[]) => number +>fb.readByte() : any +>fb.readByte : any +>fb : any +>readByte : any + } + var expected = [0xEF]; +>expected : number[] +>[0xEF] : number[] +>0xEF : 239 + + return TestRunner.arrayCompare(bytes, expected); +>TestRunner.arrayCompare(bytes, expected) : boolean +>TestRunner.arrayCompare : (arg1: any[], arg2: any[]) => boolean +>TestRunner : typeof TestRunner +>arrayCompare : (arg1: any[], arg2: any[]) => boolean +>bytes : any[] +>expected : number[] + + })); + + return testRunner; +>testRunner : TestRunner + +})(); diff --git a/testdata/baselines/reference/submodule/compiler/duplicateObjectLiteralProperty_computedName3.js b/testdata/baselines/reference/submodule/compiler/duplicateObjectLiteralProperty_computedName3.js index 8680935d9e..e9ae01fb1f 100644 --- a/testdata/baselines/reference/submodule/compiler/duplicateObjectLiteralProperty_computedName3.js +++ b/testdata/baselines/reference/submodule/compiler/duplicateObjectLiteralProperty_computedName3.js @@ -46,8 +46,41 @@ var E2; })(E2 || (exports.E2 = E2 = {})); //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const keys = require("./a"); +const keys = __importStar(require("./a")); const t1 = { [keys.n]: 1, [keys.n]: 1, // duplicate diff --git a/testdata/baselines/reference/submodule/compiler/duplicateObjectLiteralProperty_computedName3.js.diff b/testdata/baselines/reference/submodule/compiler/duplicateObjectLiteralProperty_computedName3.js.diff index 23e0b62965..9efdbdf108 100644 --- a/testdata/baselines/reference/submodule/compiler/duplicateObjectLiteralProperty_computedName3.js.diff +++ b/testdata/baselines/reference/submodule/compiler/duplicateObjectLiteralProperty_computedName3.js.diff @@ -1,11 +1,11 @@ --- old.duplicateObjectLiteralProperty_computedName3.js +++ new.duplicateObjectLiteralProperty_computedName3.js -@@= skipped -46, +46 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -79, +79 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var keys = require("./a"); -+const keys = require("./a"); +-var keys = __importStar(require("./a")); ++const keys = __importStar(require("./a")); const t1 = { [keys.n]: 1, [keys.n]: 1, // duplicate \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.js b/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.js index 8acd17286e..46aa5fb699 100644 --- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.js +++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.js @@ -26,6 +26,39 @@ let foo: Foo = a.foo; //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const a = require("a"); +const a = __importStar(require("a")); let foo = a.foo; diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.js.diff b/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.js.diff index 8741077cda..9791edb463 100644 --- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.js.diff +++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_referenceTypes.js.diff @@ -1,9 +1,9 @@ --- old.duplicatePackage_referenceTypes.js +++ new.duplicatePackage_referenceTypes.js -@@= skipped -26, +26 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -59, +59 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var a = require("a"); -+const a = require("a"); +-var a = __importStar(require("a")); ++const a = __importStar(require("a")); let foo = a.foo; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.js b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.js index 65245c540b..77b9547a9c 100644 --- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.js +++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.js @@ -29,6 +29,39 @@ const o: Foo = a.o; //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const a = require("a"); +const a = __importStar(require("a")); const o = a.o; diff --git a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.js.diff b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.js.diff index f1568fbcc2..e706bdab21 100644 --- a/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.js.diff +++ b/testdata/baselines/reference/submodule/compiler/duplicatePackage_subModule.js.diff @@ -1,9 +1,9 @@ --- old.duplicatePackage_subModule.js +++ new.duplicatePackage_subModule.js -@@= skipped -29, +29 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -62, +62 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var a = require("a"); -+const a = require("a"); +-var a = __importStar(require("a")); ++const a = __importStar(require("a")); const o = a.o; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.errors.txt b/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.errors.txt new file mode 100644 index 0000000000..684a206f24 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.errors.txt @@ -0,0 +1,140 @@ +duplicateSymbolsExportMatching.ts(1,1): error TS1185: Merge conflict marker encountered. +duplicateSymbolsExportMatching.ts(3,1): error TS1185: Merge conflict marker encountered. +duplicateSymbolsExportMatching.ts(5,1): error TS1185: Merge conflict marker encountered. +duplicateSymbolsExportMatching.ts(7,1): error TS1185: Merge conflict marker encountered. +duplicateSymbolsExportMatching.ts(30,15): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local. +duplicateSymbolsExportMatching.ts(31,22): error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local. +duplicateSymbolsExportMatching.ts(32,22): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local. +duplicateSymbolsExportMatching.ts(33,15): error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local. +duplicateSymbolsExportMatching.ts(38,12): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. +duplicateSymbolsExportMatching.ts(41,19): error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. +duplicateSymbolsExportMatching.ts(48,9): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local. +duplicateSymbolsExportMatching.ts(49,16): error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local. +duplicateSymbolsExportMatching.ts(50,9): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local. +duplicateSymbolsExportMatching.ts(51,16): error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local. +duplicateSymbolsExportMatching.ts(55,12): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. +duplicateSymbolsExportMatching.ts(55,12): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. +duplicateSymbolsExportMatching.ts(58,21): error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. +duplicateSymbolsExportMatching.ts(62,11): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. +duplicateSymbolsExportMatching.ts(63,12): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. +duplicateSymbolsExportMatching.ts(64,19): error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. +duplicateSymbolsExportMatching.ts(70,11): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local. +duplicateSymbolsExportMatching.ts(71,18): error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local. + + +==== duplicateSymbolsExportMatching.ts (22 errors) ==== + <<<<<<< HEAD + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + module M { + ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + namespace M { + ======= + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + namespace M { + >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export interface E { } + interface I { } + } + module M { + export interface E { } // ok + interface I { } // ok + } + + // Doesn't match export visibility, but it's in a different parent, so it's ok + module M { + interface E { } // ok + export interface I { } // ok + } + + module N { + interface I { } + interface I { } // ok + export interface E { } + export interface E { } // ok + } + + module N2 { + interface I { } + ~ +!!! error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local. + export interface I { } // error + ~ +!!! error TS2395: Individual declarations in merged declaration 'I' must be all exported or all local. + export interface E { } + ~ +!!! error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local. + interface E { } // error + ~ +!!! error TS2395: Individual declarations in merged declaration 'E' must be all exported or all local. + } + + // Should report error only once for instantiated module + module M { + module inst { + ~~~~ +!!! error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. + var t; + } + export module inst { // one error + ~~~~ +!!! error TS2395: Individual declarations in merged declaration 'inst' must be all exported or all local. + var t; + } + } + + // Variables of the same / different type + module M2 { + var v: string; + ~ +!!! error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local. + export var v: string; // one error (visibility) + ~ +!!! error TS2395: Individual declarations in merged declaration 'v' must be all exported or all local. + var w: number; + ~ +!!! error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local. + export var w: string; // two errors (visibility and type mismatch) + ~ +!!! error TS2395: Individual declarations in merged declaration 'w' must be all exported or all local. + } + + module M { + module F { + ~ +!!! error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. + ~ +!!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged. + var t; + } + export function F() { } // Only one error for duplicate identifier (don't consider visibility) + ~ +!!! error TS2395: Individual declarations in merged declaration 'F' must be all exported or all local. + } + + module M { + class C { } + ~ +!!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. + module C { } + ~ +!!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. + export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) + ~ +!!! error TS2395: Individual declarations in merged declaration 'C' must be all exported or all local. + var t; + } + } + + // Top level + interface D { } + ~ +!!! error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local. + export interface D { } + ~ +!!! error TS2395: Individual declarations in merged declaration 'D' must be all exported or all local. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.js b/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.js new file mode 100644 index 0000000000..63924c722e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.js @@ -0,0 +1,110 @@ +//// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] //// + +//// [duplicateSymbolsExportMatching.ts] +<<<<<<< HEAD +module M { +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +namespace M { +======= +namespace M { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface E { } + interface I { } +} +module M { + export interface E { } // ok + interface I { } // ok +} + +// Doesn't match export visibility, but it's in a different parent, so it's ok +module M { + interface E { } // ok + export interface I { } // ok +} + +module N { + interface I { } + interface I { } // ok + export interface E { } + export interface E { } // ok +} + +module N2 { + interface I { } + export interface I { } // error + export interface E { } + interface E { } // error +} + +// Should report error only once for instantiated module +module M { + module inst { + var t; + } + export module inst { // one error + var t; + } +} + +// Variables of the same / different type +module M2 { + var v: string; + export var v: string; // one error (visibility) + var w: number; + export var w: string; // two errors (visibility and type mismatch) +} + +module M { + module F { + var t; + } + export function F() { } // Only one error for duplicate identifier (don't consider visibility) +} + +module M { + class C { } + module C { } + export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) + var t; + } +} + +// Top level +interface D { } +export interface D { } + +//// [duplicateSymbolsExportMatching.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +// Should report error only once for instantiated module +var M; +(function (M) { + let inst; + (function (inst) { + var t; + })(inst || (inst = {})); + (function (inst) { + var t; + })(inst = M.inst || (M.inst = {})); +})(M || (M = {})); +// Variables of the same / different type +var M2; +(function (M2) { + var v; + var w; +})(M2 || (M2 = {})); +(function (M) { + let F; + (function (F) { + var t; + })(F || (F = {})); + function F() { } // Only one error for duplicate identifier (don't consider visibility) + M.F = F; +})(M || (M = {})); +(function (M) { + class C { + } + (function (C) { + var t; + })(C = M.C || (M.C = {})); +})(M || (M = {})); diff --git a/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.symbols b/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.symbols new file mode 100644 index 0000000000..33e779c2f6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.symbols @@ -0,0 +1,143 @@ +//// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] //// + +=== duplicateSymbolsExportMatching.ts === +<<<<<<< HEAD +module M { +>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more) + +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +namespace M { +======= +namespace M { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface E { } +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 1, 10), Decl(duplicateSymbolsExportMatching.ts, 10, 10)) + + interface I { } +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 7, 26)) +} +module M { +>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more) + + export interface E { } // ok +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 1, 10), Decl(duplicateSymbolsExportMatching.ts, 10, 10)) + + interface I { } // ok +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 11, 26)) +} + +// Doesn't match export visibility, but it's in a different parent, so it's ok +module M { +>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more) + + interface E { } // ok +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 16, 10)) + + export interface I { } // ok +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 17, 19)) +} + +module N { +>N : Symbol(N, Decl(duplicateSymbolsExportMatching.ts, 19, 1)) + + interface I { } +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 21, 10), Decl(duplicateSymbolsExportMatching.ts, 22, 19)) + + interface I { } // ok +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 21, 10), Decl(duplicateSymbolsExportMatching.ts, 22, 19)) + + export interface E { } +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 23, 19), Decl(duplicateSymbolsExportMatching.ts, 24, 26)) + + export interface E { } // ok +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 23, 19), Decl(duplicateSymbolsExportMatching.ts, 24, 26)) +} + +module N2 { +>N2 : Symbol(N2, Decl(duplicateSymbolsExportMatching.ts, 26, 1)) + + interface I { } +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 28, 11), Decl(duplicateSymbolsExportMatching.ts, 29, 19)) + + export interface I { } // error +>I : Symbol(I, Decl(duplicateSymbolsExportMatching.ts, 29, 19)) + + export interface E { } +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 30, 26)) + + interface E { } // error +>E : Symbol(E, Decl(duplicateSymbolsExportMatching.ts, 30, 26), Decl(duplicateSymbolsExportMatching.ts, 31, 26)) +} + +// Should report error only once for instantiated module +module M { +>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more) + + module inst { +>inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 36, 10), Decl(duplicateSymbolsExportMatching.ts, 39, 5)) + + var t; +>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 38, 11)) + } + export module inst { // one error +>inst : Symbol(inst, Decl(duplicateSymbolsExportMatching.ts, 39, 5)) + + var t; +>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 41, 11)) + } +} + +// Variables of the same / different type +module M2 { +>M2 : Symbol(M2, Decl(duplicateSymbolsExportMatching.ts, 43, 1)) + + var v: string; +>v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 47, 7), Decl(duplicateSymbolsExportMatching.ts, 48, 14)) + + export var v: string; // one error (visibility) +>v : Symbol(v, Decl(duplicateSymbolsExportMatching.ts, 48, 14)) + + var w: number; +>w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 49, 7), Decl(duplicateSymbolsExportMatching.ts, 50, 14)) + + export var w: string; // two errors (visibility and type mismatch) +>w : Symbol(w, Decl(duplicateSymbolsExportMatching.ts, 50, 14)) +} + +module M { +>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more) + + module F { +>F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 56, 5), Decl(duplicateSymbolsExportMatching.ts, 53, 10)) + + var t; +>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 55, 11)) + } + export function F() { } // Only one error for duplicate identifier (don't consider visibility) +>F : Symbol(F, Decl(duplicateSymbolsExportMatching.ts, 56, 5)) +} + +module M { +>M : Symbol(M, Decl(duplicateSymbolsExportMatching.ts, 0, 0), Decl(duplicateSymbolsExportMatching.ts, 9, 1), Decl(duplicateSymbolsExportMatching.ts, 13, 1), Decl(duplicateSymbolsExportMatching.ts, 33, 1), Decl(duplicateSymbolsExportMatching.ts, 51, 1) ... and 1 more) + + class C { } +>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 60, 10), Decl(duplicateSymbolsExportMatching.ts, 61, 15), Decl(duplicateSymbolsExportMatching.ts, 62, 16)) + + module C { } +>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 60, 10), Decl(duplicateSymbolsExportMatching.ts, 61, 15), Decl(duplicateSymbolsExportMatching.ts, 62, 16)) + + export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) +>C : Symbol(C, Decl(duplicateSymbolsExportMatching.ts, 62, 16)) + + var t; +>t : Symbol(t, Decl(duplicateSymbolsExportMatching.ts, 64, 11)) + } +} + +// Top level +interface D { } +>D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 66, 1), Decl(duplicateSymbolsExportMatching.ts, 69, 15)) + +export interface D { } +>D : Symbol(D, Decl(duplicateSymbolsExportMatching.ts, 69, 15)) + diff --git a/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.types b/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.types new file mode 100644 index 0000000000..828c0f7d84 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/duplicateSymbolsExportMatching.types @@ -0,0 +1,104 @@ +//// [tests/cases/compiler/duplicateSymbolsExportMatching.ts] //// + +=== duplicateSymbolsExportMatching.ts === +<<<<<<< HEAD +module M { +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +namespace M { +======= +namespace M { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface E { } + interface I { } +} +module M { + export interface E { } // ok + interface I { } // ok +} + +// Doesn't match export visibility, but it's in a different parent, so it's ok +module M { + interface E { } // ok + export interface I { } // ok +} + +module N { + interface I { } + interface I { } // ok + export interface E { } + export interface E { } // ok +} + +module N2 { + interface I { } + export interface I { } // error + export interface E { } + interface E { } // error +} + +// Should report error only once for instantiated module +module M { +>M : typeof M + + module inst { +>inst : typeof inst + + var t; +>t : any + } + export module inst { // one error +>inst : typeof M.inst + + var t; +>t : any + } +} + +// Variables of the same / different type +module M2 { +>M2 : typeof M2 + + var v: string; +>v : string + + export var v: string; // one error (visibility) +>v : string + + var w: number; +>w : number + + export var w: string; // two errors (visibility and type mismatch) +>w : string +} + +module M { +>M : typeof M + + module F { +>F : typeof F + + var t; +>t : any + } + export function F() { } // Only one error for duplicate identifier (don't consider visibility) +>F : () => void +} + +module M { +>M : typeof M + + class C { } +>C : C + + module C { } + export module C { // Two visibility errors (one for the clodule symbol, and one for the merged container symbol) +>C : typeof M.C + + var t; +>t : any + } +} + +// Top level +interface D { } +export interface D { } diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportEvaluateSpecifier.js b/testdata/baselines/reference/submodule/compiler/dynamicImportEvaluateSpecifier.js index be247c57f0..d69f1eee00 100644 --- a/testdata/baselines/reference/submodule/compiler/dynamicImportEvaluateSpecifier.js +++ b/testdata/baselines/reference/submodule/compiler/dynamicImportEvaluateSpecifier.js @@ -18,14 +18,47 @@ const someFunction = async () => { //// [dynamicImportEvaluateSpecifier.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); // https://github.com/microsoft/TypeScript/issues/48285 let i = 0; -Promise.resolve(`${String(i++)}`).then(s => require(s)); -Promise.resolve(`${String(i++)}`).then(s => require(s)); +Promise.resolve(`${String(i++)}`).then(s => __importStar(require(s))); +Promise.resolve(`${String(i++)}`).then(s => __importStar(require(s))); const getPath = async () => { /* in reality this would do some async FS operation, or a web request */ return "/root/my/cool/path"; }; const someFunction = async () => { - const result = await Promise.resolve(`${await getPath()}`).then(s => require(s)); + const result = await Promise.resolve(`${await getPath()}`).then(s => __importStar(require(s))); }; diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportInDefaultExportExpression.js b/testdata/baselines/reference/submodule/compiler/dynamicImportInDefaultExportExpression.js index 888e0e4144..60a643a6dd 100644 --- a/testdata/baselines/reference/submodule/compiler/dynamicImportInDefaultExportExpression.js +++ b/testdata/baselines/reference/submodule/compiler/dynamicImportInDefaultExportExpression.js @@ -9,9 +9,42 @@ export default { //// [dynamicImportInDefaultExportExpression.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { getInstance: function () { - return Promise.resolve().then(() => require('./foo2')); + return Promise.resolve().then(() => __importStar(require('./foo2'))); } }; diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportInDefaultExportExpression.js.diff b/testdata/baselines/reference/submodule/compiler/dynamicImportInDefaultExportExpression.js.diff index 1a1d525748..0b7d21b4bd 100644 --- a/testdata/baselines/reference/submodule/compiler/dynamicImportInDefaultExportExpression.js.diff +++ b/testdata/baselines/reference/submodule/compiler/dynamicImportInDefaultExportExpression.js.diff @@ -1,10 +1,10 @@ --- old.dynamicImportInDefaultExportExpression.js +++ new.dynamicImportInDefaultExportExpression.js -@@= skipped -11, +11 lines =@@ +@@= skipped -44, +44 lines =@@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { getInstance: function () { -- return Promise.resolve().then(function () { return require('./foo2'); }); -+ return Promise.resolve().then(() => require('./foo2')); +- return Promise.resolve().then(function () { return __importStar(require('./foo2')); }); ++ return Promise.resolve().then(() => __importStar(require('./foo2'))); } }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportTrailingComma.js b/testdata/baselines/reference/submodule/compiler/dynamicImportTrailingComma.js index 9e85238a27..b287fb8a3f 100644 --- a/testdata/baselines/reference/submodule/compiler/dynamicImportTrailingComma.js +++ b/testdata/baselines/reference/submodule/compiler/dynamicImportTrailingComma.js @@ -5,5 +5,38 @@ const path = './foo'; import(path,); //// [dynamicImportTrailingComma.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); const path = './foo'; -Promise.resolve(`${path}`).then(s => require(s)); +Promise.resolve(`${path}`).then(s => __importStar(require(s))); diff --git a/testdata/baselines/reference/submodule/compiler/dynamicImportTrailingComma.js.diff b/testdata/baselines/reference/submodule/compiler/dynamicImportTrailingComma.js.diff index 147468858b..778c134b83 100644 --- a/testdata/baselines/reference/submodule/compiler/dynamicImportTrailingComma.js.diff +++ b/testdata/baselines/reference/submodule/compiler/dynamicImportTrailingComma.js.diff @@ -1,8 +1,8 @@ --- old.dynamicImportTrailingComma.js +++ new.dynamicImportTrailingComma.js -@@= skipped -5, +5 lines =@@ - - //// [dynamicImportTrailingComma.js] +@@= skipped -38, +38 lines =@@ + }; + })(); const path = './foo'; --Promise.resolve("".concat(path)).then(function (s) { return require(s); }); -+Promise.resolve(`${path}`).then(s => require(s)); \ No newline at end of file +-Promise.resolve("".concat(path)).then(function (s) { return __importStar(require(s)); }); ++Promise.resolve(`${path}`).then(s => __importStar(require(s))); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitDecoratorMetadata_isolatedModules(module=commonjs).js.diff b/testdata/baselines/reference/submodule/compiler/emitDecoratorMetadata_isolatedModules(module=commonjs).js.diff index 2fc9e41e26..2ac7ff8e29 100644 --- a/testdata/baselines/reference/submodule/compiler/emitDecoratorMetadata_isolatedModules(module=commonjs).js.diff +++ b/testdata/baselines/reference/submodule/compiler/emitDecoratorMetadata_isolatedModules(module=commonjs).js.diff @@ -4,17 +4,50 @@ exports.C3 = C3; //// [index.js] "use strict"; +-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { +- if (k2 === undefined) k2 = k; +- var desc = Object.getOwnPropertyDescriptor(m, k); +- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { +- desc = { enumerable: true, get: function() { return m[k]; } }; +- } +- Object.defineProperty(o, k2, desc); +-}) : (function(o, m, k, k2) { +- if (k2 === undefined) k2 = k; +- o[k2] = m[k]; +-})); +-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { +- Object.defineProperty(o, "default", { enumerable: true, value: v }); +-}) : function(o, v) { +- o["default"] = v; +-}); -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - 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 __importStar = (this && this.__importStar) || (function () { +- var ownKeys = function(o) { +- ownKeys = Object.getOwnPropertyNames || function (o) { +- var ar = []; +- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; +- return ar; +- }; +- return ownKeys(o); +- }; +- return function (mod) { +- if (mod && mod.__esModule) return mod; +- var result = {}; +- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); +- __setModuleDefault(result, mod); +- return result; +- }; +-})(); -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); -}; Object.defineProperty(exports, "__esModule", { value: true }); --var t1 = require("./type1"); +-var t1 = __importStar(require("./type1")); -var class3_1 = require("./class3"); -let HelloWorld = (() => { - class HelloWorld { diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).errors.txt b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).errors.txt deleted file mode 100644 index 67291b1f97..0000000000 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node16'. - - -!!! error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node16'. -==== a.ts (0 errors) ==== - declare var dec: any, __decorate: any; - @dec export class A { - } - - const o = { a: 1 }; - const y = { ...o }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js.diff index 929423ee34..9886632971 100644 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js.diff +++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node16).js.diff @@ -1,27 +1,25 @@ --- old.emitHelpersWithLocalCollisions(module=node16).js +++ new.emitHelpersWithLocalCollisions(module=node16).js -@@= skipped -9, +9 lines =@@ - +@@= skipped -10, +10 lines =@@ //// [a.js] + "use strict"; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - 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; -}; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.A = void 0; -let A = class A { -}; --A = __decorate([ -- dec --], A); --export { A }; -+"use strict"; -+Object.defineProperty(exports, "__esModule", { value: true }); -+exports.A = void 0; +@dec +class A { +} -+exports.A = A; + exports.A = A; +-exports.A = A = __decorate([ +- dec +-], A); const o = { a: 1 }; const y = Object.assign({}, o); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node18).errors.txt b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node18).errors.txt deleted file mode 100644 index 7dfd532d52..0000000000 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node18).errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node18'. - - -!!! error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node18'. -==== a.ts (0 errors) ==== - declare var dec: any, __decorate: any; - @dec export class A { - } - - const o = { a: 1 }; - const y = { ...o }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node18).js.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node18).js.diff index 66178e26d6..f7e3e17ef5 100644 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node18).js.diff @@ -1,27 +1,25 @@ --- old.emitHelpersWithLocalCollisions(module=node18).js +++ new.emitHelpersWithLocalCollisions(module=node18).js -@@= skipped -9, +9 lines =@@ - +@@= skipped -10, +10 lines =@@ //// [a.js] + "use strict"; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - 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; -}; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.A = void 0; -let A = class A { -}; --A = __decorate([ -- dec --], A); --export { A }; -+"use strict"; -+Object.defineProperty(exports, "__esModule", { value: true }); -+exports.A = void 0; +@dec +class A { +} -+exports.A = A; + exports.A = A; +-exports.A = A = __decorate([ +- dec +-], A); const o = { a: 1 }; const y = Object.assign({}, o); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).errors.txt b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).errors.txt deleted file mode 100644 index 68c6714749..0000000000 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node20'. - - -!!! error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node20'. -==== a.ts (0 errors) ==== - declare var dec: any, __decorate: any; - @dec export class A { - } - - const o = { a: 1 }; - const y = { ...o }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).errors.txt.diff deleted file mode 100644 index 0eb8cd4584..0000000000 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).errors.txt.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.emitHelpersWithLocalCollisions(module=node20).errors.txt -+++ new.emitHelpersWithLocalCollisions(module=node20).errors.txt -@@= skipped -0, +0 lines =@@ --error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'. - error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node20'. - - --!!! error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'. - !!! error TS5109: Option 'moduleResolution' must be set to 'Node16' (or left unspecified) when option 'module' is set to 'Node20'. - ==== a.ts (0 errors) ==== - declare var dec: any, __decorate: any; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).js.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).js.diff index a10aa37d78..cc9a2defb2 100644 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).js.diff +++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=node20).js.diff @@ -1,27 +1,25 @@ --- old.emitHelpersWithLocalCollisions(module=node20).js +++ new.emitHelpersWithLocalCollisions(module=node20).js -@@= skipped -9, +9 lines =@@ - +@@= skipped -10, +10 lines =@@ //// [a.js] + "use strict"; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - 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; -}; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.A = void 0; -let A = class A { -}; --A = __decorate([ -- dec --], A); --export { A }; -+"use strict"; -+Object.defineProperty(exports, "__esModule", { value: true }); -+exports.A = void 0; +@dec +class A { +} -+exports.A = A; + exports.A = A; +-exports.A = A = __decorate([ +- dec +-], A); const o = { a: 1 }; const y = Object.assign({}, o); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).errors.txt b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).errors.txt deleted file mode 100644 index 4b7e63ced9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -error TS5109: Option 'moduleResolution' must be set to 'NodeNext' (or left unspecified) when option 'module' is set to 'NodeNext'. - - -!!! error TS5109: Option 'moduleResolution' must be set to 'NodeNext' (or left unspecified) when option 'module' is set to 'NodeNext'. -==== a.ts (0 errors) ==== - declare var dec: any, __decorate: any; - @dec export class A { - } - - const o = { a: 1 }; - const y = { ...o }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).errors.txt.diff deleted file mode 100644 index 9e1146fb6a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).errors.txt.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.emitHelpersWithLocalCollisions(module=nodenext).errors.txt -+++ new.emitHelpersWithLocalCollisions(module=nodenext).errors.txt -@@= skipped -0, +0 lines =@@ --error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'. - error TS5109: Option 'moduleResolution' must be set to 'NodeNext' (or left unspecified) when option 'module' is set to 'NodeNext'. - - --!!! error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'. - !!! error TS5109: Option 'moduleResolution' must be set to 'NodeNext' (or left unspecified) when option 'module' is set to 'NodeNext'. - ==== a.ts (0 errors) ==== - declare var dec: any, __decorate: any; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js.diff index 3a741386c0..9c16969e58 100644 --- a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js.diff +++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=nodenext).js.diff @@ -1,27 +1,25 @@ --- old.emitHelpersWithLocalCollisions(module=nodenext).js +++ new.emitHelpersWithLocalCollisions(module=nodenext).js -@@= skipped -9, +9 lines =@@ - +@@= skipped -10, +10 lines =@@ //// [a.js] + "use strict"; -var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); - 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; -}; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.A = void 0; -let A = class A { -}; --A = __decorate([ -- dec --], A); --export { A }; -+"use strict"; -+Object.defineProperty(exports, "__esModule", { value: true }); -+exports.A = void 0; +@dec +class A { +} -+exports.A = A; + exports.A = A; +-exports.A = A = __decorate([ +- dec +-], A); const o = { a: 1 }; const y = Object.assign({}, o); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=none).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=none).errors.txt.diff new file mode 100644 index 0000000000..5dd684f6ff --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/emitHelpersWithLocalCollisions(module=none).errors.txt.diff @@ -0,0 +1,16 @@ +--- old.emitHelpersWithLocalCollisions(module=none).errors.txt ++++ new.emitHelpersWithLocalCollisions(module=none).errors.txt +@@= skipped -0, +0 lines =@@ +-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. +- +- +-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. +-==== a.ts (0 errors) ==== +- declare var dec: any, __decorate: any; +- @dec export class A { +- } +- +- const o = { a: 1 }; +- const y = { ...o }; +- ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/emptyModuleName.js b/testdata/baselines/reference/submodule/compiler/emptyModuleName.js index 24b2650b26..2646166827 100644 --- a/testdata/baselines/reference/submodule/compiler/emptyModuleName.js +++ b/testdata/baselines/reference/submodule/compiler/emptyModuleName.js @@ -7,7 +7,40 @@ class B extends A { //// [emptyModuleName.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const A = require(""); +const A = __importStar(require("")); class B extends A { } diff --git a/testdata/baselines/reference/submodule/compiler/emptyModuleName.js.diff b/testdata/baselines/reference/submodule/compiler/emptyModuleName.js.diff index a390512c39..553ca7bb65 100644 --- a/testdata/baselines/reference/submodule/compiler/emptyModuleName.js.diff +++ b/testdata/baselines/reference/submodule/compiler/emptyModuleName.js.diff @@ -1,10 +1,10 @@ --- old.emptyModuleName.js +++ new.emptyModuleName.js -@@= skipped -7, +7 lines =@@ - //// [emptyModuleName.js] - "use strict"; +@@= skipped -40, +40 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var A = require(""); -+const A = require(""); +-var A = __importStar(require("")); ++const A = __importStar(require("")); class B extends A { } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt.diff deleted file mode 100644 index bcfc083cb7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt -+++ new.errorForBareSpecifierWithImplicitModuleResolutionNone.errors.txt -@@= skipped -0, +0 lines =@@ --errorForBareSpecifierWithImplicitModuleResolutionNone.ts(3,23): error TS2792: Cannot find module 'non-existent-module'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+errorForBareSpecifierWithImplicitModuleResolutionNone.ts(3,23): error TS2307: Cannot find module 'non-existent-module' or its corresponding type declarations. - - - ==== errorForBareSpecifierWithImplicitModuleResolutionNone.ts (1 errors) ==== -@@= skipped -5, +5 lines =@@ - - import { thing } from "non-existent-module"; - ~~~~~~~~~~~~~~~~~~~~~ --!!! error TS2792: Cannot find module 'non-existent-module'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'non-existent-module' or its corresponding type declarations. - thing() - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.js b/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.js index 1d8dc551be..88b1a4542d 100644 --- a/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.js +++ b/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.js @@ -8,6 +8,39 @@ import("./a"); //// [a.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); exports.x = void 0; -Promise.resolve().then(() => require("./a")); +Promise.resolve().then(() => __importStar(require("./a"))); module.exports = x; diff --git a/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.js.diff b/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.js.diff index 9707ea8dde..b96c5d6c30 100644 --- a/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.js.diff +++ b/testdata/baselines/reference/submodule/compiler/errorForConflictingExportEqualsValue.js.diff @@ -1,10 +1,10 @@ --- old.errorForConflictingExportEqualsValue.js +++ new.errorForConflictingExportEqualsValue.js -@@= skipped -8, +8 lines =@@ - //// [a.js] - "use strict"; +@@= skipped -41, +41 lines =@@ + }; + })(); exports.x = void 0; --Promise.resolve().then(function () { return require("./a"); }); +-Promise.resolve().then(function () { return __importStar(require("./a")); }); -module.exports = exports.x; -+Promise.resolve().then(() => require("./a")); ++Promise.resolve().then(() => __importStar(require("./a"))); +module.exports = x; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.js b/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.js index a2cd84bc39..42797cfd18 100644 --- a/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.js +++ b/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.js @@ -8,7 +8,7 @@ export async function foo() { async function foo() { } -//// [tslib.d.ts] +//// [index.d.ts] export declare function __extends(d: Function, b: Function): void; export declare function __assign(t: any, ...sources: any[]): any; export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; diff --git a/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.symbols b/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.symbols index 0ae0e1aa6f..5781f210fb 100644 --- a/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.symbols +++ b/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.symbols @@ -10,51 +10,51 @@ async function foo() { >foo : Symbol(foo, Decl(script.ts, 0, 0)) } -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === export declare function __extends(d: Function, b: Function): void; ->__extends : Symbol(__extends, Decl(tslib.d.ts, 0, 0)) ->d : Symbol(d, Decl(tslib.d.ts, 0, 34)) +>__extends : Symbol(__extends, Decl(index.d.ts, 0, 0)) +>d : Symbol(d, Decl(index.d.ts, 0, 34)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->b : Symbol(b, Decl(tslib.d.ts, 0, 46)) +>b : Symbol(b, Decl(index.d.ts, 0, 46)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __assign(t: any, ...sources: any[]): any; ->__assign : Symbol(__assign, Decl(tslib.d.ts, 0, 66)) ->t : Symbol(t, Decl(tslib.d.ts, 1, 33)) ->sources : Symbol(sources, Decl(tslib.d.ts, 1, 40)) +>__assign : Symbol(__assign, Decl(index.d.ts, 0, 66)) +>t : Symbol(t, Decl(index.d.ts, 1, 33)) +>sources : Symbol(sources, Decl(index.d.ts, 1, 40)) export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; ->__decorate : Symbol(__decorate, Decl(tslib.d.ts, 1, 65)) ->decorators : Symbol(decorators, Decl(tslib.d.ts, 2, 35)) +>__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65)) +>decorators : Symbol(decorators, Decl(index.d.ts, 2, 35)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->target : Symbol(target, Decl(tslib.d.ts, 2, 58)) ->key : Symbol(key, Decl(tslib.d.ts, 2, 71)) ->desc : Symbol(desc, Decl(tslib.d.ts, 2, 94)) +>target : Symbol(target, Decl(index.d.ts, 2, 58)) +>key : Symbol(key, Decl(index.d.ts, 2, 71)) +>desc : Symbol(desc, Decl(index.d.ts, 2, 94)) export declare function __param(paramIndex: number, decorator: Function): Function; ->__param : Symbol(__param, Decl(tslib.d.ts, 2, 112)) ->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, 3, 32)) ->decorator : Symbol(decorator, Decl(tslib.d.ts, 3, 51)) +>__param : Symbol(__param, Decl(index.d.ts, 2, 112)) +>paramIndex : Symbol(paramIndex, Decl(index.d.ts, 3, 32)) +>decorator : Symbol(decorator, Decl(index.d.ts, 3, 51)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __metadata(metadataKey: any, metadataValue: any): Function; ->__metadata : Symbol(__metadata, Decl(tslib.d.ts, 3, 83)) ->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, 4, 35)) ->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, 4, 52)) +>__metadata : Symbol(__metadata, Decl(index.d.ts, 3, 83)) +>metadataKey : Symbol(metadataKey, Decl(index.d.ts, 4, 35)) +>metadataValue : Symbol(metadataValue, Decl(index.d.ts, 4, 52)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; ->__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, 4, 83)) ->thisArg : Symbol(thisArg, Decl(tslib.d.ts, 5, 34)) ->_arguments : Symbol(_arguments, Decl(tslib.d.ts, 5, 47)) ->P : Symbol(P, Decl(tslib.d.ts, 5, 64)) +>__awaiter : Symbol(__awaiter, Decl(index.d.ts, 4, 83)) +>thisArg : Symbol(thisArg, Decl(index.d.ts, 5, 34)) +>_arguments : Symbol(_arguments, Decl(index.d.ts, 5, 47)) +>P : Symbol(P, Decl(index.d.ts, 5, 64)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->generator : Symbol(generator, Decl(tslib.d.ts, 5, 77)) +>generator : Symbol(generator, Decl(index.d.ts, 5, 77)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __generator(body: Function): any; ->__generator : Symbol(__generator, Decl(tslib.d.ts, 5, 104)) ->body : Symbol(body, Decl(tslib.d.ts, 6, 36)) +>__generator : Symbol(__generator, Decl(index.d.ts, 5, 104)) +>body : Symbol(body, Decl(index.d.ts, 6, 36)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) diff --git a/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.symbols.diff b/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.symbols.diff deleted file mode 100644 index 9ae0085b4a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.symbols.diff +++ /dev/null @@ -1,75 +0,0 @@ ---- old.es5-importHelpersAsyncFunctions.symbols -+++ new.es5-importHelpersAsyncFunctions.symbols -@@= skipped -11, +11 lines =@@ - - === tslib.d.ts === - export declare function __extends(d: Function, b: Function): void; -->__extends : Symbol(__extends, Decl(tslib.d.ts, --, --)) -->d : Symbol(d, Decl(tslib.d.ts, --, --)) -+>__extends : Symbol(__extends, Decl(tslib.d.ts, 0, 0)) -+>d : Symbol(d, Decl(tslib.d.ts, 0, 34)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->b : Symbol(b, Decl(tslib.d.ts, --, --)) -+>b : Symbol(b, Decl(tslib.d.ts, 0, 46)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __assign(t: any, ...sources: any[]): any; -->__assign : Symbol(__assign, Decl(tslib.d.ts, --, --)) -->t : Symbol(t, Decl(tslib.d.ts, --, --)) -->sources : Symbol(sources, Decl(tslib.d.ts, --, --)) -+>__assign : Symbol(__assign, Decl(tslib.d.ts, 0, 66)) -+>t : Symbol(t, Decl(tslib.d.ts, 1, 33)) -+>sources : Symbol(sources, Decl(tslib.d.ts, 1, 40)) - - export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; -->__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --)) -->decorators : Symbol(decorators, Decl(tslib.d.ts, --, --)) -+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, 1, 65)) -+>decorators : Symbol(decorators, Decl(tslib.d.ts, 2, 35)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->target : Symbol(target, Decl(tslib.d.ts, --, --)) -->key : Symbol(key, Decl(tslib.d.ts, --, --)) -->desc : Symbol(desc, Decl(tslib.d.ts, --, --)) -+>target : Symbol(target, Decl(tslib.d.ts, 2, 58)) -+>key : Symbol(key, Decl(tslib.d.ts, 2, 71)) -+>desc : Symbol(desc, Decl(tslib.d.ts, 2, 94)) - - export declare function __param(paramIndex: number, decorator: Function): Function; -->__param : Symbol(__param, Decl(tslib.d.ts, --, --)) -->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --)) -->decorator : Symbol(decorator, Decl(tslib.d.ts, --, --)) -+>__param : Symbol(__param, Decl(tslib.d.ts, 2, 112)) -+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, 3, 32)) -+>decorator : Symbol(decorator, Decl(tslib.d.ts, 3, 51)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __metadata(metadataKey: any, metadataValue: any): Function; -->__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --)) -->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --)) -->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --)) -+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, 3, 83)) -+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, 4, 35)) -+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, 4, 52)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; -->__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --)) -->thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --)) -->_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --)) -->P : Symbol(P, Decl(tslib.d.ts, --, --)) -+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, 4, 83)) -+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, 5, 34)) -+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, 5, 47)) -+>P : Symbol(P, Decl(tslib.d.ts, 5, 64)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->generator : Symbol(generator, Decl(tslib.d.ts, --, --)) -+>generator : Symbol(generator, Decl(tslib.d.ts, 5, 77)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __generator(body: Function): any; -->__generator : Symbol(__generator, Decl(tslib.d.ts, --, --)) -->body : Symbol(body, Decl(tslib.d.ts, --, --)) -+>__generator : Symbol(__generator, Decl(tslib.d.ts, 5, 104)) -+>body : Symbol(body, Decl(tslib.d.ts, 6, 36)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) diff --git a/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.types b/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.types index e7d5efedac..91286a7c8e 100644 --- a/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.types +++ b/testdata/baselines/reference/submodule/compiler/es5-importHelpersAsyncFunctions.types @@ -10,7 +10,7 @@ async function foo() { >foo : () => Promise } -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === export declare function __extends(d: Function, b: Function): void; >__extends : (d: Function, b: Function) => void >d : Function diff --git a/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.errors.txt b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.errors.txt new file mode 100644 index 0000000000..8b3f425d72 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.errors.txt @@ -0,0 +1,74 @@ +es5ModuleInternalNamedImports.ts(22,5): error TS1194: Export declarations are not permitted in a namespace. +es5ModuleInternalNamedImports.ts(23,5): error TS1194: Export declarations are not permitted in a namespace. +es5ModuleInternalNamedImports.ts(24,5): error TS1194: Export declarations are not permitted in a namespace. +es5ModuleInternalNamedImports.ts(25,5): error TS1194: Export declarations are not permitted in a namespace. +es5ModuleInternalNamedImports.ts(26,5): error TS1194: Export declarations are not permitted in a namespace. +es5ModuleInternalNamedImports.ts(27,5): error TS1194: Export declarations are not permitted in a namespace. +es5ModuleInternalNamedImports.ts(28,5): error TS1194: Export declarations are not permitted in a namespace. +es5ModuleInternalNamedImports.ts(29,5): error TS1194: Export declarations are not permitted in a namespace. +es5ModuleInternalNamedImports.ts(30,25): error TS1147: Import declarations in a namespace cannot reference a module. +es5ModuleInternalNamedImports.ts(31,20): error TS1147: Import declarations in a namespace cannot reference a module. +es5ModuleInternalNamedImports.ts(32,32): error TS1147: Import declarations in a namespace cannot reference a module. +es5ModuleInternalNamedImports.ts(34,16): error TS2307: Cannot find module 'M3' or its corresponding type declarations. + + +==== es5ModuleInternalNamedImports.ts (12 errors) ==== + export module M { + // variable + export var M_V = 0; + // interface + export interface M_I { } + //calss + export class M_C { } + // instantiated module + export module M_M { var x; } + // uninstantiated module + export module M_MU { } + // function + export function M_F() { } + // enum + export enum M_E { } + // type + export type M_T = number; + // alias + export import M_A = M_M; + + // Reexports + export {M_V as v}; + ~~~~~~~~~~~~~~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + export {M_I as i}; + ~~~~~~~~~~~~~~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + export {M_C as c}; + ~~~~~~~~~~~~~~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + export {M_M as m}; + ~~~~~~~~~~~~~~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + export {M_MU as mu}; + ~~~~~~~~~~~~~~~~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + export {M_F as f}; + ~~~~~~~~~~~~~~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + export {M_E as e}; + ~~~~~~~~~~~~~~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + export {M_A as a}; + ~~~~~~~~~~~~~~~~~~ +!!! error TS1194: Export declarations are not permitted in a namespace. + import * as M2 from "M2"; + ~~~~ +!!! error TS1147: Import declarations in a namespace cannot reference a module. + import M4 from "M4"; + ~~~~ +!!! error TS1147: Import declarations in a namespace cannot reference a module. + export import M5 = require("M5"); + ~~~~ +!!! error TS1147: Import declarations in a namespace cannot reference a module. + } + import M3 from "M3"; + ~~~~ +!!! error TS2307: Cannot find module 'M3' or its corresponding type declarations. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.js b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.js new file mode 100644 index 0000000000..92b3d28ae6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.js @@ -0,0 +1,77 @@ +//// [tests/cases/compiler/es5ModuleInternalNamedImports.ts] //// + +//// [es5ModuleInternalNamedImports.ts] +export module M { + // variable + export var M_V = 0; + // interface + export interface M_I { } + //calss + export class M_C { } + // instantiated module + export module M_M { var x; } + // uninstantiated module + export module M_MU { } + // function + export function M_F() { } + // enum + export enum M_E { } + // type + export type M_T = number; + // alias + export import M_A = M_M; + + // Reexports + export {M_V as v}; + export {M_I as i}; + export {M_C as c}; + export {M_M as m}; + export {M_MU as mu}; + export {M_F as f}; + export {M_E as e}; + export {M_A as a}; + import * as M2 from "M2"; + import M4 from "M4"; + export import M5 = require("M5"); +} +import M3 from "M3"; + + +//// [es5ModuleInternalNamedImports.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.M = void 0; +var M; +(function (M) { + // variable + M.M_V = 0; + //calss + class M_C { + } + M.M_C = M_C; + // instantiated module + let M_M; + (function (M_M) { + var x; + })(M_M = M.M_M || (M.M_M = {})); + // function + function M_F() { } + M.M_F = M_F; + // enum + let M_E; + (function (M_E) { + })(M_E = M.M_E || (M.M_E = {})); + M.M_A = M_M; + // Reexports + export { M_V as v }; + export { M_I as i }; + export { M_C as c }; + export { M_M as m }; + export { M_MU as mu }; + export { M_F as f }; + export { M_E as e }; + export { M_A as a }; + import * as M2 from "M2"; + import M4 from "M4"; + export import M5 = require("M5"); +})(M || (exports.M = M = {})); diff --git a/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.js.diff b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.js.diff new file mode 100644 index 0000000000..714f1c29e8 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.js.diff @@ -0,0 +1,21 @@ +--- old.es5ModuleInternalNamedImports.js ++++ new.es5ModuleInternalNamedImports.js +@@= skipped -60, +60 lines =@@ + let M_E; + (function (M_E) { + })(M_E = M.M_E || (M.M_E = {})); +- // alias + M.M_A = M_M; ++ // Reexports ++ export { M_V as v }; ++ export { M_I as i }; ++ export { M_C as c }; ++ export { M_M as m }; ++ export { M_MU as mu }; ++ export { M_F as f }; ++ export { M_E as e }; ++ export { M_A as a }; ++ import * as M2 from "M2"; ++ import M4 from "M4"; ++ export import M5 = require("M5"); + })(M || (exports.M = M = {})); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.symbols b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.symbols new file mode 100644 index 0000000000..b8dc3cf4ec --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.symbols @@ -0,0 +1,89 @@ +//// [tests/cases/compiler/es5ModuleInternalNamedImports.ts] //// + +=== es5ModuleInternalNamedImports.ts === +export module M { +>M : Symbol(M, Decl(es5ModuleInternalNamedImports.ts, 0, 0)) + + // variable + export var M_V = 0; +>M_V : Symbol(M_V, Decl(es5ModuleInternalNamedImports.ts, 2, 14)) + + // interface + export interface M_I { } +>M_I : Symbol(M_I, Decl(es5ModuleInternalNamedImports.ts, 2, 23)) + + //calss + export class M_C { } +>M_C : Symbol(M_C, Decl(es5ModuleInternalNamedImports.ts, 4, 28)) + + // instantiated module + export module M_M { var x; } +>M_M : Symbol(M_M, Decl(es5ModuleInternalNamedImports.ts, 6, 24)) +>x : Symbol(x, Decl(es5ModuleInternalNamedImports.ts, 8, 27)) + + // uninstantiated module + export module M_MU { } +>M_MU : Symbol(M_MU, Decl(es5ModuleInternalNamedImports.ts, 8, 32)) + + // function + export function M_F() { } +>M_F : Symbol(M_F, Decl(es5ModuleInternalNamedImports.ts, 10, 26)) + + // enum + export enum M_E { } +>M_E : Symbol(M_E, Decl(es5ModuleInternalNamedImports.ts, 12, 29)) + + // type + export type M_T = number; +>M_T : Symbol(M_T, Decl(es5ModuleInternalNamedImports.ts, 14, 23)) + + // alias + export import M_A = M_M; +>M_A : Symbol(M_A, Decl(es5ModuleInternalNamedImports.ts, 16, 29)) +>M_M : Symbol(M_M, Decl(es5ModuleInternalNamedImports.ts, 6, 24)) + + // Reexports + export {M_V as v}; +>M_V : Symbol(M_V, Decl(es5ModuleInternalNamedImports.ts, 2, 14)) +>v : Symbol(v, Decl(es5ModuleInternalNamedImports.ts, 21, 12)) + + export {M_I as i}; +>M_I : Symbol(M_I, Decl(es5ModuleInternalNamedImports.ts, 2, 23)) +>i : Symbol(i, Decl(es5ModuleInternalNamedImports.ts, 22, 12)) + + export {M_C as c}; +>M_C : Symbol(M_C, Decl(es5ModuleInternalNamedImports.ts, 4, 28)) +>c : Symbol(c, Decl(es5ModuleInternalNamedImports.ts, 23, 12)) + + export {M_M as m}; +>M_M : Symbol(M_M, Decl(es5ModuleInternalNamedImports.ts, 6, 24)) +>m : Symbol(m, Decl(es5ModuleInternalNamedImports.ts, 24, 12)) + + export {M_MU as mu}; +>M_MU : Symbol(M_MU, Decl(es5ModuleInternalNamedImports.ts, 8, 32)) +>mu : Symbol(mu, Decl(es5ModuleInternalNamedImports.ts, 25, 12)) + + export {M_F as f}; +>M_F : Symbol(M_F, Decl(es5ModuleInternalNamedImports.ts, 10, 26)) +>f : Symbol(f, Decl(es5ModuleInternalNamedImports.ts, 26, 12)) + + export {M_E as e}; +>M_E : Symbol(M_E, Decl(es5ModuleInternalNamedImports.ts, 12, 29)) +>e : Symbol(e, Decl(es5ModuleInternalNamedImports.ts, 27, 12)) + + export {M_A as a}; +>M_A : Symbol(M_A, Decl(es5ModuleInternalNamedImports.ts, 16, 29)) +>a : Symbol(a, Decl(es5ModuleInternalNamedImports.ts, 28, 12)) + + import * as M2 from "M2"; +>M2 : Symbol(M2, Decl(es5ModuleInternalNamedImports.ts, 29, 10)) + + import M4 from "M4"; +>M4 : Symbol(M4, Decl(es5ModuleInternalNamedImports.ts, 30, 10)) + + export import M5 = require("M5"); +>M5 : Symbol(M5, Decl(es5ModuleInternalNamedImports.ts, 30, 24)) +} +import M3 from "M3"; +>M3 : Symbol(M3, Decl(es5ModuleInternalNamedImports.ts, 33, 6)) + diff --git a/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.types b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.types new file mode 100644 index 0000000000..9c1b739548 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es5ModuleInternalNamedImports.types @@ -0,0 +1,86 @@ +//// [tests/cases/compiler/es5ModuleInternalNamedImports.ts] //// + +=== es5ModuleInternalNamedImports.ts === +export module M { +>M : typeof M + + // variable + export var M_V = 0; +>M_V : number +>0 : 0 + + // interface + export interface M_I { } + //calss + export class M_C { } +>M_C : M_C + + // instantiated module + export module M_M { var x; } +>M_M : typeof M_M +>x : any + + // uninstantiated module + export module M_MU { } + // function + export function M_F() { } +>M_F : () => void + + // enum + export enum M_E { } +>M_E : M_E + + // type + export type M_T = number; +>M_T : number + + // alias + export import M_A = M_M; +>M_A : typeof M_M +>M_M : typeof M_M + + // Reexports + export {M_V as v}; +>M_V : number +>v : number + + export {M_I as i}; +>M_I : any +>i : any + + export {M_C as c}; +>M_C : typeof M_C +>c : typeof M_C + + export {M_M as m}; +>M_M : typeof M_M +>m : typeof M_M + + export {M_MU as mu}; +>M_MU : any +>mu : any + + export {M_F as f}; +>M_F : () => void +>f : () => void + + export {M_E as e}; +>M_E : typeof M_E +>e : typeof M_E + + export {M_A as a}; +>M_A : typeof M_M +>a : typeof M_M + + import * as M2 from "M2"; +>M2 : any + + import M4 from "M4"; +>M4 : any + + export import M5 = require("M5"); +>M5 : any +} +import M3 from "M3"; +>M3 : any + diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAll.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ExportAll.errors.txt.diff deleted file mode 100644 index f38a770b97..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAll.errors.txt.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.es6ExportAll.errors.txt -+++ new.es6ExportAll.errors.txt -@@= skipped -0, +0 lines =@@ -- -+client.ts(1,15): error TS2307: Cannot find module 'server' or its corresponding type declarations. -+ -+ -+==== server.ts (0 errors) ==== -+ export class c { -+ } -+ export interface i { -+ } -+ export module m { -+ export var x = 10; -+ } -+ export var x = 10; -+ export module uninstantiated { -+ } -+ -+==== client.ts (1 errors) ==== -+ export * from "server"; -+ ~~~~~~~~ -+!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.errors.txt index e592d4375e..4a7c3f7332 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.errors.txt @@ -1,5 +1,4 @@ a.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. -b.ts(1,20): error TS2307: Cannot find module 'a' or its corresponding type declarations. ==== a.ts (1 errors) ==== @@ -8,8 +7,6 @@ b.ts(1,20): error TS2307: Cannot find module 'a' or its corresponding type decla ~~~~~~~~~~~ !!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. -==== b.ts (1 errors) ==== - import * as a from "a"; - ~~~ -!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. +==== b.ts (0 errors) ==== + import * as a from "./a"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.errors.txt.diff deleted file mode 100644 index dface1b1ee..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.es6ExportAssignment2.errors.txt -+++ new.es6ExportAssignment2.errors.txt -@@= skipped -0, +0 lines =@@ - a.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. -+b.ts(1,20): error TS2307: Cannot find module 'a' or its corresponding type declarations. - - - ==== a.ts (1 errors) ==== -@@= skipped -6, +7 lines =@@ - ~~~~~~~~~~~ - !!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. - --==== b.ts (0 errors) ==== -+==== b.ts (1 errors) ==== - import * as a from "a"; -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.js b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.js index 3278af118c..85867d23e2 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.js +++ b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.js @@ -5,7 +5,7 @@ var a = 10; export = a; // Error: export = not allowed in ES6 //// [b.ts] -import * as a from "a"; +import * as a from "./a"; //// [a.js] diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.symbols b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.symbols index 6fa64f1a1e..ea19d84a18 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.symbols +++ b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.symbols @@ -8,6 +8,6 @@ export = a; // Error: export = not allowed in ES6 >a : Symbol(a, Decl(a.ts, 0, 3)) === b.ts === -import * as a from "a"; +import * as a from "./a"; >a : Symbol(a, Decl(b.ts, 0, 6)) diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.types b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.types index 1603e2380d..3306dcb6ca 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.types +++ b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.types @@ -9,6 +9,6 @@ export = a; // Error: export = not allowed in ES6 >a : number === b.ts === -import * as a from "a"; ->a : any +import * as a from "./a"; +>a : number diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.types.diff b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.types.diff deleted file mode 100644 index 017ee3d515..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment2.types.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- old.es6ExportAssignment2.types -+++ new.es6ExportAssignment2.types -@@= skipped -9, +9 lines =@@ - - === b.ts === - import * as a from "a"; -->a : number -+>a : any diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment3.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment3.errors.txt.diff deleted file mode 100644 index 84ef32a805..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment3.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.es6ExportAssignment3.errors.txt -+++ new.es6ExportAssignment3.errors.txt -@@= skipped -0, +0 lines =@@ -- -+b.ts(1,20): error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ -+ -+==== a.d.ts (0 errors) ==== -+ declare var a: number; -+ export = a; // OK, in ambient context -+ -+==== b.ts (1 errors) ==== -+ import * as a from "a"; -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment3.types.diff b/testdata/baselines/reference/submodule/compiler/es6ExportAssignment3.types.diff deleted file mode 100644 index d49967ddcc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportAssignment3.types.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- old.es6ExportAssignment3.types -+++ new.es6ExportAssignment3.types -@@= skipped -8, +8 lines =@@ - - === b.ts === - import * as a from "a"; -->a : number -+>a : any diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.errors.txt deleted file mode 100644 index 2010b48604..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.errors.txt +++ /dev/null @@ -1,35 +0,0 @@ -client.ts(1,19): error TS2307: Cannot find module 'server' or its corresponding type declarations. -client.ts(2,25): error TS2307: Cannot find module 'server' or its corresponding type declarations. -client.ts(3,44): error TS2307: Cannot find module 'server' or its corresponding type declarations. -client.ts(4,32): error TS2307: Cannot find module 'server' or its corresponding type declarations. -client.ts(5,19): error TS2307: Cannot find module 'server' or its corresponding type declarations. - - -==== server.ts (0 errors) ==== - export class c { - } - export interface i { - } - export module m { - export var x = 10; - } - export var x = 10; - export module uninstantiated { - } - -==== client.ts (5 errors) ==== - export { c } from "server"; - ~~~~~~~~ -!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. - export { c as c2 } from "server"; - ~~~~~~~~ -!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. - export { i, m as instantiatedModule } from "server"; - ~~~~~~~~ -!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. - export { uninstantiated } from "server"; - ~~~~~~~~ -!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. - export { x } from "server"; - ~~~~~~~~ -!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.errors.txt.diff deleted file mode 100644 index c50824c998..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.errors.txt.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- old.es6ExportClauseWithoutModuleSpecifier.errors.txt -+++ new.es6ExportClauseWithoutModuleSpecifier.errors.txt -@@= skipped -0, +0 lines =@@ -- -+client.ts(1,19): error TS2307: Cannot find module 'server' or its corresponding type declarations. -+client.ts(2,25): error TS2307: Cannot find module 'server' or its corresponding type declarations. -+client.ts(3,44): error TS2307: Cannot find module 'server' or its corresponding type declarations. -+client.ts(4,32): error TS2307: Cannot find module 'server' or its corresponding type declarations. -+client.ts(5,19): error TS2307: Cannot find module 'server' or its corresponding type declarations. -+ -+ -+==== server.ts (0 errors) ==== -+ export class c { -+ } -+ export interface i { -+ } -+ export module m { -+ export var x = 10; -+ } -+ export var x = 10; -+ export module uninstantiated { -+ } -+ -+==== client.ts (5 errors) ==== -+ export { c } from "server"; -+ ~~~~~~~~ -+!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. -+ export { c as c2 } from "server"; -+ ~~~~~~~~ -+!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. -+ export { i, m as instantiatedModule } from "server"; -+ ~~~~~~~~ -+!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. -+ export { uninstantiated } from "server"; -+ ~~~~~~~~ -+!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. -+ export { x } from "server"; -+ ~~~~~~~~ -+!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.js b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.js index cb5bd291bf..bf84f48495 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.js +++ b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.js @@ -13,11 +13,11 @@ export module uninstantiated { } //// [client.ts] -export { c } from "server"; -export { c as c2 } from "server"; -export { i, m as instantiatedModule } from "server"; -export { uninstantiated } from "server"; -export { x } from "server"; +export { c } from "./server"; +export { c as c2 } from "./server"; +export { i, m as instantiatedModule } from "./server"; +export { uninstantiated } from "./server"; +export { x } from "./server"; //// [server.js] export class c { @@ -29,11 +29,10 @@ var m; })(m || (m = {})); export var x = 10; //// [client.js] -export { c } from "server"; -export { c as c2 } from "server"; -export { i, m as instantiatedModule } from "server"; -export { uninstantiated } from "server"; -export { x } from "server"; +export { c } from "./server"; +export { c as c2 } from "./server"; +export { m as instantiatedModule } from "./server"; +export { x } from "./server"; //// [server.d.ts] @@ -48,8 +47,8 @@ export declare var x: number; export declare namespace uninstantiated { } //// [client.d.ts] -export { c } from "server"; -export { c as c2 } from "server"; -export { i, m as instantiatedModule } from "server"; -export { uninstantiated } from "server"; -export { x } from "server"; +export { c } from "./server"; +export { c as c2 } from "./server"; +export { i, m as instantiatedModule } from "./server"; +export { uninstantiated } from "./server"; +export { x } from "./server"; diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.js.diff b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.js.diff index dbba79c2d7..a3df31b6ba 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.js.diff @@ -9,13 +9,4 @@ +var m; (function (m) { m.x = 10; - })(m || (m = {})); -@@= skipped -8, +9 lines =@@ - //// [client.js] - export { c } from "server"; - export { c as c2 } from "server"; --export { m as instantiatedModule } from "server"; -+export { i, m as instantiatedModule } from "server"; -+export { uninstantiated } from "server"; - export { x } from "server"; - + })(m || (m = {})); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.symbols b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.symbols index 61e90619f5..9edf7a3487 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.symbols +++ b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.symbols @@ -21,19 +21,21 @@ export module uninstantiated { } === client.ts === -export { c } from "server"; +export { c } from "./server"; >c : Symbol(c, Decl(client.ts, 0, 8)) -export { c as c2 } from "server"; +export { c as c2 } from "./server"; +>c : Symbol(c, Decl(server.ts, 0, 0)) >c2 : Symbol(c2, Decl(client.ts, 1, 8)) -export { i, m as instantiatedModule } from "server"; +export { i, m as instantiatedModule } from "./server"; >i : Symbol(i, Decl(client.ts, 2, 8)) +>m : Symbol(m, Decl(server.ts, 3, 1)) >instantiatedModule : Symbol(instantiatedModule, Decl(client.ts, 2, 11)) -export { uninstantiated } from "server"; +export { uninstantiated } from "./server"; >uninstantiated : Symbol(uninstantiated, Decl(client.ts, 3, 8)) -export { x } from "server"; +export { x } from "./server"; >x : Symbol(x, Decl(client.ts, 4, 8)) diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.symbols.diff b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.symbols.diff deleted file mode 100644 index 4582b2e773..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.es6ExportClauseWithoutModuleSpecifier.symbols -+++ new.es6ExportClauseWithoutModuleSpecifier.symbols -@@= skipped -24, +24 lines =@@ - >c : Symbol(c, Decl(client.ts, 0, 8)) - - export { c as c2 } from "server"; -->c : Symbol(c, Decl(server.ts, 0, 0)) - >c2 : Symbol(c2, Decl(client.ts, 1, 8)) - - export { i, m as instantiatedModule } from "server"; - >i : Symbol(i, Decl(client.ts, 2, 8)) -->m : Symbol(m, Decl(server.ts, 3, 1)) - >instantiatedModule : Symbol(instantiatedModule, Decl(client.ts, 2, 11)) - - export { uninstantiated } from "server"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.types b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.types index a218c4c71c..05368b3c18 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.types +++ b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.types @@ -21,21 +21,21 @@ export module uninstantiated { } === client.ts === -export { c } from "server"; ->c : any +export { c } from "./server"; +>c : typeof import("server").c -export { c as c2 } from "server"; ->c : any ->c2 : any +export { c as c2 } from "./server"; +>c : typeof import("server").c +>c2 : typeof import("server").c -export { i, m as instantiatedModule } from "server"; +export { i, m as instantiatedModule } from "./server"; >i : any ->m : any ->instantiatedModule : any +>m : typeof import("server").m +>instantiatedModule : typeof import("server").m -export { uninstantiated } from "server"; +export { uninstantiated } from "./server"; >uninstantiated : any -export { x } from "server"; ->x : any +export { x } from "./server"; +>x : number diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.types.diff b/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.types.diff deleted file mode 100644 index 67fe5dd7d1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ExportClauseWithoutModuleSpecifier.types.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.es6ExportClauseWithoutModuleSpecifier.types -+++ new.es6ExportClauseWithoutModuleSpecifier.types -@@= skipped -21, +21 lines =@@ - - === client.ts === - export { c } from "server"; -->c : typeof import("server").c -+>c : any - - export { c as c2 } from "server"; -->c : typeof import("server").c -->c2 : typeof import("server").c -+>c : any -+>c2 : any - - export { i, m as instantiatedModule } from "server"; - >i : any -->m : typeof import("server").m -->instantiatedModule : typeof import("server").m -+>m : any -+>instantiatedModule : any - - export { uninstantiated } from "server"; - >uninstantiated : any - - export { x } from "server"; -->x : number -+>x : any diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.js b/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.js index 30831ecb96..d5fc94db32 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.js +++ b/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.js @@ -220,6 +220,28 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi if (k2 === undefined) k2 = k; o[k2] = m[k]; })); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; @@ -244,15 +266,15 @@ z7.a; z8.a; z9.a; z0.a; -const y2 = require("variable"); -const y3 = require("interface-variable"); -const y4 = require("module"); -const y5 = require("interface-module"); -const y6 = require("variable-module"); -const y7 = require("function"); -const y8 = require("function-module"); -const y9 = require("class"); -const y0 = require("class-module"); +const y2 = __importStar(require("variable")); +const y3 = __importStar(require("interface-variable")); +const y4 = __importStar(require("module")); +const y5 = __importStar(require("interface-module")); +const y6 = __importStar(require("variable-module")); +const y7 = __importStar(require("function")); +const y8 = __importStar(require("function-module")); +const y9 = __importStar(require("class")); +const y0 = __importStar(require("class-module")); y1.a; y2.a; y3.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.js.diff b/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.js.diff index 032ba1bf0d..a723facb67 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.js.diff @@ -1,6 +1,6 @@ --- old.es6ExportEqualsInterop.js +++ new.es6ExportEqualsInterop.js -@@= skipped -224, +224 lines =@@ +@@= skipped -246, +246 lines =@@ }; Object.defineProperty(exports, "__esModule", { value: true }); exports.a0 = exports.a9 = exports.a8 = exports.a7 = exports.a6 = exports.a5 = exports.a4 = exports.a3 = exports.a2 = exports.a1 = void 0; @@ -29,24 +29,24 @@ z8.a; z9.a; z0.a; --var y2 = require("variable"); --var y3 = require("interface-variable"); --var y4 = require("module"); --var y5 = require("interface-module"); --var y6 = require("variable-module"); --var y7 = require("function"); --var y8 = require("function-module"); --var y9 = require("class"); --var y0 = require("class-module"); -+const y2 = require("variable"); -+const y3 = require("interface-variable"); -+const y4 = require("module"); -+const y5 = require("interface-module"); -+const y6 = require("variable-module"); -+const y7 = require("function"); -+const y8 = require("function-module"); -+const y9 = require("class"); -+const y0 = require("class-module"); +-var y2 = __importStar(require("variable")); +-var y3 = __importStar(require("interface-variable")); +-var y4 = __importStar(require("module")); +-var y5 = __importStar(require("interface-module")); +-var y6 = __importStar(require("variable-module")); +-var y7 = __importStar(require("function")); +-var y8 = __importStar(require("function-module")); +-var y9 = __importStar(require("class")); +-var y0 = __importStar(require("class-module")); ++const y2 = __importStar(require("variable")); ++const y3 = __importStar(require("interface-variable")); ++const y4 = __importStar(require("module")); ++const y5 = __importStar(require("interface-module")); ++const y6 = __importStar(require("variable-module")); ++const y7 = __importStar(require("function")); ++const y8 = __importStar(require("function-module")); ++const y9 = __importStar(require("class")); ++const y0 = __importStar(require("class-module")); y1.a; y2.a; y3.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.types b/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.types index 6c7cac3c5a..96f4e58936 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.types +++ b/testdata/baselines/reference/submodule/compiler/es6ExportEqualsInterop.types @@ -138,13 +138,13 @@ import * as y7 from "function"; >y7 : () => any import * as y8 from "function-module"; ->y8 : typeof z8 +>y8 : typeof y8 import * as y9 from "class"; >y9 : typeof z9 import * as y0 from "class-module"; ->y0 : typeof z0 +>y0 : typeof y0 y1.a; >y1.a : any @@ -183,7 +183,7 @@ y7.a; y8.a; >y8.a : number ->y8 : typeof z8 +>y8 : typeof y8 >a : number y9.a; @@ -193,7 +193,7 @@ y9.a; y0.a; >y0.a : number ->y0 : typeof z0 +>y0 : typeof y0 >a : number // named import diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.errors.txt deleted file mode 100644 index 6512953174..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -es6ImportDefaultBinding_1.ts(1,28): error TS2307: Cannot find module 'es6ImportDefaultBinding_0' or its corresponding type declarations. -es6ImportDefaultBinding_1.ts(3,29): error TS2307: Cannot find module 'es6ImportDefaultBinding_0' or its corresponding type declarations. - - -==== es6ImportDefaultBinding_0.ts (0 errors) ==== - var a = 10; - export default a; - -==== es6ImportDefaultBinding_1.ts (2 errors) ==== - import defaultBinding from "es6ImportDefaultBinding_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBinding_0' or its corresponding type declarations. - var x = defaultBinding; - import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBinding_0' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.errors.txt.diff deleted file mode 100644 index cd37e9e408..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.es6ImportDefaultBinding.errors.txt -+++ new.es6ImportDefaultBinding.errors.txt -@@= skipped -0, +0 lines =@@ -- -+es6ImportDefaultBinding_1.ts(1,28): error TS2307: Cannot find module 'es6ImportDefaultBinding_0' or its corresponding type declarations. -+es6ImportDefaultBinding_1.ts(3,29): error TS2307: Cannot find module 'es6ImportDefaultBinding_0' or its corresponding type declarations. -+ -+ -+==== es6ImportDefaultBinding_0.ts (0 errors) ==== -+ var a = 10; -+ export default a; -+ -+==== es6ImportDefaultBinding_1.ts (2 errors) ==== -+ import defaultBinding from "es6ImportDefaultBinding_0"; -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBinding_0' or its corresponding type declarations. -+ var x = defaultBinding; -+ import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBinding_0' or its corresponding type declarations. -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.js index bdc9b4b846..4dc135ea48 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.js @@ -5,16 +5,16 @@ var a = 10; export default a; //// [es6ImportDefaultBinding_1.ts] -import defaultBinding from "es6ImportDefaultBinding_0"; +import defaultBinding from "./es6ImportDefaultBinding_0"; var x = defaultBinding; -import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used +import defaultBinding2 from "./es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used //// [es6ImportDefaultBinding_0.js] var a = 10; export default a; //// [es6ImportDefaultBinding_1.js] -import defaultBinding from "es6ImportDefaultBinding_0"; +import defaultBinding from "./es6ImportDefaultBinding_0"; var x = defaultBinding; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.symbols b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.symbols index a5b73019ad..1b8360a6dd 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.symbols +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.symbols @@ -8,13 +8,13 @@ export default a; >a : Symbol(a, Decl(es6ImportDefaultBinding_0.ts, 0, 3)) === es6ImportDefaultBinding_1.ts === -import defaultBinding from "es6ImportDefaultBinding_0"; +import defaultBinding from "./es6ImportDefaultBinding_0"; >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBinding_1.ts, 0, 6)) var x = defaultBinding; >x : Symbol(x, Decl(es6ImportDefaultBinding_1.ts, 1, 3)) >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBinding_1.ts, 0, 6)) -import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used +import defaultBinding2 from "./es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used >defaultBinding2 : Symbol(defaultBinding2, Decl(es6ImportDefaultBinding_1.ts, 2, 6)) diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.types b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.types index 38c14132c6..a92b38a459 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.types +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.types @@ -9,13 +9,13 @@ export default a; >a : number === es6ImportDefaultBinding_1.ts === -import defaultBinding from "es6ImportDefaultBinding_0"; ->defaultBinding : any +import defaultBinding from "./es6ImportDefaultBinding_0"; +>defaultBinding : number var x = defaultBinding; ->x : any ->defaultBinding : any +>x : number +>defaultBinding : number -import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used ->defaultBinding2 : any +import defaultBinding2 from "./es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used +>defaultBinding2 : number diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.types.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.types.diff deleted file mode 100644 index 9bcbc05cae..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBinding.types.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.es6ImportDefaultBinding.types -+++ new.es6ImportDefaultBinding.types -@@= skipped -9, +9 lines =@@ - - === es6ImportDefaultBinding_1.ts === - import defaultBinding from "es6ImportDefaultBinding_0"; -->defaultBinding : number -+>defaultBinding : any - - var x = defaultBinding; -->x : number -->defaultBinding : number -+>x : any -+>defaultBinding : any - - import defaultBinding2 from "es6ImportDefaultBinding_0"; // elide this import since defaultBinding2 is not used -->defaultBinding2 : number -+>defaultBinding2 : any diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingDts.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingDts.js index ec87f8e3a4..4b8a2bd012 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingDts.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingDts.js @@ -18,9 +18,12 @@ class c { exports.default = c; //// [client.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; -const server_1 = require("./server"); +const server_1 = __importDefault(require("./server")); exports.x = new server_1.default(); diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingDts.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingDts.js.diff index e0d627696b..e83572726b 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingDts.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingDts.js.diff @@ -1,10 +1,10 @@ --- old.es6ImportDefaultBindingDts.js +++ new.es6ImportDefaultBindingDts.js -@@= skipped -19, +19 lines =@@ - "use strict"; +@@= skipped -22, +22 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; --var server_1 = require("./server"); -+const server_1 = require("./server"); +-var server_1 = __importDefault(require("./server")); ++const server_1 = __importDefault(require("./server")); exports.x = new server_1.default(); diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt index f2a172092a..a581c4deac 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt @@ -1,9 +1,9 @@ -es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(1,34): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(3,36): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(5,41): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,44): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(9,43): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,38): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. +es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(3,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? +es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(5,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? +es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? +es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,30): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? +es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(9,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? +es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,27): error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? ==== es6ImportDefaultBindingFollowedWithNamedImport1_0.ts (0 errors) ==== @@ -11,28 +11,28 @@ es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,38): error TS2307: Canno export default a; ==== es6ImportDefaultBindingFollowedWithNamedImport1_1.ts (6 errors) ==== - import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. + import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1: number = defaultBinding1; - import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. + import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; + ~ +!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? var x1: number = defaultBinding2; - import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. + import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; + ~ +!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? var x1: number = defaultBinding3; - import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. + import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; + ~ +!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? + ~ +!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? var x1: number = defaultBinding4; - import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. + import defaultBinding5, { x as z, } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; + ~ +!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? var x1: number = defaultBinding5; - import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. + import defaultBinding6, { m, } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; + ~ +!!! error TS2614: Module '"./es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? var x1: number = defaultBinding6; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt.diff deleted file mode 100644 index 714db5ba86..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt.diff +++ /dev/null @@ -1,58 +0,0 @@ ---- old.es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt -+++ new.es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt -@@= skipped -0, +0 lines =@@ --es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(3,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? --es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(5,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? --es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? --es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,30): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? --es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(9,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? --es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,27): error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? -+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(1,34): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(3,36): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(5,41): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(7,44): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(9,43): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. -+es6ImportDefaultBindingFollowedWithNamedImport1_1.ts(11,38): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. - - - ==== es6ImportDefaultBindingFollowedWithNamedImport1_0.ts (0 errors) ==== -@@= skipped -11, +11 lines =@@ - - ==== es6ImportDefaultBindingFollowedWithNamedImport1_1.ts (6 errors) ==== - import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. - var x1: number = defaultBinding1; - import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -- ~ --!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. - var x1: number = defaultBinding2; - import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -- ~ --!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. - var x1: number = defaultBinding3; - import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -- ~ --!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? -- ~ --!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'a'. Did you mean to use 'import a from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. - var x1: number = defaultBinding4; - import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -- ~ --!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'x'. Did you mean to use 'import x from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. - var x1: number = defaultBinding5; - import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -- ~ --!!! error TS2614: Module '"es6ImportDefaultBindingFollowedWithNamedImport1_0"' has no exported member 'm'. Did you mean to use 'import m from "es6ImportDefaultBindingFollowedWithNamedImport1_0"' instead? -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamedImport1_0' or its corresponding type declarations. - var x1: number = defaultBinding6; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.js index 31194c308b..985f695b6c 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.js @@ -5,17 +5,17 @@ var a = 10; export default a; //// [es6ImportDefaultBindingFollowedWithNamedImport1_1.ts] -import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1: number = defaultBinding1; -import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1: number = defaultBinding2; -import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1: number = defaultBinding3; -import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1: number = defaultBinding4; -import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding5, { x as z, } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1: number = defaultBinding5; -import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding6, { m, } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1: number = defaultBinding6; @@ -23,17 +23,17 @@ var x1: number = defaultBinding6; var a = 10; export default a; //// [es6ImportDefaultBindingFollowedWithNamedImport1_1.js] -import defaultBinding1 from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding1 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1 = defaultBinding1; -import defaultBinding2 from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding2 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1 = defaultBinding2; -import defaultBinding3 from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding3 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1 = defaultBinding3; -import defaultBinding4 from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding4 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1 = defaultBinding4; -import defaultBinding5 from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding5 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1 = defaultBinding5; -import defaultBinding6 from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding6 from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; var x1 = defaultBinding6; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.symbols b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.symbols index efe22435de..db2926e102 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.symbols +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.symbols @@ -8,14 +8,14 @@ export default a; >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_0.ts, 0, 3)) === es6ImportDefaultBindingFollowedWithNamedImport1_1.ts === -import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding1 : Symbol(defaultBinding1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 0, 6)) var x1: number = defaultBinding1; >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more) >defaultBinding1 : Symbol(defaultBinding1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 0, 6)) -import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding2 : Symbol(defaultBinding2, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 2, 6)) >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 2, 25)) @@ -23,7 +23,7 @@ var x1: number = defaultBinding2; >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more) >defaultBinding2 : Symbol(defaultBinding2, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 2, 6)) -import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding3 : Symbol(defaultBinding3, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 6)) >b : Symbol(b, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 25)) @@ -31,7 +31,7 @@ var x1: number = defaultBinding3; >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more) >defaultBinding3 : Symbol(defaultBinding3, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 4, 6)) -import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding4 : Symbol(defaultBinding4, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 6)) >x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 25)) >y : Symbol(y, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 28)) @@ -40,7 +40,7 @@ var x1: number = defaultBinding4; >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more) >defaultBinding4 : Symbol(defaultBinding4, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 6, 6)) -import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding5, { x as z, } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding5 : Symbol(defaultBinding5, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 6)) >z : Symbol(z, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 25)) @@ -48,7 +48,7 @@ var x1: number = defaultBinding5; >x1 : Symbol(x1, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 1, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 3, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 5, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 7, 3), Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 9, 3) ... and 1 more) >defaultBinding5 : Symbol(defaultBinding5, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 8, 6)) -import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; +import defaultBinding6, { m, } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; >defaultBinding6 : Symbol(defaultBinding6, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 10, 6)) >m : Symbol(m, Decl(es6ImportDefaultBindingFollowedWithNamedImport1_1.ts, 10, 25)) diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.types b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.types index b401a593f3..8e1b03d3fe 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.types +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.types @@ -9,54 +9,54 @@ export default a; >a : number === es6ImportDefaultBindingFollowedWithNamedImport1_1.ts === -import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; ->defaultBinding1 : any +import defaultBinding1, { } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; +>defaultBinding1 : number var x1: number = defaultBinding1; >x1 : number ->defaultBinding1 : any +>defaultBinding1 : number -import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; ->defaultBinding2 : any +import defaultBinding2, { a } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; +>defaultBinding2 : number >a : any var x1: number = defaultBinding2; >x1 : number ->defaultBinding2 : any +>defaultBinding2 : number -import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; ->defaultBinding3 : any +import defaultBinding3, { a as b } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; +>defaultBinding3 : number >a : any >b : any var x1: number = defaultBinding3; >x1 : number ->defaultBinding3 : any +>defaultBinding3 : number -import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; ->defaultBinding4 : any +import defaultBinding4, { x, a as y } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; +>defaultBinding4 : number >x : any >a : any >y : any var x1: number = defaultBinding4; >x1 : number ->defaultBinding4 : any +>defaultBinding4 : number -import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; ->defaultBinding5 : any +import defaultBinding5, { x as z, } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; +>defaultBinding5 : number >x : any >z : any var x1: number = defaultBinding5; >x1 : number ->defaultBinding5 : any +>defaultBinding5 : number -import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; ->defaultBinding6 : any +import defaultBinding6, { m, } from "./es6ImportDefaultBindingFollowedWithNamedImport1_0"; +>defaultBinding6 : number >m : any var x1: number = defaultBinding6; >x1 : number ->defaultBinding6 : any +>defaultBinding6 : number diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.types.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.types.diff deleted file mode 100644 index 8df8449b99..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.types.diff +++ /dev/null @@ -1,67 +0,0 @@ ---- old.es6ImportDefaultBindingFollowedWithNamedImport1.types -+++ new.es6ImportDefaultBindingFollowedWithNamedImport1.types -@@= skipped -9, +9 lines =@@ - - === es6ImportDefaultBindingFollowedWithNamedImport1_1.ts === - import defaultBinding1, { } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -->defaultBinding1 : number -+>defaultBinding1 : any - - var x1: number = defaultBinding1; - >x1 : number -->defaultBinding1 : number -+>defaultBinding1 : any - - import defaultBinding2, { a } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -->defaultBinding2 : number -+>defaultBinding2 : any - >a : any - - var x1: number = defaultBinding2; - >x1 : number -->defaultBinding2 : number -+>defaultBinding2 : any - - import defaultBinding3, { a as b } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -->defaultBinding3 : number -+>defaultBinding3 : any - >a : any - >b : any - - var x1: number = defaultBinding3; - >x1 : number -->defaultBinding3 : number -+>defaultBinding3 : any - - import defaultBinding4, { x, a as y } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -->defaultBinding4 : number -+>defaultBinding4 : any - >x : any - >a : any - >y : any - - var x1: number = defaultBinding4; - >x1 : number -->defaultBinding4 : number -+>defaultBinding4 : any - - import defaultBinding5, { x as z, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -->defaultBinding5 : number -+>defaultBinding5 : any - >x : any - >z : any - - var x1: number = defaultBinding5; - >x1 : number -->defaultBinding5 : number -+>defaultBinding5 : any - - import defaultBinding6, { m, } from "es6ImportDefaultBindingFollowedWithNamedImport1_0"; -->defaultBinding6 : number -+>defaultBinding6 : any - >m : any - - var x1: number = defaultBinding6; - >x1 : number -->defaultBinding6 : number -+>defaultBinding6 : any diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js index d68d989024..f74530ac84 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js @@ -26,18 +26,21 @@ var a = 10; exports.default = a; //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default; -const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2.default; -const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3.default; -const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4.default; -const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default; -const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js.diff index 685caf0363..7aeca00d12 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js.diff @@ -1,25 +1,25 @@ --- old.es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js +++ new.es6ImportDefaultBindingFollowedWithNamedImport1InEs5.js -@@= skipped -26, +26 lines =@@ - //// [es6ImportDefaultBindingFollowedWithNamedImport1InEs5_1.js] - "use strict"; +@@= skipped -29, +29 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); -+const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); ++const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_1.default; --var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); -+const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); ++const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_2.default; --var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); -+const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); ++const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_3.default; --var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); -+const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); ++const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_4.default; --var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); -+const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); ++const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_5.default; --var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); -+const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0"); +-var es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); ++const es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamedImport1InEs5_0_6.default; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js index 60b54f17e3..8edf88f126 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js @@ -26,19 +26,22 @@ var a = 10; exports.default = a; //// [client.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.x1 = void 0; -const server_1 = require("./server"); +const server_1 = __importDefault(require("./server")); exports.x1 = server_1.default; -const server_2 = require("./server"); +const server_2 = __importDefault(require("./server")); exports.x1 = server_2.default; -const server_3 = require("./server"); +const server_3 = __importDefault(require("./server")); exports.x1 = server_3.default; -const server_4 = require("./server"); +const server_4 = __importDefault(require("./server")); exports.x1 = server_4.default; -const server_5 = require("./server"); +const server_5 = __importDefault(require("./server")); exports.x1 = server_5.default; -const server_6 = require("./server"); +const server_6 = __importDefault(require("./server")); exports.x1 = server_6.default; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js.diff index 86e4d1fb7a..b9907939cd 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js.diff @@ -1,25 +1,25 @@ --- old.es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js +++ new.es6ImportDefaultBindingFollowedWithNamedImport1WithExport.js -@@= skipped -27, +27 lines =@@ - "use strict"; +@@= skipped -30, +30 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.x1 = void 0; --var server_1 = require("./server"); -+const server_1 = require("./server"); +-var server_1 = __importDefault(require("./server")); ++const server_1 = __importDefault(require("./server")); exports.x1 = server_1.default; --var server_2 = require("./server"); -+const server_2 = require("./server"); +-var server_2 = __importDefault(require("./server")); ++const server_2 = __importDefault(require("./server")); exports.x1 = server_2.default; --var server_3 = require("./server"); -+const server_3 = require("./server"); +-var server_3 = __importDefault(require("./server")); ++const server_3 = __importDefault(require("./server")); exports.x1 = server_3.default; --var server_4 = require("./server"); -+const server_4 = require("./server"); +-var server_4 = __importDefault(require("./server")); ++const server_4 = __importDefault(require("./server")); exports.x1 = server_4.default; --var server_5 = require("./server"); -+const server_5 = require("./server"); +-var server_5 = __importDefault(require("./server")); ++const server_5 = __importDefault(require("./server")); exports.x1 = server_5.default; --var server_6 = require("./server"); -+const server_6 = require("./server"); +-var server_6 = __importDefault(require("./server")); ++const server_6 = __importDefault(require("./server")); exports.x1 = server_6.default; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.js index 5487086947..34840ec432 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.js @@ -26,19 +26,22 @@ class a { exports.default = a; //// [client.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.x6 = exports.x5 = exports.x4 = exports.x3 = exports.x2 = exports.x1 = void 0; -const server_1 = require("./server"); +const server_1 = __importDefault(require("./server")); exports.x1 = new server_1.default(); -const server_2 = require("./server"); +const server_2 = __importDefault(require("./server")); exports.x2 = new server_2.default(); -const server_3 = require("./server"); +const server_3 = __importDefault(require("./server")); exports.x3 = new server_3.default(); -const server_4 = require("./server"); +const server_4 = __importDefault(require("./server")); exports.x4 = new server_4.default(); -const server_5 = require("./server"); +const server_5 = __importDefault(require("./server")); exports.x5 = new server_5.default(); -const server_6 = require("./server"); +const server_6 = __importDefault(require("./server")); exports.x6 = new server_6.default(); diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.js.diff index 0b3d243a82..169259c82f 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts1.js.diff @@ -1,25 +1,25 @@ --- old.es6ImportDefaultBindingFollowedWithNamedImportDts1.js +++ new.es6ImportDefaultBindingFollowedWithNamedImportDts1.js -@@= skipped -27, +27 lines =@@ - "use strict"; +@@= skipped -30, +30 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.x6 = exports.x5 = exports.x4 = exports.x3 = exports.x2 = exports.x1 = void 0; --var server_1 = require("./server"); -+const server_1 = require("./server"); +-var server_1 = __importDefault(require("./server")); ++const server_1 = __importDefault(require("./server")); exports.x1 = new server_1.default(); --var server_2 = require("./server"); -+const server_2 = require("./server"); +-var server_2 = __importDefault(require("./server")); ++const server_2 = __importDefault(require("./server")); exports.x2 = new server_2.default(); --var server_3 = require("./server"); -+const server_3 = require("./server"); +-var server_3 = __importDefault(require("./server")); ++const server_3 = __importDefault(require("./server")); exports.x3 = new server_3.default(); --var server_4 = require("./server"); -+const server_4 = require("./server"); +-var server_4 = __importDefault(require("./server")); ++const server_4 = __importDefault(require("./server")); exports.x4 = new server_4.default(); --var server_5 = require("./server"); -+const server_5 = require("./server"); +-var server_5 = __importDefault(require("./server")); ++const server_5 = __importDefault(require("./server")); exports.x5 = new server_5.default(); --var server_6 = require("./server"); -+const server_6 = require("./server"); +-var server_6 = __importDefault(require("./server")); ++const server_6 = __importDefault(require("./server")); exports.x6 = new server_6.default(); diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt new file mode 100644 index 0000000000..08261f24e7 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.errors.txt @@ -0,0 +1,58 @@ +client.ts(1,1): error TS1191: An import declaration cannot have modifiers. +client.ts(2,1): error TS1191: An import declaration cannot have modifiers. +client.ts(3,12): error TS2323: Cannot redeclare exported variable 'x1'. +client.ts(4,1): error TS1191: An import declaration cannot have modifiers. +client.ts(5,12): error TS2323: Cannot redeclare exported variable 'x1'. +client.ts(6,1): error TS1191: An import declaration cannot have modifiers. +client.ts(7,12): error TS2323: Cannot redeclare exported variable 'x1'. +client.ts(8,12): error TS2323: Cannot redeclare exported variable 'x1'. +client.ts(9,1): error TS1191: An import declaration cannot have modifiers. +client.ts(10,12): error TS2323: Cannot redeclare exported variable 'x1'. +client.ts(11,1): error TS1191: An import declaration cannot have modifiers. +client.ts(12,12): error TS2323: Cannot redeclare exported variable 'x1'. + + +==== server.ts (0 errors) ==== + export var a = 10; + export var x = a; + export var m = a; + export default {}; + +==== client.ts (12 errors) ==== + export import defaultBinding1, { } from "./server"; + ~~~~~~ +!!! error TS1191: An import declaration cannot have modifiers. + export import defaultBinding2, { a } from "./server"; + ~~~~~~ +!!! error TS1191: An import declaration cannot have modifiers. + export var x1: number = a; + ~~ +!!! error TS2323: Cannot redeclare exported variable 'x1'. + export import defaultBinding3, { a as b } from "./server"; + ~~~~~~ +!!! error TS1191: An import declaration cannot have modifiers. + export var x1: number = b; + ~~ +!!! error TS2323: Cannot redeclare exported variable 'x1'. + export import defaultBinding4, { x, a as y } from "./server"; + ~~~~~~ +!!! error TS1191: An import declaration cannot have modifiers. + export var x1: number = x; + ~~ +!!! error TS2323: Cannot redeclare exported variable 'x1'. + export var x1: number = y; + ~~ +!!! error TS2323: Cannot redeclare exported variable 'x1'. + export import defaultBinding5, { x as z, } from "./server"; + ~~~~~~ +!!! error TS1191: An import declaration cannot have modifiers. + export var x1: number = z; + ~~ +!!! error TS2323: Cannot redeclare exported variable 'x1'. + export import defaultBinding6, { m, } from "./server"; + ~~~~~~ +!!! error TS1191: An import declaration cannot have modifiers. + export var x1: number = m; + ~~ +!!! error TS2323: Cannot redeclare exported variable 'x1'. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js new file mode 100644 index 0000000000..6f1755491a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js @@ -0,0 +1,61 @@ +//// [tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts] //// + +//// [server.ts] +export var a = 10; +export var x = a; +export var m = a; +export default {}; + +//// [client.ts] +export import defaultBinding1, { } from "./server"; +export import defaultBinding2, { a } from "./server"; +export var x1: number = a; +export import defaultBinding3, { a as b } from "./server"; +export var x1: number = b; +export import defaultBinding4, { x, a as y } from "./server"; +export var x1: number = x; +export var x1: number = y; +export import defaultBinding5, { x as z, } from "./server"; +export var x1: number = z; +export import defaultBinding6, { m, } from "./server"; +export var x1: number = m; + + +//// [server.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.m = exports.x = exports.a = void 0; +exports.a = 10; +exports.x = exports.a; +exports.m = exports.a; +exports.default = {}; +//// [client.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.x1 = void 0; +const server_1 = require("./server"); +exports.x1 = server_1.a; +const server_2 = require("./server"); +exports.x1 = server_2.a; +const server_3 = require("./server"); +exports.x1 = server_3.x; +exports.x1 = server_3.a; +const server_4 = require("./server"); +exports.x1 = server_4.x; +const server_5 = require("./server"); +exports.x1 = server_5.m; + + +//// [server.d.ts] +export declare var a: number; +export declare var x: number; +export declare var m: number; +declare const _default: {}; +export default _default; +//// [client.d.ts] +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; +export declare var x1: number; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js.diff new file mode 100644 index 0000000000..30ed2cd485 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js.diff @@ -0,0 +1,23 @@ +--- old.es6ImportDefaultBindingFollowedWithNamedImportWithExport.js ++++ new.es6ImportDefaultBindingFollowedWithNamedImportWithExport.js +@@= skipped -32, +32 lines =@@ + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.x1 = void 0; +-var server_1 = require("./server"); ++const server_1 = require("./server"); + exports.x1 = server_1.a; +-var server_2 = require("./server"); ++const server_2 = require("./server"); + exports.x1 = server_2.a; +-var server_3 = require("./server"); ++const server_3 = require("./server"); + exports.x1 = server_3.x; + exports.x1 = server_3.a; +-var server_4 = require("./server"); ++const server_4 = require("./server"); + exports.x1 = server_4.x; +-var server_5 = require("./server"); ++const server_5 = require("./server"); + exports.x1 = server_5.m; + diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols new file mode 100644 index 0000000000..35bbfb8c42 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.symbols @@ -0,0 +1,68 @@ +//// [tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts] //// + +=== server.ts === +export var a = 10; +>a : Symbol(a, Decl(server.ts, 0, 10)) + +export var x = a; +>x : Symbol(x, Decl(server.ts, 1, 10)) +>a : Symbol(a, Decl(server.ts, 0, 10)) + +export var m = a; +>m : Symbol(m, Decl(server.ts, 2, 10)) +>a : Symbol(a, Decl(server.ts, 0, 10)) + +export default {}; + +=== client.ts === +export import defaultBinding1, { } from "./server"; +>defaultBinding1 : Symbol(defaultBinding1, Decl(client.ts, 0, 13)) + +export import defaultBinding2, { a } from "./server"; +>defaultBinding2 : Symbol(defaultBinding2, Decl(client.ts, 1, 13)) +>a : Symbol(a, Decl(client.ts, 1, 32)) + +export var x1: number = a; +>x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more) +>a : Symbol(a, Decl(client.ts, 1, 32)) + +export import defaultBinding3, { a as b } from "./server"; +>defaultBinding3 : Symbol(defaultBinding3, Decl(client.ts, 3, 13)) +>a : Symbol(a, Decl(server.ts, 0, 10)) +>b : Symbol(b, Decl(client.ts, 3, 32)) + +export var x1: number = b; +>x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more) +>b : Symbol(b, Decl(client.ts, 3, 32)) + +export import defaultBinding4, { x, a as y } from "./server"; +>defaultBinding4 : Symbol(defaultBinding4, Decl(client.ts, 5, 13)) +>x : Symbol(x, Decl(client.ts, 5, 32)) +>a : Symbol(a, Decl(server.ts, 0, 10)) +>y : Symbol(y, Decl(client.ts, 5, 35)) + +export var x1: number = x; +>x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more) +>x : Symbol(x, Decl(client.ts, 5, 32)) + +export var x1: number = y; +>x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more) +>y : Symbol(y, Decl(client.ts, 5, 35)) + +export import defaultBinding5, { x as z, } from "./server"; +>defaultBinding5 : Symbol(defaultBinding5, Decl(client.ts, 8, 13)) +>x : Symbol(x, Decl(server.ts, 1, 10)) +>z : Symbol(z, Decl(client.ts, 8, 32)) + +export var x1: number = z; +>x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more) +>z : Symbol(z, Decl(client.ts, 8, 32)) + +export import defaultBinding6, { m, } from "./server"; +>defaultBinding6 : Symbol(defaultBinding6, Decl(client.ts, 10, 13)) +>m : Symbol(m, Decl(client.ts, 10, 32)) + +export var x1: number = m; +>x1 : Symbol(x1, Decl(client.ts, 2, 10), Decl(client.ts, 4, 10), Decl(client.ts, 6, 10), Decl(client.ts, 7, 10), Decl(client.ts, 9, 10) ... and 1 more) +>m : Symbol(m, Decl(client.ts, 10, 32)) + diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.types b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.types new file mode 100644 index 0000000000..67cfa3d851 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.types @@ -0,0 +1,70 @@ +//// [tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportWithExport.ts] //// + +=== server.ts === +export var a = 10; +>a : number +>10 : 10 + +export var x = a; +>x : number +>a : number + +export var m = a; +>m : number +>a : number + +export default {}; +>{} : {} + +=== client.ts === +export import defaultBinding1, { } from "./server"; +>defaultBinding1 : {} + +export import defaultBinding2, { a } from "./server"; +>defaultBinding2 : {} +>a : number + +export var x1: number = a; +>x1 : number +>a : number + +export import defaultBinding3, { a as b } from "./server"; +>defaultBinding3 : {} +>a : number +>b : number + +export var x1: number = b; +>x1 : number +>b : number + +export import defaultBinding4, { x, a as y } from "./server"; +>defaultBinding4 : {} +>x : number +>a : number +>y : number + +export var x1: number = x; +>x1 : number +>x : number + +export var x1: number = y; +>x1 : number +>y : number + +export import defaultBinding5, { x as z, } from "./server"; +>defaultBinding5 : {} +>x : number +>z : number + +export var x1: number = z; +>x1 : number +>z : number + +export import defaultBinding6, { m, } from "./server"; +>defaultBinding6 : {} +>m : number + +export var x1: number = m; +>x1 : number +>m : number + diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt index 61a05e784f..446b5e271d 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt @@ -1,11 +1,11 @@ -es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,52): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamespaceBinding_0' or its corresponding type declarations. +es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,8): error TS1192: Module '"es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export. ==== es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts (0 errors) ==== export var a = 10; ==== es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts (1 errors) ==== - import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamespaceBinding_0' or its corresponding type declarations. + import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; + ~~~~~~~~~~~~~~ +!!! error TS1192: Module '"es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export. var x: number = nameSpaceBinding.a; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt.diff deleted file mode 100644 index a1ba742942..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt -+++ new.es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt -@@= skipped -0, +0 lines =@@ --es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,8): error TS1192: Module '"es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export. -+es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,52): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamespaceBinding_0' or its corresponding type declarations. - - - ==== es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts (0 errors) ==== -@@= skipped -5, +5 lines =@@ - - ==== es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts (1 errors) ==== - import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; -- ~~~~~~~~~~~~~~ --!!! error TS1192: Module '"es6ImportDefaultBindingFollowedWithNamespaceBinding_0"' has no default export. -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamespaceBinding_0' or its corresponding type declarations. - var x: number = nameSpaceBinding.a; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.js index 2c86e06263..e38fa303c6 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.js @@ -4,13 +4,13 @@ export var a = 10; //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts] -import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; +import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; var x: number = nameSpaceBinding.a; //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.js] export var a = 10; //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.js] -import * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; +import * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; var x = nameSpaceBinding.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols index 52ba79bf97..f2686bc37c 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols @@ -5,11 +5,13 @@ export var a = 10; >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts, 0, 10)) === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts === -import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; +import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 6)) >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 22)) var x: number = nameSpaceBinding.a; >x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 1, 3)) +>nameSpaceBinding.a : Symbol(nameSpaceBinding.a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts, 0, 10)) >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 22)) +>a : Symbol(nameSpaceBinding.a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts, 0, 10)) diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols.diff deleted file mode 100644 index 7612487421..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- old.es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols -+++ new.es6ImportDefaultBindingFollowedWithNamespaceBinding.symbols -@@= skipped -10, +10 lines =@@ - - var x: number = nameSpaceBinding.a; - >x : Symbol(x, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 1, 3)) -->nameSpaceBinding.a : Symbol(nameSpaceBinding.a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts, 0, 10)) - >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 22)) -->a : Symbol(nameSpaceBinding.a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts, 0, 10)) diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.types b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.types index 683bb2d142..b4a1d5c201 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.types +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.types @@ -6,13 +6,13 @@ export var a = 10; >10 : 10 === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts === -import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; +import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; >defaultBinding : any ->nameSpaceBinding : any +>nameSpaceBinding : typeof nameSpaceBinding var x: number = nameSpaceBinding.a; >x : number ->nameSpaceBinding.a : any ->nameSpaceBinding : any ->a : any +>nameSpaceBinding.a : number +>nameSpaceBinding : typeof nameSpaceBinding +>a : number diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.types.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.types.diff deleted file mode 100644 index 1af7f01ae0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.types.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.es6ImportDefaultBindingFollowedWithNamespaceBinding.types -+++ new.es6ImportDefaultBindingFollowedWithNamespaceBinding.types -@@= skipped -7, +7 lines =@@ - === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts === - import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; - >defaultBinding : any -->nameSpaceBinding : typeof nameSpaceBinding -+>nameSpaceBinding : any - - var x: number = nameSpaceBinding.a; - >x : number -->nameSpaceBinding.a : number -->nameSpaceBinding : typeof nameSpaceBinding -->a : number -+>nameSpaceBinding.a : any -+>nameSpaceBinding : any -+>a : any diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.errors.txt deleted file mode 100644 index 76a13afad5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,52): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamespaceBinding_0' or its corresponding type declarations. - - -==== es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts (0 errors) ==== - var a = 10; - export default a; - -==== es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts (1 errors) ==== - import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamespaceBinding_0' or its corresponding type declarations. - var x: number = defaultBinding; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.errors.txt.diff deleted file mode 100644 index 3816cb2188..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.es6ImportDefaultBindingFollowedWithNamespaceBinding1.errors.txt -+++ new.es6ImportDefaultBindingFollowedWithNamespaceBinding1.errors.txt -@@= skipped -0, +0 lines =@@ -- -+es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts(1,52): error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamespaceBinding_0' or its corresponding type declarations. -+ -+ -+==== es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts (0 errors) ==== -+ var a = 10; -+ export default a; -+ -+==== es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts (1 errors) ==== -+ import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportDefaultBindingFollowedWithNamespaceBinding_0' or its corresponding type declarations. -+ var x: number = defaultBinding; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js index 039b4a3dce..bd12489fc9 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.js @@ -5,14 +5,14 @@ var a = 10; export default a; //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts] -import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; +import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; var x: number = defaultBinding; //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.js] var a = 10; export default a; //// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.js] -import defaultBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; +import defaultBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; var x = defaultBinding; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.symbols b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.symbols index b8cac73d9a..700ee31c46 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.symbols +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.symbols @@ -8,7 +8,7 @@ export default a; >a : Symbol(a, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_0.ts, 0, 3)) === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts === -import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; +import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; >defaultBinding : Symbol(defaultBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 6)) >nameSpaceBinding : Symbol(nameSpaceBinding, Decl(es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts, 0, 22)) diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types index 85843c7858..4299ceb3be 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types @@ -9,11 +9,11 @@ export default a; >a : number === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts === -import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; ->defaultBinding : any ->nameSpaceBinding : any +import defaultBinding, * as nameSpaceBinding from "./es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; +>defaultBinding : number +>nameSpaceBinding : typeof nameSpaceBinding var x: number = defaultBinding; >x : number ->defaultBinding : any +>defaultBinding : number diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types.diff deleted file mode 100644 index 075605f1ec..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.types.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.es6ImportDefaultBindingFollowedWithNamespaceBinding1.types -+++ new.es6ImportDefaultBindingFollowedWithNamespaceBinding1.types -@@= skipped -9, +9 lines =@@ - - === es6ImportDefaultBindingFollowedWithNamespaceBinding_1.ts === - import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0"; -->defaultBinding : number -->nameSpaceBinding : typeof nameSpaceBinding -+>defaultBinding : any -+>nameSpaceBinding : any - - var x: number = defaultBinding; - >x : number -->defaultBinding : number -+>defaultBinding : any diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js index b5c95374a7..67f80174cd 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js @@ -15,8 +15,11 @@ var a = 10; exports.default = a; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); +const es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js.diff index bcf62e08bd..8a18fef8fe 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js.diff @@ -1,10 +1,10 @@ --- old.es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js +++ new.es6ImportDefaultBindingFollowedWithNamespaceBinding1InEs5.js -@@= skipped -15, +15 lines =@@ - //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] - "use strict"; +@@= skipped -18, +18 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); -+const es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); +-var es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0")); ++const es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1 = __importDefault(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0")); var x = es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js index 1f83776a28..0f400c5087 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js @@ -16,9 +16,42 @@ class a { exports.a = a; //// [client.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; -const nameSpaceBinding = require("./server"); +const nameSpaceBinding = __importStar(require("./server")); exports.x = new nameSpaceBinding.a(); diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js.diff index 879976f3f2..9e05a355e1 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js.diff @@ -1,10 +1,10 @@ --- old.es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js +++ new.es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js -@@= skipped -17, +17 lines =@@ - "use strict"; +@@= skipped -50, +50 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; --var nameSpaceBinding = require("./server"); -+const nameSpaceBinding = require("./server"); +-var nameSpaceBinding = __importStar(require("./server")); ++const nameSpaceBinding = __importStar(require("./server")); exports.x = new nameSpaceBinding.a(); diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js index ebdee2d2bc..bd4309d548 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js @@ -14,8 +14,41 @@ exports.a = void 0; exports.a = 10; //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); +const nameSpaceBinding = __importStar(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0")); var x = nameSpaceBinding.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js.diff index deaee87393..c2c683c82c 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js.diff @@ -1,10 +1,10 @@ --- old.es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js +++ new.es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js -@@= skipped -14, +14 lines =@@ - //// [es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_1.js] - "use strict"; +@@= skipped -47, +47 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); -+const nameSpaceBinding = require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0"); +-var nameSpaceBinding = __importStar(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0")); ++const nameSpaceBinding = __importStar(require("./es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5_0")); var x = nameSpaceBinding.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js index 67fc498fdf..d356946540 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js @@ -14,9 +14,42 @@ exports.a = void 0; exports.a = 10; //// [client.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; -const nameSpaceBinding = require("./server"); +const nameSpaceBinding = __importStar(require("./server")); exports.x = nameSpaceBinding.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js.diff index 2b8e1e997a..c8720bfeb2 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js.diff @@ -1,10 +1,10 @@ --- old.es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js +++ new.es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js -@@= skipped -15, +15 lines =@@ - "use strict"; +@@= skipped -48, +48 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; --var nameSpaceBinding = require("./server"); -+const nameSpaceBinding = require("./server"); +-var nameSpaceBinding = __importStar(require("./server")); ++const nameSpaceBinding = __importStar(require("./server")); exports.x = nameSpaceBinding.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingMergeErrors.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingMergeErrors.js index 2f32566b13..eeb5bbcd12 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingMergeErrors.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingMergeErrors.js @@ -22,7 +22,10 @@ var a = 10; exports.default = a; //// [es6ImportDefaultBindingMergeErrors_1.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0"); +const es6ImportDefaultBindingMergeErrors_0_1 = __importDefault(require("./es6ImportDefaultBindingMergeErrors_0")); var x = es6ImportDefaultBindingMergeErrors_0_1.default; var defaultBinding2 = "hello world"; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingMergeErrors.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingMergeErrors.js.diff index 5cdb26f3f0..bf927e1a8d 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingMergeErrors.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingMergeErrors.js.diff @@ -1,10 +1,10 @@ --- old.es6ImportDefaultBindingMergeErrors.js +++ new.es6ImportDefaultBindingMergeErrors.js -@@= skipped -22, +22 lines =@@ - //// [es6ImportDefaultBindingMergeErrors_1.js] - "use strict"; +@@= skipped -25, +25 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0"); -+const es6ImportDefaultBindingMergeErrors_0_1 = require("./es6ImportDefaultBindingMergeErrors_0"); +-var es6ImportDefaultBindingMergeErrors_0_1 = __importDefault(require("./es6ImportDefaultBindingMergeErrors_0")); ++const es6ImportDefaultBindingMergeErrors_0_1 = __importDefault(require("./es6ImportDefaultBindingMergeErrors_0")); var x = es6ImportDefaultBindingMergeErrors_0_1.default; var defaultBinding2 = "hello world"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.errors.txt new file mode 100644 index 0000000000..de33de8cda --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.errors.txt @@ -0,0 +1,16 @@ +client.ts(1,1): error TS1191: An import declaration cannot have modifiers. +client.ts(3,1): error TS1191: An import declaration cannot have modifiers. + + +==== server.ts (0 errors) ==== + var a = 10; + export default a; + +==== client.ts (2 errors) ==== + export import defaultBinding from "./server"; + ~~~~~~ +!!! error TS1191: An import declaration cannot have modifiers. + export var x = defaultBinding; + export import defaultBinding2 from "./server"; // non referenced + ~~~~~~ +!!! error TS1191: An import declaration cannot have modifiers. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.js b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.js new file mode 100644 index 0000000000..0eabd86f4e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.js @@ -0,0 +1,32 @@ +//// [tests/cases/compiler/es6ImportDefaultBindingWithExport.ts] //// + +//// [server.ts] +var a = 10; +export default a; + +//// [client.ts] +export import defaultBinding from "./server"; +export var x = defaultBinding; +export import defaultBinding2 from "./server"; // non referenced + +//// [server.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var a = 10; +exports.default = a; +//// [client.js] +"use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.x = void 0; +const server_1 = __importDefault(require("./server")); +exports.x = server_1.default; + + +//// [server.d.ts] +declare var a: number; +export default a; +//// [client.d.ts] +export declare var x: number; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.js.diff new file mode 100644 index 0000000000..63dcd8eb0b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.js.diff @@ -0,0 +1,10 @@ +--- old.es6ImportDefaultBindingWithExport.js ++++ new.es6ImportDefaultBindingWithExport.js +@@= skipped -20, +20 lines =@@ + }; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.x = void 0; +-var server_1 = __importDefault(require("./server")); ++const server_1 = __importDefault(require("./server")); + exports.x = server_1.default; + diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.symbols b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.symbols new file mode 100644 index 0000000000..6090e8d56e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.symbols @@ -0,0 +1,20 @@ +//// [tests/cases/compiler/es6ImportDefaultBindingWithExport.ts] //// + +=== server.ts === +var a = 10; +>a : Symbol(a, Decl(server.ts, 0, 3)) + +export default a; +>a : Symbol(a, Decl(server.ts, 0, 3)) + +=== client.ts === +export import defaultBinding from "./server"; +>defaultBinding : Symbol(defaultBinding, Decl(client.ts, 0, 13)) + +export var x = defaultBinding; +>x : Symbol(x, Decl(client.ts, 1, 10)) +>defaultBinding : Symbol(defaultBinding, Decl(client.ts, 0, 13)) + +export import defaultBinding2 from "./server"; // non referenced +>defaultBinding2 : Symbol(defaultBinding2, Decl(client.ts, 2, 13)) + diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.types b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.types new file mode 100644 index 0000000000..d78645a482 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/es6ImportDefaultBindingWithExport.types @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/es6ImportDefaultBindingWithExport.ts] //// + +=== server.ts === +var a = 10; +>a : number +>10 : 10 + +export default a; +>a : number + +=== client.ts === +export import defaultBinding from "./server"; +>defaultBinding : number + +export var x = defaultBinding; +>x : number +>defaultBinding : number + +export import defaultBinding2 from "./server"; // non referenced +>defaultBinding2 : number + diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.errors.txt index 13769af4d3..fec1b354af 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.errors.txt @@ -1,14 +1,14 @@ client.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. -client.ts(1,20): error TS2307: Cannot find module 'server' or its corresponding type declarations. +server.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. -==== client.ts (2 errors) ==== - import a = require("server"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +==== client.ts (1 errors) ==== + import a = require("./server"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. - ~~~~~~~~ -!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. -==== server.ts (0 errors) ==== +==== server.ts (1 errors) ==== var a = 10; export = a; + ~~~~~~~~~~~ +!!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.errors.txt.diff deleted file mode 100644 index dcc1ac9645..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.errors.txt.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.es6ImportEqualsDeclaration.errors.txt -+++ new.es6ImportEqualsDeclaration.errors.txt -@@= skipped -0, +0 lines =@@ - client.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. --server.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. -- -- --==== client.ts (1 errors) ==== -+client.ts(1,20): error TS2307: Cannot find module 'server' or its corresponding type declarations. -+ -+ -+==== client.ts (2 errors) ==== - import a = require("server"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - !!! error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. --==== server.ts (1 errors) ==== -+ ~~~~~~~~ -+!!! error TS2307: Cannot find module 'server' or its corresponding type declarations. -+==== server.ts (0 errors) ==== - var a = 10; - export = a; -- ~~~~~~~~~~~ --!!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.js b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.js index f1d1f9d352..b994bd728a 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.js @@ -5,7 +5,10 @@ var a = 10; export = a; //// [client.ts] -import a = require("server"); +import a = require("./server"); +//// [server.js] +var a = 10; +export {}; //// [client.js] export {}; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.js.diff deleted file mode 100644 index e5db0b42b6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.js.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.es6ImportEqualsDeclaration.js -+++ new.es6ImportEqualsDeclaration.js -@@= skipped -6, +6 lines =@@ - //// [client.ts] - import a = require("server"); - --//// [server.js] --var a = 10; --export {}; - //// [client.js] - export {}; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.symbols b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.symbols index 2cf6482767..fc301a740c 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.symbols +++ b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.symbols @@ -1,6 +1,13 @@ //// [tests/cases/compiler/es6ImportEqualsDeclaration.ts] //// === client.ts === -import a = require("server"); +import a = require("./server"); >a : Symbol(a, Decl(client.ts, 0, 0)) +=== server.ts === +var a = 10; +>a : Symbol(a, Decl(server.ts, 0, 3)) + +export = a; +>a : Symbol(a, Decl(server.ts, 0, 3)) + diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.symbols.diff b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.symbols.diff deleted file mode 100644 index 7ab627c945..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.symbols.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- old.es6ImportEqualsDeclaration.symbols -+++ new.es6ImportEqualsDeclaration.symbols -@@= skipped -3, +3 lines =@@ - import a = require("server"); - >a : Symbol(a, Decl(client.ts, 0, 0)) - --=== server.ts === --var a = 10; -->a : Symbol(a, Decl(server.ts, 0, 3)) -- --export = a; -->a : Symbol(a, Decl(server.ts, 0, 3)) -- \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.types b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.types index ed27c5b0d8..2c26a91f92 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.types +++ b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.types @@ -1,6 +1,14 @@ //// [tests/cases/compiler/es6ImportEqualsDeclaration.ts] //// === client.ts === -import a = require("server"); ->a : any +import a = require("./server"); +>a : number + +=== server.ts === +var a = 10; +>a : number +>10 : 10 + +export = a; +>a : number diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.types.diff b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.types.diff deleted file mode 100644 index 1abfc89c8c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsDeclaration.types.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.es6ImportEqualsDeclaration.types -+++ new.es6ImportEqualsDeclaration.types -@@= skipped -1, +1 lines =@@ - - === client.ts === - import a = require("server"); -->a : number -- --=== server.ts === --var a = 10; -->a : number -->10 : 10 -- --export = a; -->a : number -+>a : any diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsExportModuleCommonJsError.js b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsExportModuleCommonJsError.js index 8443d4820d..e3c5f6efe7 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsExportModuleCommonJsError.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsExportModuleCommonJsError.js @@ -18,6 +18,39 @@ class a { module.exports = a; //// [main.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const a = require("./a"); +const a = __importStar(require("./a")); a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsExportModuleCommonJsError.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsExportModuleCommonJsError.js.diff index 7b1f4e4343..67b0f535ad 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportEqualsExportModuleCommonJsError.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportEqualsExportModuleCommonJsError.js.diff @@ -1,9 +1,9 @@ --- old.es6ImportEqualsExportModuleCommonJsError.js +++ new.es6ImportEqualsExportModuleCommonJsError.js -@@= skipped -18, +18 lines =@@ - //// [main.js] - "use strict"; +@@= skipped -51, +51 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var a = require("./a"); -+const a = require("./a"); +-var a = __importStar(require("./a")); ++const a = __importStar(require("./a")); a; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImport.js b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImport.js index ce72655687..1f01c654c8 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImport.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImport.js @@ -16,8 +16,41 @@ exports.a = void 0; exports.a = 10; //// [es6ImportNameSpaceImport_1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const nameSpaceBinding = require("./es6ImportNameSpaceImport_0"); +const nameSpaceBinding = __importStar(require("./es6ImportNameSpaceImport_0")); var x = nameSpaceBinding.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportDts.js b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportDts.js index dc40e156a9..1c9636e822 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportDts.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportDts.js @@ -18,9 +18,42 @@ exports.c = c; ; //// [client.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; -const nameSpaceBinding = require("./server"); +const nameSpaceBinding = __importStar(require("./server")); exports.x = new nameSpaceBinding.c(); diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportDts.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportDts.js.diff index fcb53273d5..3da20d148f 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportDts.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportDts.js.diff @@ -1,10 +1,10 @@ --- old.es6ImportNameSpaceImportDts.js +++ new.es6ImportNameSpaceImportDts.js -@@= skipped -19, +19 lines =@@ - "use strict"; +@@= skipped -52, +52 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; --var nameSpaceBinding = require("./server"); -+const nameSpaceBinding = require("./server"); +-var nameSpaceBinding = __importStar(require("./server")); ++const nameSpaceBinding = __importStar(require("./server")); exports.x = new nameSpaceBinding.c(); diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportInEs5.js b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportInEs5.js index 3b375f2f92..dff81d3ee3 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportInEs5.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportInEs5.js @@ -16,8 +16,41 @@ exports.a = void 0; exports.a = 10; //// [es6ImportNameSpaceImportInEs5_1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0"); +const nameSpaceBinding = __importStar(require("./es6ImportNameSpaceImportInEs5_0")); var x = nameSpaceBinding.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportInEs5.js.diff b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportInEs5.js.diff index 2bbc9f5c74..9118520456 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportInEs5.js.diff +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNameSpaceImportInEs5.js.diff @@ -1,10 +1,10 @@ --- old.es6ImportNameSpaceImportInEs5.js +++ new.es6ImportNameSpaceImportInEs5.js -@@= skipped -16, +16 lines =@@ - //// [es6ImportNameSpaceImportInEs5_1.js] - "use strict"; +@@= skipped -49, +49 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0"); -+const nameSpaceBinding = require("./es6ImportNameSpaceImportInEs5_0"); +-var nameSpaceBinding = __importStar(require("./es6ImportNameSpaceImportInEs5_0")); ++const nameSpaceBinding = __importStar(require("./es6ImportNameSpaceImportInEs5_0")); var x = nameSpaceBinding.a; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportIdentifiersParsing.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportIdentifiersParsing.errors.txt.diff deleted file mode 100644 index 42f6dd334c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportIdentifiersParsing.errors.txt.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- old.es6ImportNamedImportIdentifiersParsing.errors.txt -+++ new.es6ImportNamedImportIdentifiersParsing.errors.txt -@@= skipped -0, +0 lines =@@ - es6ImportNamedImportIdentifiersParsing.ts(1,10): error TS2300: Duplicate identifier 'yield'. --es6ImportNamedImportIdentifiersParsing.ts(1,23): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+es6ImportNamedImportIdentifiersParsing.ts(1,23): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - es6ImportNamedImportIdentifiersParsing.ts(2,10): error TS1003: Identifier expected. - es6ImportNamedImportIdentifiersParsing.ts(2,10): error TS2300: Duplicate identifier 'default'. --es6ImportNamedImportIdentifiersParsing.ts(2,25): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+es6ImportNamedImportIdentifiersParsing.ts(2,25): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - es6ImportNamedImportIdentifiersParsing.ts(3,19): error TS1003: Identifier expected. - es6ImportNamedImportIdentifiersParsing.ts(3,19): error TS2300: Duplicate identifier 'default'. --es6ImportNamedImportIdentifiersParsing.ts(3,34): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+es6ImportNamedImportIdentifiersParsing.ts(3,34): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - es6ImportNamedImportIdentifiersParsing.ts(4,21): error TS2300: Duplicate identifier 'yield'. --es6ImportNamedImportIdentifiersParsing.ts(4,34): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+es6ImportNamedImportIdentifiersParsing.ts(4,34): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - es6ImportNamedImportIdentifiersParsing.ts(5,21): error TS1003: Identifier expected. - es6ImportNamedImportIdentifiersParsing.ts(5,21): error TS2300: Duplicate identifier 'default'. --es6ImportNamedImportIdentifiersParsing.ts(5,36): error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+es6ImportNamedImportIdentifiersParsing.ts(5,36): error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - - - ==== es6ImportNamedImportIdentifiersParsing.ts (13 errors) ==== -@@= skipped -17, +17 lines =@@ - ~~~~~ - !!! error TS2300: Duplicate identifier 'yield'. - ~~~~~~~~~~~~ --!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - import { default } from "somemodule"; // Error - as this is keyword that is not allowed as identifier - ~~~~~~~ - !!! error TS1003: Identifier expected. - ~~~~~~~ - !!! error TS2300: Duplicate identifier 'default'. - ~~~~~~~~~~~~ --!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - import { yield as default } from "somemodule"; // error to use default as binding name - ~~~~~~~ - !!! error TS1003: Identifier expected. - ~~~~~~~ - !!! error TS2300: Duplicate identifier 'default'. - ~~~~~~~~~~~~ --!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - import { default as yield } from "somemodule"; // no error - ~~~~~ - !!! error TS2300: Duplicate identifier 'yield'. - ~~~~~~~~~~~~ --!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. - import { default as default } from "somemodule"; // default as is ok, error of default binding name - ~~~~~~~ - !!! error TS1003: Identifier expected. - ~~~~~~~ - !!! error TS2300: Duplicate identifier 'default'. - ~~~~~~~~~~~~ --!!! error TS2792: Cannot find module 'somemodule'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'somemodule' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt index 480948746c..da972d070e 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportNoNamedExports.errors.txt @@ -1,5 +1,5 @@ -es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import. -es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import. +es6ImportNamedImportNoNamedExports_1.ts(1,10): error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import. +es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import. ==== es6ImportNamedImportNoNamedExports_0.ts (0 errors) ==== @@ -9,7 +9,7 @@ es6ImportNamedImportNoNamedExports_1.ts(2,10): error TS2617: 'a' can only be imp ==== es6ImportNamedImportNoNamedExports_1.ts (2 errors) ==== import { a } from "./es6ImportNamedImportNoNamedExports_0"; ~ -!!! error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import. +!!! error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import. import { a as x } from "./es6ImportNamedImportNoNamedExports_0"; ~ -!!! error TS2617: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or by turning on the 'esModuleInterop' flag and using a default import. \ No newline at end of file +!!! error TS2616: 'a' can only be imported by using 'import a = require("./es6ImportNamedImportNoNamedExports_0")' or a default import. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.errors.txt b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.errors.txt index 34ba5ce697..330a18d8df 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.errors.txt @@ -3,8 +3,8 @@ es6ImportNamedImportParsingError_1.ts(1,10): error TS1141: String literal expect es6ImportNamedImportParsingError_1.ts(1,12): error TS1109: Expression expected. es6ImportNamedImportParsingError_1.ts(1,14): error TS1434: Unexpected keyword or identifier. es6ImportNamedImportParsingError_1.ts(1,14): error TS2304: Cannot find name 'from'. +es6ImportNamedImportParsingError_1.ts(2,8): error TS1192: Module '"es6ImportNamedImportParsingError_0"' has no default export. es6ImportNamedImportParsingError_1.ts(2,24): error TS1005: '{' expected. -es6ImportNamedImportParsingError_1.ts(2,29): error TS2307: Cannot find module 'es6ImportNamedImportParsingError_0' or its corresponding type declarations. es6ImportNamedImportParsingError_1.ts(3,1): error TS1128: Declaration or statement expected. es6ImportNamedImportParsingError_1.ts(3,8): error TS1128: Declaration or statement expected. es6ImportNamedImportParsingError_1.ts(3,16): error TS1434: Unexpected keyword or identifier. @@ -20,7 +20,7 @@ es6ImportNamedImportParsingError_1.ts(4,20): error TS1005: ';' expected. export var m = a; ==== es6ImportNamedImportParsingError_1.ts (14 errors) ==== - import { * } from "es6ImportNamedImportParsingError_0"; + import { * } from "./es6ImportNamedImportParsingError_0"; ~ !!! error TS1003: Identifier expected. ~ @@ -31,12 +31,12 @@ es6ImportNamedImportParsingError_1.ts(4,20): error TS1005: ';' expected. !!! error TS1434: Unexpected keyword or identifier. ~~~~ !!! error TS2304: Cannot find name 'from'. - import defaultBinding, from "es6ImportNamedImportParsingError_0"; + import defaultBinding, from "./es6ImportNamedImportParsingError_0"; + ~~~~~~~~~~~~~~ +!!! error TS1192: Module '"es6ImportNamedImportParsingError_0"' has no default export. ~~~~ !!! error TS1005: '{' expected. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'es6ImportNamedImportParsingError_0' or its corresponding type declarations. - import , { a } from "es6ImportNamedImportParsingError_0"; + import , { a } from "./es6ImportNamedImportParsingError_0"; ~~~~~~ !!! error TS1128: Declaration or statement expected. ~ @@ -45,10 +45,10 @@ es6ImportNamedImportParsingError_1.ts(4,20): error TS1005: ';' expected. !!! error TS1434: Unexpected keyword or identifier. ~~~~ !!! error TS2304: Cannot find name 'from'. - import { a }, from "es6ImportNamedImportParsingError_0"; + import { a }, from "./es6ImportNamedImportParsingError_0"; ~ !!! error TS1005: 'from' expected. ~~~~~~ !!! error TS1141: String literal expected. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS1005: ';' expected. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.errors.txt.diff deleted file mode 100644 index fdfad12a59..0000000000 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.es6ImportNamedImportParsingError.errors.txt -+++ new.es6ImportNamedImportParsingError.errors.txt -@@= skipped -2, +2 lines =@@ - es6ImportNamedImportParsingError_1.ts(1,12): error TS1109: Expression expected. - es6ImportNamedImportParsingError_1.ts(1,14): error TS1434: Unexpected keyword or identifier. - es6ImportNamedImportParsingError_1.ts(1,14): error TS2304: Cannot find name 'from'. --es6ImportNamedImportParsingError_1.ts(2,8): error TS1192: Module '"es6ImportNamedImportParsingError_0"' has no default export. - es6ImportNamedImportParsingError_1.ts(2,24): error TS1005: '{' expected. -+es6ImportNamedImportParsingError_1.ts(2,29): error TS2307: Cannot find module 'es6ImportNamedImportParsingError_0' or its corresponding type declarations. - es6ImportNamedImportParsingError_1.ts(3,1): error TS1128: Declaration or statement expected. - es6ImportNamedImportParsingError_1.ts(3,8): error TS1128: Declaration or statement expected. - es6ImportNamedImportParsingError_1.ts(3,16): error TS1434: Unexpected keyword or identifier. -@@= skipped -29, +29 lines =@@ - ~~~~ - !!! error TS2304: Cannot find name 'from'. - import defaultBinding, from "es6ImportNamedImportParsingError_0"; -- ~~~~~~~~~~~~~~ --!!! error TS1192: Module '"es6ImportNamedImportParsingError_0"' has no default export. - ~~~~ - !!! error TS1005: '{' expected. -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'es6ImportNamedImportParsingError_0' or its corresponding type declarations. - import , { a } from "es6ImportNamedImportParsingError_0"; - ~~~~~~ - !!! error TS1128: Declaration or statement expected. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.js b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.js index 76f14f91ff..733e5c2d14 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.js +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.js @@ -6,10 +6,10 @@ export var x = a; export var m = a; //// [es6ImportNamedImportParsingError_1.ts] -import { * } from "es6ImportNamedImportParsingError_0"; -import defaultBinding, from "es6ImportNamedImportParsingError_0"; -import , { a } from "es6ImportNamedImportParsingError_0"; -import { a }, from "es6ImportNamedImportParsingError_0"; +import { * } from "./es6ImportNamedImportParsingError_0"; +import defaultBinding, from "./es6ImportNamedImportParsingError_0"; +import , { a } from "./es6ImportNamedImportParsingError_0"; +import { a }, from "./es6ImportNamedImportParsingError_0"; //// [es6ImportNamedImportParsingError_0.js] export var a = 10; @@ -17,11 +17,11 @@ export var x = a; export var m = a; //// [es6ImportNamedImportParsingError_1.js] from; -"es6ImportNamedImportParsingError_0"; +"./es6ImportNamedImportParsingError_0"; { a; } from; -"es6ImportNamedImportParsingError_0"; +"./es6ImportNamedImportParsingError_0"; import { a } from , from; -"es6ImportNamedImportParsingError_0"; +"./es6ImportNamedImportParsingError_0"; diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.symbols b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.symbols index 107241ff45..e721430df5 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.symbols +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.symbols @@ -13,13 +13,13 @@ export var m = a; >a : Symbol(a, Decl(es6ImportNamedImportParsingError_0.ts, 0, 10)) === es6ImportNamedImportParsingError_1.ts === -import { * } from "es6ImportNamedImportParsingError_0"; -import defaultBinding, from "es6ImportNamedImportParsingError_0"; +import { * } from "./es6ImportNamedImportParsingError_0"; +import defaultBinding, from "./es6ImportNamedImportParsingError_0"; >defaultBinding : Symbol(defaultBinding, Decl(es6ImportNamedImportParsingError_1.ts, 1, 6)) -import , { a } from "es6ImportNamedImportParsingError_0"; +import , { a } from "./es6ImportNamedImportParsingError_0"; >a : Symbol(a, Decl(es6ImportNamedImportParsingError_1.ts, 3, 8)) -import { a }, from "es6ImportNamedImportParsingError_0"; +import { a }, from "./es6ImportNamedImportParsingError_0"; >a : Symbol(a, Decl(es6ImportNamedImportParsingError_1.ts, 3, 8)) diff --git a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.types b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.types index 1e563177a3..5621b32b70 100644 --- a/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.types +++ b/testdata/baselines/reference/submodule/compiler/es6ImportNamedImportParsingError.types @@ -14,25 +14,25 @@ export var m = a; >a : number === es6ImportNamedImportParsingError_1.ts === -import { * } from "es6ImportNamedImportParsingError_0"; +import { * } from "./es6ImportNamedImportParsingError_0"; >* : number > : any > : any >from : any ->"es6ImportNamedImportParsingError_0" : "es6ImportNamedImportParsingError_0" +>"./es6ImportNamedImportParsingError_0" : "./es6ImportNamedImportParsingError_0" -import defaultBinding, from "es6ImportNamedImportParsingError_0"; +import defaultBinding, from "./es6ImportNamedImportParsingError_0"; >defaultBinding : any -import , { a } from "es6ImportNamedImportParsingError_0"; +import , { a } from "./es6ImportNamedImportParsingError_0"; >a : any >from : any ->"es6ImportNamedImportParsingError_0" : "es6ImportNamedImportParsingError_0" +>"./es6ImportNamedImportParsingError_0" : "./es6ImportNamedImportParsingError_0" -import { a }, from "es6ImportNamedImportParsingError_0"; +import { a }, from "./es6ImportNamedImportParsingError_0"; >a : any >, from : any > : any >from : any ->"es6ImportNamedImportParsingError_0" : "es6ImportNamedImportParsingError_0" +>"./es6ImportNamedImportParsingError_0" : "./es6ImportNamedImportParsingError_0" diff --git a/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesNoValue.js b/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesNoValue.js index a1f8110ceb..3b4d5eb362 100644 --- a/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesNoValue.js +++ b/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesNoValue.js @@ -11,9 +11,12 @@ Foo.bar = () => { }; //// [expandoFunctionContextualTypesNoValue.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.Foo = Foo; // GH #38532 -const blah_1 = require("blah"); +const blah_1 = __importDefault(require("blah")); function Foo() { } blah_1.default.bar = () => { }; diff --git a/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesNoValue.js.diff b/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesNoValue.js.diff index 4720f816ff..043acea3ee 100644 --- a/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesNoValue.js.diff +++ b/testdata/baselines/reference/submodule/compiler/expandoFunctionContextualTypesNoValue.js.diff @@ -1,10 +1,10 @@ --- old.expandoFunctionContextualTypesNoValue.js +++ new.expandoFunctionContextualTypesNoValue.js -@@= skipped -13, +13 lines =@@ +@@= skipped -16, +16 lines =@@ Object.defineProperty(exports, "__esModule", { value: true }); exports.Foo = Foo; // GH #38532 --var blah_1 = require("blah"); -+const blah_1 = require("blah"); +-var blah_1 = __importDefault(require("blah")); ++const blah_1 = __importDefault(require("blah")); function Foo() { } blah_1.default.bar = () => { }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.js b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.js index f9e2e39be2..4115dbc13d 100644 --- a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.js +++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.js @@ -26,7 +26,40 @@ a2.x + a2.y + a2.z + a2.conflict; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const a2 = require("./a"); +const a2 = __importStar(require("./a")); a.x + a.y + a.z + a.conflict; a2.x + a2.y + a2.z + a2.conflict; diff --git a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.js.diff b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.js.diff index c5c1ca6d36..c08eccc480 100644 --- a/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportAsNamespace_augment.js.diff @@ -1,10 +1,10 @@ --- old.exportAsNamespace_augment.js +++ new.exportAsNamespace_augment.js -@@= skipped -26, +26 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -59, +59 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var a2 = require("./a"); -+const a2 = require("./a"); +-var a2 = __importStar(require("./a")); ++const a2 = __importStar(require("./a")); a.x + a.y + a.z + a.conflict; a2.x + a2.y + a2.z + a2.conflict; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignmentImportMergeNoCrash.js b/testdata/baselines/reference/submodule/compiler/exportAssignmentImportMergeNoCrash.js index 5c1f547dc2..476b9d75d0 100644 --- a/testdata/baselines/reference/submodule/compiler/exportAssignmentImportMergeNoCrash.js +++ b/testdata/baselines/reference/submodule/compiler/exportAssignmentImportMergeNoCrash.js @@ -19,7 +19,10 @@ exports.default = { }; //// [user.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.Obj = void 0; -const assignment_1 = require("./assignment"); +const assignment_1 = __importDefault(require("./assignment")); exports.Obj = void exports.Obj; diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignmentImportMergeNoCrash.js.diff b/testdata/baselines/reference/submodule/compiler/exportAssignmentImportMergeNoCrash.js.diff index ac3193c841..de5757db68 100644 --- a/testdata/baselines/reference/submodule/compiler/exportAssignmentImportMergeNoCrash.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportAssignmentImportMergeNoCrash.js.diff @@ -1,9 +1,9 @@ --- old.exportAssignmentImportMergeNoCrash.js +++ new.exportAssignmentImportMergeNoCrash.js -@@= skipped -20, +20 lines =@@ - "use strict"; +@@= skipped -23, +23 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.Obj = void 0; --var assignment_1 = require("./assignment"); -+const assignment_1 = require("./assignment"); +-var assignment_1 = __importDefault(require("./assignment")); ++const assignment_1 = __importDefault(require("./assignment")); exports.Obj = void exports.Obj; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt.diff deleted file mode 100644 index 313279aa28..0000000000 --- a/testdata/baselines/reference/submodule/compiler/exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt -+++ new.exportAssignmentWithoutAllowSyntheticDefaultImportsError.errors.txt -@@= skipped -0, +0 lines =@@ - /bar.ts(1,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. --/foo.ts(1,8): error TS1259: Module '"/bar"' can only be default-imported using the 'allowSyntheticDefaultImports' flag - - - ==== /bar.ts (1 errors) ==== -@@= skipped -7, +6 lines =@@ - !!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. - function bar() {} - --==== /foo.ts (1 errors) ==== -+==== /foo.ts (0 errors) ==== - import bar from './bar'; -- ~~~ --!!! error TS1259: Module '"/bar"' can only be default-imported using the 'allowSyntheticDefaultImports' flag --!!! related TS2594 /bar.ts:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types.diff b/testdata/baselines/reference/submodule/compiler/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types.diff deleted file mode 100644 index 1fc793e38e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/exportAssignmentWithoutAllowSyntheticDefaultImportsError.types.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- old.exportAssignmentWithoutAllowSyntheticDefaultImportsError.types -+++ new.exportAssignmentWithoutAllowSyntheticDefaultImportsError.types -@@= skipped -8, +8 lines =@@ - - === /foo.ts === - import bar from './bar'; -->bar : any -+>bar : () => void diff --git a/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.errors.txt b/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.errors.txt new file mode 100644 index 0000000000..d175c12c00 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.errors.txt @@ -0,0 +1,18 @@ +exportDeclareClass1.ts(2,21): error TS1183: An implementation cannot be declared in ambient contexts. +exportDeclareClass1.ts(3,31): error TS1183: An implementation cannot be declared in ambient contexts. + + +==== exportDeclareClass1.ts (2 errors) ==== + export declare class eaC { + static tF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static tsF(param:any) { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + }; + + export declare class eaC2 { + static tF(); + static tsF(param:any); + }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.js b/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.js new file mode 100644 index 0000000000..c0aadda389 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.js @@ -0,0 +1,18 @@ +//// [tests/cases/compiler/exportDeclareClass1.ts] //// + +//// [exportDeclareClass1.ts] + export declare class eaC { + static tF() { }; + static tsF(param:any) { }; + }; + + export declare class eaC2 { + static tF(); + static tsF(param:any); + }; + +//// [exportDeclareClass1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +; +; diff --git a/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.symbols b/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.symbols new file mode 100644 index 0000000000..ad4f0a5aea --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.symbols @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/exportDeclareClass1.ts] //// + +=== exportDeclareClass1.ts === + export declare class eaC { +>eaC : Symbol(eaC, Decl(exportDeclareClass1.ts, 0, 0)) + + static tF() { }; +>tF : Symbol(eaC.tF, Decl(exportDeclareClass1.ts, 0, 30)) + + static tsF(param:any) { }; +>tsF : Symbol(eaC.tsF, Decl(exportDeclareClass1.ts, 1, 24)) +>param : Symbol(param, Decl(exportDeclareClass1.ts, 2, 19)) + + }; + + export declare class eaC2 { +>eaC2 : Symbol(eaC2, Decl(exportDeclareClass1.ts, 3, 6)) + + static tF(); +>tF : Symbol(eaC2.tF, Decl(exportDeclareClass1.ts, 5, 28)) + + static tsF(param:any); +>tsF : Symbol(eaC2.tsF, Decl(exportDeclareClass1.ts, 6, 20)) +>param : Symbol(param, Decl(exportDeclareClass1.ts, 7, 19)) + + }; diff --git a/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.types b/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.types new file mode 100644 index 0000000000..bb0796ae62 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportDeclareClass1.types @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/exportDeclareClass1.ts] //// + +=== exportDeclareClass1.ts === + export declare class eaC { +>eaC : eaC + + static tF() { }; +>tF : () => void + + static tsF(param:any) { }; +>tsF : (param: any) => void +>param : any + + }; + + export declare class eaC2 { +>eaC2 : eaC2 + + static tF(); +>tF : () => any + + static tsF(param:any); +>tsF : (param: any) => any +>param : any + + }; diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAbstractClass.js b/testdata/baselines/reference/submodule/compiler/exportDefaultAbstractClass.js index f8a6e5aeda..1760cbfbe9 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAbstractClass.js +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultAbstractClass.js @@ -24,8 +24,11 @@ class B extends A { new B().a.toExponential(); //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); class C extends a_1.default { } new C().a.toExponential(); diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAbstractClass.js.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultAbstractClass.js.diff index b297e0f6f6..31534f4ea4 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAbstractClass.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultAbstractClass.js.diff @@ -8,12 +8,12 @@ } exports.default = A; class B extends A { -@@= skipped -8, +9 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -11, +12 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); class C extends a_1.default { } new C().a.toExponential(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.errors.txt b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.errors.txt index 0a8853c29e..90e5a3e617 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.errors.txt +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.errors.txt @@ -1,12 +1,8 @@ a.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -a.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. asyncawait.ts(2,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. c.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -c.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. d.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -d.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. e.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -e.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. ==== asyncawait.ts (1 errors) ==== @@ -15,40 +11,32 @@ e.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding t ~~~~~ !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -==== a.ts (2 errors) ==== - import { async, await } from 'asyncawait'; +==== a.ts (1 errors) ==== + import { async, await } from './asyncawait'; ~~~~~ !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. - ~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. export default async(() => await(Promise.resolve(1))); ==== b.ts (0 errors) ==== export default async () => { return 0; }; -==== c.ts (2 errors) ==== - import { async, await } from 'asyncawait'; +==== c.ts (1 errors) ==== + import { async, await } from './asyncawait'; ~~~~~ !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. - ~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. export default async(); -==== d.ts (2 errors) ==== - import { async, await } from 'asyncawait'; +==== d.ts (1 errors) ==== + import { async, await } from './asyncawait'; ~~~~~ !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. - ~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. export default async; -==== e.ts (2 errors) ==== - import { async, await } from 'asyncawait'; +==== e.ts (1 errors) ==== + import { async, await } from './asyncawait'; ~~~~~ !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. - ~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. export default async diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.errors.txt.diff deleted file mode 100644 index 76f8aab771..0000000000 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.errors.txt.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- old.exportDefaultAsyncFunction2.errors.txt -+++ new.exportDefaultAsyncFunction2.errors.txt -@@= skipped -0, +0 lines =@@ - a.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -+a.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. - asyncawait.ts(2,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. - c.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -+c.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. - d.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -+d.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. - e.ts(1,17): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -+e.ts(1,30): error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. - - - ==== asyncawait.ts (1 errors) ==== -@@= skipped -10, +14 lines =@@ - ~~~~~ - !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. - --==== a.ts (1 errors) ==== -+==== a.ts (2 errors) ==== - import { async, await } from 'asyncawait'; - ~~~~~ - !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -+ ~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. - export default async(() => await(Promise.resolve(1))); - - ==== b.ts (0 errors) ==== - export default async () => { return 0; }; - --==== c.ts (1 errors) ==== -+==== c.ts (2 errors) ==== - import { async, await } from 'asyncawait'; - ~~~~~ - !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -+ ~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. - export default async(); - --==== d.ts (1 errors) ==== -+==== d.ts (2 errors) ==== - import { async, await } from 'asyncawait'; - ~~~~~ - !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -+ ~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. - - export default async; - --==== e.ts (1 errors) ==== -+==== e.ts (2 errors) ==== - import { async, await } from 'asyncawait'; - ~~~~~ - !!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. -+ ~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'asyncawait' or its corresponding type declarations. - - export default async - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.js b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.js index 11973c9b17..7eb390e8ad 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.js +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.js @@ -5,23 +5,23 @@ export function async(...args: any[]): any { } export function await(...args: any[]): any { } //// [a.ts] -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; export default async(() => await(Promise.resolve(1))); //// [b.ts] export default async () => { return 0; }; //// [c.ts] -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; export default async(); //// [d.ts] -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; export default async; //// [e.ts] -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; export default async @@ -31,17 +31,17 @@ export function foo() { } export function async(...args) { } export function await(...args) { } //// [a.js] -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; export default async(() => await(Promise.resolve(1))); //// [b.js] export default async () => { return 0; }; //// [c.js] -import { async } from 'asyncawait'; +import { async } from './asyncawait'; export default async(); //// [d.js] -import { async } from 'asyncawait'; +import { async } from './asyncawait'; export default async; //// [e.js] -import { async } from 'asyncawait'; +import { async } from './asyncawait'; export default async; export function foo() { } diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.js.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.js.diff index f0f7d71fad..cf54430fba 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.js.diff @@ -1,7 +1,7 @@ --- old.exportDefaultAsyncFunction2.js +++ new.exportDefaultAsyncFunction2.js @@= skipped -33, +33 lines =@@ - import { async, await } from 'asyncawait'; + import { async, await } from './asyncawait'; export default async(() => await(Promise.resolve(1))); //// [b.js] -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { @@ -16,5 +16,5 @@ -export default () => __awaiter(void 0, void 0, void 0, function* () { return 0; }); +export default async () => { return 0; }; //// [c.js] - import { async } from 'asyncawait'; + import { async } from './asyncawait'; export default async(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.symbols b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.symbols index 04733e02f0..449e44d6e4 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.symbols +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.symbols @@ -11,7 +11,7 @@ export function await(...args: any[]): any { } >args : Symbol(args, Decl(asyncawait.ts, 1, 22)) === a.ts === -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; >async : Symbol(async, Decl(a.ts, 0, 8)) >await : Symbol(await, Decl(a.ts, 0, 15)) @@ -27,7 +27,7 @@ export default async(() => await(Promise.resolve(1))); export default async () => { return 0; }; === c.ts === -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; >async : Symbol(async, Decl(c.ts, 0, 8)) >await : Symbol(await, Decl(c.ts, 0, 15)) @@ -35,7 +35,7 @@ export default async(); >async : Symbol(async, Decl(c.ts, 0, 8)) === d.ts === -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; >async : Symbol(async, Decl(d.ts, 0, 8)) >await : Symbol(await, Decl(d.ts, 0, 15)) @@ -43,7 +43,7 @@ export default async; >async : Symbol(async, Decl(d.ts, 0, 8)) === e.ts === -import { async, await } from 'asyncawait'; +import { async, await } from './asyncawait'; >async : Symbol(async, Decl(e.ts, 0, 8)) >await : Symbol(await, Decl(e.ts, 0, 15)) diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.types b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.types index f8eeafbfbd..a714c4d9f8 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.types +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.types @@ -10,16 +10,16 @@ export function await(...args: any[]): any { } >args : any[] === a.ts === -import { async, await } from 'asyncawait'; ->async : any ->await : any +import { async, await } from './asyncawait'; +>async : (...args: any[]) => any +>await : (...args: any[]) => any export default async(() => await(Promise.resolve(1))); >async(() => await(Promise.resolve(1))) : any ->async : any +>async : (...args: any[]) => any >() => await(Promise.resolve(1)) : () => any >await(Promise.resolve(1)) : any ->await : any +>await : (...args: any[]) => any >Promise.resolve(1) : Promise >Promise.resolve : { (): Promise; (value: T): Promise>; (value: T | PromiseLike): Promise>; } >Promise : PromiseConstructor @@ -32,29 +32,29 @@ export default async () => { return 0; }; >0 : 0 === c.ts === -import { async, await } from 'asyncawait'; ->async : any ->await : any +import { async, await } from './asyncawait'; +>async : (...args: any[]) => any +>await : (...args: any[]) => any export default async(); >async() : any ->async : any +>async : (...args: any[]) => any === d.ts === -import { async, await } from 'asyncawait'; ->async : any ->await : any +import { async, await } from './asyncawait'; +>async : (...args: any[]) => any +>await : (...args: any[]) => any export default async; ->async : any +>async : (...args: any[]) => any === e.ts === -import { async, await } from 'asyncawait'; ->async : any ->await : any +import { async, await } from './asyncawait'; +>async : (...args: any[]) => any +>await : (...args: any[]) => any export default async ->async : any +>async : (...args: any[]) => any export function foo() { } >foo : () => void diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.types.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.types.diff deleted file mode 100644 index a53c409e2e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultAsyncFunction2.types.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- old.exportDefaultAsyncFunction2.types -+++ new.exportDefaultAsyncFunction2.types -@@= skipped -10, +10 lines =@@ - - === a.ts === - import { async, await } from 'asyncawait'; -->async : (...args: any[]) => any -->await : (...args: any[]) => any -+>async : any -+>await : any - - export default async(() => await(Promise.resolve(1))); - >async(() => await(Promise.resolve(1))) : any -->async : (...args: any[]) => any -+>async : any - >() => await(Promise.resolve(1)) : () => any - >await(Promise.resolve(1)) : any -->await : (...args: any[]) => any -+>await : any - >Promise.resolve(1) : Promise - >Promise.resolve : { (): Promise; (value: T): Promise>; (value: T | PromiseLike): Promise>; } - >Promise : PromiseConstructor -@@= skipped -22, +22 lines =@@ - - === c.ts === - import { async, await } from 'asyncawait'; -->async : (...args: any[]) => any -->await : (...args: any[]) => any -+>async : any -+>await : any - - export default async(); - >async() : any -->async : (...args: any[]) => any -+>async : any - - === d.ts === - import { async, await } from 'asyncawait'; -->async : (...args: any[]) => any -->await : (...args: any[]) => any -+>async : any -+>await : any - - export default async; -->async : (...args: any[]) => any -+>async : any - - === e.ts === - import { async, await } from 'asyncawait'; -->async : (...args: any[]) => any -->await : (...args: any[]) => any -+>async : any -+>await : any - - export default async -->async : (...args: any[]) => any -+>async : any - - export function foo() { } - >foo : () => void \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultDuplicateCrash.js b/testdata/baselines/reference/submodule/compiler/exportDefaultDuplicateCrash.js index 077ffd357f..6d4537de90 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultDuplicateCrash.js +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultDuplicateCrash.js @@ -11,11 +11,14 @@ export { aa as default } from './hi' //// [exportDefaultDuplicateCrash.js] "use strict"; // #38214 +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; exports.default = default_1; function default_1() { } const hi_1 = require("./hi"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return hi_1.default; } }); +Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(hi_1).default; } }); const hi_2 = require("./hi"); Object.defineProperty(exports, "default", { enumerable: true, get: function () { return hi_2.aa; } }); diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultDuplicateCrash.js.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultDuplicateCrash.js.diff index d457f0ef4e..b758f1f6eb 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultDuplicateCrash.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultDuplicateCrash.js.diff @@ -1,12 +1,12 @@ --- old.exportDefaultDuplicateCrash.js +++ new.exportDefaultDuplicateCrash.js -@@= skipped -14, +14 lines =@@ +@@= skipped -17, +17 lines =@@ exports.default = void 0; exports.default = default_1; function default_1() { } -var hi_1 = require("./hi"); +const hi_1 = require("./hi"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { return hi_1.default; } }); + Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(hi_1).default; } }); -var hi_2 = require("./hi"); +const hi_2 = require("./hi"); Object.defineProperty(exports, "default", { enumerable: true, get: function () { return hi_2.aa; } }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultMarksIdentifierAsUsed.js b/testdata/baselines/reference/submodule/compiler/exportDefaultMarksIdentifierAsUsed.js index 5772dcfa15..6062f3a06e 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultMarksIdentifierAsUsed.js +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultMarksIdentifierAsUsed.js @@ -15,6 +15,9 @@ const Obj = {}; exports.default = Obj; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); a_1.default.fn = function () { }; diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.js b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.js index 17fc65677f..ed36cac0c8 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.js +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.js @@ -59,13 +59,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "foo".length; //// [index.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); /// -const foobar_1 = require("foobar"); -const foobarx_1 = require("foobarx"); +const foobar_1 = __importDefault(require("foobar")); +const foobarx_1 = __importDefault(require("foobarx")); const x = X; const x2 = foobarx_1.default; -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); const b = new a_1.default(a_1.default.b); -const b_1 = require("./b"); +const b_1 = __importDefault(require("./b")); b_1.default + 1; diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.js.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.js.diff index 94bf307b34..af236e3409 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty.js.diff @@ -1,19 +1,19 @@ --- old.exportDefaultProperty.js +++ new.exportDefaultProperty.js -@@= skipped -60, +60 lines =@@ - "use strict"; +@@= skipped -63, +63 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); /// --var foobar_1 = require("foobar"); +-var foobar_1 = __importDefault(require("foobar")); -var X = foobar_1.default.X; --var foobarx_1 = require("foobarx"); -+const foobar_1 = require("foobar"); -+const foobarx_1 = require("foobarx"); +-var foobarx_1 = __importDefault(require("foobarx")); ++const foobar_1 = __importDefault(require("foobar")); ++const foobarx_1 = __importDefault(require("foobarx")); const x = X; const x2 = foobarx_1.default; --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); const b = new a_1.default(a_1.default.b); --var b_1 = require("./b"); -+const b_1 = require("./b"); +-var b_1 = __importDefault(require("./b")); ++const b_1 = __importDefault(require("./b")); b_1.default + 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty2.js b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty2.js index 2ce5168afb..ae60a12e62 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty2.js +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty2.js @@ -24,6 +24,9 @@ class C { exports.default = C.B; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); const x = { c: a_1.default }; diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty2.js.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty2.js.diff index 5fa7c36278..1590d2038f 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultProperty2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultProperty2.js.diff @@ -8,8 +8,10 @@ } exports.default = C.B; //// [b.js] - "use strict"; +@@= skipped -8, +9 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); const x = { c: a_1.default }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultQualifiedNameNoError.js b/testdata/baselines/reference/submodule/compiler/exportDefaultQualifiedNameNoError.js index 872a5ea6c1..4bdb830f31 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultQualifiedNameNoError.js +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultQualifiedNameNoError.js @@ -17,6 +17,9 @@ class C { exports.default = C.x; //// [usage.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const code_1 = require("./code"); +const code_1 = __importDefault(require("./code")); void code_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultQualifiedNameNoError.js.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultQualifiedNameNoError.js.diff index f804de7c97..3fc32e21b4 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultQualifiedNameNoError.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultQualifiedNameNoError.js.diff @@ -16,8 +16,10 @@ ; exports.default = C.x; //// [usage.js] - "use strict"; +@@= skipped -14, +11 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var code_1 = require("./code"); -+const code_1 = require("./code"); +-var code_1 = __importDefault(require("./code")); ++const code_1 = __importDefault(require("./code")); void code_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultStripsFreshness.js b/testdata/baselines/reference/submodule/compiler/exportDefaultStripsFreshness.js index 2551e73853..bca09b3e5d 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultStripsFreshness.js +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultStripsFreshness.js @@ -35,8 +35,41 @@ exports.q = { }; //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const items_1 = require("./items"); +const items_1 = __importStar(require("./items")); function nFoo(x) { } nFoo(items_1.q); // for comparison nFoo(items_1.default); diff --git a/testdata/baselines/reference/submodule/compiler/exportDefaultStripsFreshness.js.diff b/testdata/baselines/reference/submodule/compiler/exportDefaultStripsFreshness.js.diff index 71b68e2ef9..e047563812 100644 --- a/testdata/baselines/reference/submodule/compiler/exportDefaultStripsFreshness.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportDefaultStripsFreshness.js.diff @@ -1,11 +1,11 @@ --- old.exportDefaultStripsFreshness.js +++ new.exportDefaultStripsFreshness.js -@@= skipped -35, +35 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -68, +68 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var items_1 = require("./items"); -+const items_1 = require("./items"); +-var items_1 = __importStar(require("./items")); ++const items_1 = __importStar(require("./items")); function nFoo(x) { } nFoo(items_1.q); // for comparison nFoo(items_1.default); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.errors.txt b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.errors.txt new file mode 100644 index 0000000000..0678fe7039 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.errors.txt @@ -0,0 +1,25 @@ +exportEqualErrorType_1.ts(3,23): error TS2339: Property 'static' does not exist on type '{ (): connectExport; foo: Date; }'. + + +==== exportEqualErrorType_1.ts (1 errors) ==== + /// + import connect = require('./exportEqualErrorType_0'); + connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. + ~~~~~~ +!!! error TS2339: Property 'static' does not exist on type '{ (): connectExport; foo: Date; }'. + +==== exportEqualErrorType_0.ts (0 errors) ==== + module server { + export interface connectModule { + (res, req, next): void; + } + export interface connectExport { + use: (mod: connectModule) => connectExport; + } + } + var server: { + (): server.connectExport; + foo: Date; + }; + export = server; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.js b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.js new file mode 100644 index 0000000000..448996e01f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.js @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/exportEqualErrorType.ts] //// + +//// [exportEqualErrorType_0.ts] +module server { + export interface connectModule { + (res, req, next): void; + } + export interface connectExport { + use: (mod: connectModule) => connectExport; + } +} +var server: { + (): server.connectExport; + foo: Date; +}; +export = server; + +//// [exportEqualErrorType_1.ts] +/// +import connect = require('./exportEqualErrorType_0'); +connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. + + +//// [exportEqualErrorType_0.js] +"use strict"; +var server; +module.exports = server; +//// [exportEqualErrorType_1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +/// +const connect = require("./exportEqualErrorType_0"); +connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.js.diff b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.js.diff new file mode 100644 index 0000000000..1f7489d16a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.js.diff @@ -0,0 +1,9 @@ +--- old.exportEqualErrorType.js ++++ new.exportEqualErrorType.js +@@= skipped -28, +28 lines =@@ + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + /// +-var connect = require("./exportEqualErrorType_0"); ++const connect = require("./exportEqualErrorType_0"); + connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.symbols b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.symbols new file mode 100644 index 0000000000..d31bd04ec8 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.symbols @@ -0,0 +1,50 @@ +//// [tests/cases/compiler/exportEqualErrorType.ts] //// + +=== exportEqualErrorType_1.ts === +/// +import connect = require('./exportEqualErrorType_0'); +>connect : Symbol(connect, Decl(exportEqualErrorType_1.ts, 0, 0)) + +connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. +>connect().use : Symbol(connect.connectExport.use, Decl(exportEqualErrorType_0.ts, 4, 36)) +>connect : Symbol(connect, Decl(exportEqualErrorType_1.ts, 0, 0)) +>use : Symbol(connect.connectExport.use, Decl(exportEqualErrorType_0.ts, 4, 36)) +>connect : Symbol(connect, Decl(exportEqualErrorType_1.ts, 0, 0)) + +=== exportEqualErrorType_0.ts === +module server { +>server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3)) + + export interface connectModule { +>connectModule : Symbol(connectModule, Decl(exportEqualErrorType_0.ts, 0, 15)) + + (res, req, next): void; +>res : Symbol(res, Decl(exportEqualErrorType_0.ts, 2, 9)) +>req : Symbol(req, Decl(exportEqualErrorType_0.ts, 2, 13)) +>next : Symbol(next, Decl(exportEqualErrorType_0.ts, 2, 18)) + } + export interface connectExport { +>connectExport : Symbol(connectExport, Decl(exportEqualErrorType_0.ts, 3, 5)) + + use: (mod: connectModule) => connectExport; +>use : Symbol(connectExport.use, Decl(exportEqualErrorType_0.ts, 4, 36)) +>mod : Symbol(mod, Decl(exportEqualErrorType_0.ts, 5, 14)) +>connectModule : Symbol(connectModule, Decl(exportEqualErrorType_0.ts, 0, 15)) +>connectExport : Symbol(connectExport, Decl(exportEqualErrorType_0.ts, 3, 5)) + } +} +var server: { +>server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3)) + + (): server.connectExport; +>server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3)) +>connectExport : Symbol(server.connectExport, Decl(exportEqualErrorType_0.ts, 3, 5)) + + foo: Date; +>foo : Symbol(foo, Decl(exportEqualErrorType_0.ts, 9, 29)) +>Date : Symbol(Date, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --), Decl(lib.scripthost.d.ts, --, --)) + +}; +export = server; +>server : Symbol(server, Decl(exportEqualErrorType_0.ts, 0, 0), Decl(exportEqualErrorType_0.ts, 8, 3)) + diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.types b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.types new file mode 100644 index 0000000000..cc29313770 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.types @@ -0,0 +1,46 @@ +//// [tests/cases/compiler/exportEqualErrorType.ts] //// + +=== exportEqualErrorType_1.ts === +/// +import connect = require('./exportEqualErrorType_0'); +>connect : { (): connect.connectExport; foo: Date; } + +connect().use(connect.static('foo')); // Error 1 The property 'static' does not exist on value of type ''. +>connect().use(connect.static('foo')) : connect.connectExport +>connect().use : (mod: connect.connectModule) => connect.connectExport +>connect() : connect.connectExport +>connect : { (): connect.connectExport; foo: Date; } +>use : (mod: connect.connectModule) => connect.connectExport +>connect.static('foo') : any +>connect.static : any +>connect : { (): connect.connectExport; foo: Date; } +>static : any +>'foo' : "foo" + +=== exportEqualErrorType_0.ts === +module server { + export interface connectModule { + (res, req, next): void; +>res : any +>req : any +>next : any + } + export interface connectExport { + use: (mod: connectModule) => connectExport; +>use : (mod: connectModule) => connectExport +>mod : connectModule + } +} +var server: { +>server : { (): import("exportEqualErrorType_0").connectExport; foo: Date; } + + (): server.connectExport; +>server : any + + foo: Date; +>foo : Date + +}; +export = server; +>server : { (): import("exportEqualErrorType_0").connectExport; foo: Date; } + diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.types.diff b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.types.diff new file mode 100644 index 0000000000..1b92508784 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportEqualErrorType.types.diff @@ -0,0 +1,18 @@ +--- old.exportEqualErrorType.types ++++ new.exportEqualErrorType.types +@@= skipped -31, +31 lines =@@ + } + } + var server: { +->server : { (): server.connectExport; foo: Date; } ++>server : { (): import("exportEqualErrorType_0").connectExport; foo: Date; } + + (): server.connectExport; + >server : any +@@= skipped -10, +10 lines =@@ + + }; + export = server; +->server : { (): server.connectExport; foo: Date; } ++>server : { (): import("exportEqualErrorType_0").connectExport; foo: Date; } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualsDefaultProperty.js b/testdata/baselines/reference/submodule/compiler/exportEqualsDefaultProperty.js index ef59eb4d24..f2c3a6bb85 100644 --- a/testdata/baselines/reference/submodule/compiler/exportEqualsDefaultProperty.js +++ b/testdata/baselines/reference/submodule/compiler/exportEqualsDefaultProperty.js @@ -22,6 +22,9 @@ var x = { module.exports = x; //// [imp.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const exp_1 = require("./exp"); +const exp_1 = __importDefault(require("./exp")); exp_1.default.toExponential(2); diff --git a/testdata/baselines/reference/submodule/compiler/exportEqualsDefaultProperty.js.diff b/testdata/baselines/reference/submodule/compiler/exportEqualsDefaultProperty.js.diff index 2c9c620c5f..0d1643296a 100644 --- a/testdata/baselines/reference/submodule/compiler/exportEqualsDefaultProperty.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportEqualsDefaultProperty.js.diff @@ -1,9 +1,9 @@ --- old.exportEqualsDefaultProperty.js +++ new.exportEqualsDefaultProperty.js -@@= skipped -22, +22 lines =@@ - //// [imp.js] - "use strict"; +@@= skipped -25, +25 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var exp_1 = require("./exp"); -+const exp_1 = require("./exp"); +-var exp_1 = __importDefault(require("./exp")); ++const exp_1 = __importDefault(require("./exp")); exp_1.default.toExponential(2); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.errors.txt b/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.errors.txt new file mode 100644 index 0000000000..d81f9c5566 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.errors.txt @@ -0,0 +1,12 @@ +exportSameNameFuncVar.ts(1,12): error TS2300: Duplicate identifier 'a'. +exportSameNameFuncVar.ts(2,17): error TS2300: Duplicate identifier 'a'. + + +==== exportSameNameFuncVar.ts (2 errors) ==== + export var a = 10; + ~ +!!! error TS2300: Duplicate identifier 'a'. + export function a() { + ~ +!!! error TS2300: Duplicate identifier 'a'. + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.js b/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.js new file mode 100644 index 0000000000..88272ae169 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.js @@ -0,0 +1,15 @@ +//// [tests/cases/compiler/exportSameNameFuncVar.ts] //// + +//// [exportSameNameFuncVar.ts] +export var a = 10; +export function a() { +} + +//// [exportSameNameFuncVar.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.a = void 0; +exports.a = a; +exports.a = 10; +function a() { +} diff --git a/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.symbols b/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.symbols new file mode 100644 index 0000000000..de081aa7ac --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.symbols @@ -0,0 +1,9 @@ +//// [tests/cases/compiler/exportSameNameFuncVar.ts] //// + +=== exportSameNameFuncVar.ts === +export var a = 10; +>a : Symbol(a, Decl(exportSameNameFuncVar.ts, 0, 10)) + +export function a() { +>a : Symbol(a, Decl(exportSameNameFuncVar.ts, 0, 18)) +} diff --git a/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.types b/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.types new file mode 100644 index 0000000000..5181ca6b76 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportSameNameFuncVar.types @@ -0,0 +1,10 @@ +//// [tests/cases/compiler/exportSameNameFuncVar.ts] //// + +=== exportSameNameFuncVar.ts === +export var a = 10; +>a : number +>10 : 10 + +export function a() { +>a : () => void +} diff --git a/testdata/baselines/reference/submodule/compiler/exportStarFromEmptyModule.js b/testdata/baselines/reference/submodule/compiler/exportStarFromEmptyModule.js index f86e7b7e9a..1be8a70041 100644 --- a/testdata/baselines/reference/submodule/compiler/exportStarFromEmptyModule.js +++ b/testdata/baselines/reference/submodule/compiler/exportStarFromEmptyModule.js @@ -58,8 +58,41 @@ class A { exports.A = A; //// [exportStarFromEmptyModule_module4.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const X = require("./exportStarFromEmptyModule_module3"); +const X = __importStar(require("./exportStarFromEmptyModule_module3")); var s; X.A.q; X.A.r; // Error diff --git a/testdata/baselines/reference/submodule/compiler/exportStarFromEmptyModule.js.diff b/testdata/baselines/reference/submodule/compiler/exportStarFromEmptyModule.js.diff index 7c33e43513..10f9a6049f 100644 --- a/testdata/baselines/reference/submodule/compiler/exportStarFromEmptyModule.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportStarFromEmptyModule.js.diff @@ -16,10 +16,12 @@ } exports.A = A; //// [exportStarFromEmptyModule_module4.js] - "use strict"; +@@= skipped -38, +39 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var X = require("./exportStarFromEmptyModule_module3"); -+const X = require("./exportStarFromEmptyModule_module3"); +-var X = __importStar(require("./exportStarFromEmptyModule_module3")); ++const X = __importStar(require("./exportStarFromEmptyModule_module3")); var s; X.A.q; X.A.r; // Error \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportStarNotElided.js b/testdata/baselines/reference/submodule/compiler/exportStarNotElided.js index ba721257eb..dabe577d9d 100644 --- a/testdata/baselines/reference/submodule/compiler/exportStarNotElided.js +++ b/testdata/baselines/reference/submodule/compiler/exportStarNotElided.js @@ -34,14 +34,36 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi if (k2 === undefined) k2 = k; o[k2] = m[k]; })); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.aliased = void 0; __exportStar(require("./register"), exports); __exportStar(require("./data1"), exports); -exports.aliased = require("./data1"); +exports.aliased = __importStar(require("./data1")); //// [data1.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/exportStarNotElided.js.diff b/testdata/baselines/reference/submodule/compiler/exportStarNotElided.js.diff index 713223991b..fd2907710b 100644 --- a/testdata/baselines/reference/submodule/compiler/exportStarNotElided.js.diff +++ b/testdata/baselines/reference/submodule/compiler/exportStarNotElided.js.diff @@ -1,6 +1,6 @@ --- old.exportStarNotElided.js +++ new.exportStarNotElided.js -@@= skipped -44, +44 lines =@@ +@@= skipped -66, +66 lines =@@ //// [data1.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.errors.txt b/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.errors.txt new file mode 100644 index 0000000000..d6069e99b6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.errors.txt @@ -0,0 +1,52 @@ +exportedBlockScopedDeclarations.ts(1,13): error TS2448: Block-scoped variable 'foo' used before its declaration. +exportedBlockScopedDeclarations.ts(2,20): error TS2448: Block-scoped variable 'bar' used before its declaration. +exportedBlockScopedDeclarations.ts(4,15): error TS2448: Block-scoped variable 'bar' used before its declaration. +exportedBlockScopedDeclarations.ts(7,22): error TS2448: Block-scoped variable 'bar' used before its declaration. +exportedBlockScopedDeclarations.ts(10,12): error TS2448: Block-scoped variable 'foo1' used before its declaration. +exportedBlockScopedDeclarations.ts(11,19): error TS2448: Block-scoped variable 'bar1' used before its declaration. +exportedBlockScopedDeclarations.ts(13,14): error TS2448: Block-scoped variable 'bar1' used before its declaration. +exportedBlockScopedDeclarations.ts(16,21): error TS2448: Block-scoped variable 'bar1' used before its declaration. + + +==== exportedBlockScopedDeclarations.ts (8 errors) ==== + const foo = foo; // compile error + ~~~ +!!! error TS2448: Block-scoped variable 'foo' used before its declaration. +!!! related TS2728 exportedBlockScopedDeclarations.ts:1:7: 'foo' is declared here. + export const bar = bar; // should be compile error + ~~~ +!!! error TS2448: Block-scoped variable 'bar' used before its declaration. +!!! related TS2728 exportedBlockScopedDeclarations.ts:2:14: 'bar' is declared here. + function f() { + const bar = bar; // compile error + ~~~ +!!! error TS2448: Block-scoped variable 'bar' used before its declaration. +!!! related TS2728 exportedBlockScopedDeclarations.ts:4:9: 'bar' is declared here. + } + namespace NS { + export const bar = bar; // should be compile error + ~~~ +!!! error TS2448: Block-scoped variable 'bar' used before its declaration. +!!! related TS2728 exportedBlockScopedDeclarations.ts:7:16: 'bar' is declared here. + } + + let foo1 = foo1; // compile error + ~~~~ +!!! error TS2448: Block-scoped variable 'foo1' used before its declaration. +!!! related TS2728 exportedBlockScopedDeclarations.ts:10:5: 'foo1' is declared here. + export let bar1 = bar1; // should be compile error + ~~~~ +!!! error TS2448: Block-scoped variable 'bar1' used before its declaration. +!!! related TS2728 exportedBlockScopedDeclarations.ts:11:12: 'bar1' is declared here. + function f1() { + let bar1 = bar1; // compile error + ~~~~ +!!! error TS2448: Block-scoped variable 'bar1' used before its declaration. +!!! related TS2728 exportedBlockScopedDeclarations.ts:13:7: 'bar1' is declared here. + } + namespace NS1 { + export let bar1 = bar1; // should be compile error + ~~~~ +!!! error TS2448: Block-scoped variable 'bar1' used before its declaration. +!!! related TS2728 exportedBlockScopedDeclarations.ts:16:14: 'bar1' is declared here. + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.js b/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.js new file mode 100644 index 0000000000..93aa3f0d54 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.js @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/exportedBlockScopedDeclarations.ts] //// + +//// [exportedBlockScopedDeclarations.ts] +const foo = foo; // compile error +export const bar = bar; // should be compile error +function f() { + const bar = bar; // compile error +} +namespace NS { + export const bar = bar; // should be compile error +} + +let foo1 = foo1; // compile error +export let bar1 = bar1; // should be compile error +function f1() { + let bar1 = bar1; // compile error +} +namespace NS1 { + export let bar1 = bar1; // should be compile error +} + +//// [exportedBlockScopedDeclarations.js] +const foo = foo; // compile error +export const bar = bar; // should be compile error +function f() { + const bar = bar; // compile error +} +var NS; +(function (NS) { + NS.bar = NS.bar; // should be compile error +})(NS || (NS = {})); +let foo1 = foo1; // compile error +export let bar1 = bar1; // should be compile error +function f1() { + let bar1 = bar1; // compile error +} +var NS1; +(function (NS1) { + NS1.bar1 = NS1.bar1; // should be compile error +})(NS1 || (NS1 = {})); diff --git a/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.symbols b/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.symbols new file mode 100644 index 0000000000..dab45564d4 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.symbols @@ -0,0 +1,48 @@ +//// [tests/cases/compiler/exportedBlockScopedDeclarations.ts] //// + +=== exportedBlockScopedDeclarations.ts === +const foo = foo; // compile error +>foo : Symbol(foo, Decl(exportedBlockScopedDeclarations.ts, 0, 5)) +>foo : Symbol(foo, Decl(exportedBlockScopedDeclarations.ts, 0, 5)) + +export const bar = bar; // should be compile error +>bar : Symbol(bar, Decl(exportedBlockScopedDeclarations.ts, 1, 12)) +>bar : Symbol(bar, Decl(exportedBlockScopedDeclarations.ts, 1, 12)) + +function f() { +>f : Symbol(f, Decl(exportedBlockScopedDeclarations.ts, 1, 23)) + + const bar = bar; // compile error +>bar : Symbol(bar, Decl(exportedBlockScopedDeclarations.ts, 3, 7)) +>bar : Symbol(bar, Decl(exportedBlockScopedDeclarations.ts, 3, 7)) +} +namespace NS { +>NS : Symbol(NS, Decl(exportedBlockScopedDeclarations.ts, 4, 1)) + + export const bar = bar; // should be compile error +>bar : Symbol(bar, Decl(exportedBlockScopedDeclarations.ts, 6, 14)) +>bar : Symbol(bar, Decl(exportedBlockScopedDeclarations.ts, 6, 14)) +} + +let foo1 = foo1; // compile error +>foo1 : Symbol(foo1, Decl(exportedBlockScopedDeclarations.ts, 9, 3)) +>foo1 : Symbol(foo1, Decl(exportedBlockScopedDeclarations.ts, 9, 3)) + +export let bar1 = bar1; // should be compile error +>bar1 : Symbol(bar1, Decl(exportedBlockScopedDeclarations.ts, 10, 10)) +>bar1 : Symbol(bar1, Decl(exportedBlockScopedDeclarations.ts, 10, 10)) + +function f1() { +>f1 : Symbol(f1, Decl(exportedBlockScopedDeclarations.ts, 10, 23)) + + let bar1 = bar1; // compile error +>bar1 : Symbol(bar1, Decl(exportedBlockScopedDeclarations.ts, 12, 5)) +>bar1 : Symbol(bar1, Decl(exportedBlockScopedDeclarations.ts, 12, 5)) +} +namespace NS1 { +>NS1 : Symbol(NS1, Decl(exportedBlockScopedDeclarations.ts, 13, 1)) + + export let bar1 = bar1; // should be compile error +>bar1 : Symbol(bar1, Decl(exportedBlockScopedDeclarations.ts, 15, 12)) +>bar1 : Symbol(bar1, Decl(exportedBlockScopedDeclarations.ts, 15, 12)) +} diff --git a/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.types b/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.types new file mode 100644 index 0000000000..74e9636f30 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/exportedBlockScopedDeclarations.types @@ -0,0 +1,48 @@ +//// [tests/cases/compiler/exportedBlockScopedDeclarations.ts] //// + +=== exportedBlockScopedDeclarations.ts === +const foo = foo; // compile error +>foo : any +>foo : any + +export const bar = bar; // should be compile error +>bar : any +>bar : any + +function f() { +>f : () => void + + const bar = bar; // compile error +>bar : any +>bar : any +} +namespace NS { +>NS : typeof NS + + export const bar = bar; // should be compile error +>bar : any +>bar : any +} + +let foo1 = foo1; // compile error +>foo1 : any +>foo1 : any + +export let bar1 = bar1; // should be compile error +>bar1 : any +>bar1 : any + +function f1() { +>f1 : () => void + + let bar1 = bar1; // compile error +>bar1 : any +>bar1 : any +} +namespace NS1 { +>NS1 : typeof NS1 + + export let bar1 = bar1; // should be compile error +>bar1 : any +>bar1 : any +} diff --git a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.js b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.js index 213472d465..f82c496d42 100644 --- a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.js +++ b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.js @@ -10,10 +10,43 @@ export function* foo2({ foo = yield "a" }) { //// [bar.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.foo = foo; exports.foo2 = foo2; -async function foo({ foo = await Promise.resolve().then(() => require("./bar")) }) { +async function foo({ foo = await Promise.resolve().then(() => __importStar(require("./bar"))) }) { } function* foo2({ foo = yield "a" }) { } diff --git a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.js.diff b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.js.diff index 2367d8dab0..aba90e7e84 100644 --- a/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.js.diff +++ b/testdata/baselines/reference/submodule/compiler/expressionsForbiddenInParameterInitializers.js.diff @@ -1,9 +1,9 @@ --- old.expressionsForbiddenInParameterInitializers.js +++ new.expressionsForbiddenInParameterInitializers.js -@@= skipped -9, +9 lines =@@ - - //// [bar.js] - "use strict"; +@@= skipped -42, +42 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -17,9 +17,9 @@ exports.foo = foo; exports.foo2 = foo2; -function foo(_a) { -- return __awaiter(this, arguments, void 0, function* ({ foo = yield Promise.resolve().then(function () { return require("./bar"); }) }) { +- return __awaiter(this, arguments, void 0, function* ({ foo = yield Promise.resolve().then(function () { return __importStar(require("./bar")); }) }) { - }); -+async function foo({ foo = await Promise.resolve().then(() => require("./bar")) }) { ++async function foo({ foo = await Promise.resolve().then(() => __importStar(require("./bar"))) }) { } function* foo2({ foo = yield "a" }) { } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.js b/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.js index 1ceeffe70d..c639862917 100644 --- a/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.js +++ b/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.js @@ -14,9 +14,12 @@ export class A extends Foo { } //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.A = void 0; -const foo_1 = require("foo"); +const foo_1 = __importDefault(require("foo")); class A extends foo_1.default { } exports.A = A; diff --git a/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.js.diff b/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.js.diff index d056bffce9..85b1eff8c0 100644 --- a/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.js.diff +++ b/testdata/baselines/reference/submodule/compiler/extendsUntypedModule.js.diff @@ -1,11 +1,11 @@ --- old.extendsUntypedModule.js +++ new.extendsUntypedModule.js -@@= skipped -15, +15 lines =@@ - "use strict"; +@@= skipped -18, +18 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.A = void 0; --var foo_1 = require("foo"); -+const foo_1 = require("foo"); +-var foo_1 = __importDefault(require("foo")); ++const foo_1 = __importDefault(require("foo")); class A extends foo_1.default { } exports.A = A; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/externalModuleImmutableBindings.js b/testdata/baselines/reference/submodule/compiler/externalModuleImmutableBindings.js index 9271281edd..c74588f758 100644 --- a/testdata/baselines/reference/submodule/compiler/externalModuleImmutableBindings.js +++ b/testdata/baselines/reference/submodule/compiler/externalModuleImmutableBindings.js @@ -57,9 +57,42 @@ exports.x = void 0; exports.x = 1; //// [f2.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // all mutations below are illegal and should be fixed -const stuff = require("./f1"); +const stuff = __importStar(require("./f1")); var n = 'baz'; stuff.x = 0; stuff['x'] = 1; diff --git a/testdata/baselines/reference/submodule/compiler/externalModuleImmutableBindings.js.diff b/testdata/baselines/reference/submodule/compiler/externalModuleImmutableBindings.js.diff index e2cc255977..b55faa2aa4 100644 --- a/testdata/baselines/reference/submodule/compiler/externalModuleImmutableBindings.js.diff +++ b/testdata/baselines/reference/submodule/compiler/externalModuleImmutableBindings.js.diff @@ -1,11 +1,11 @@ --- old.externalModuleImmutableBindings.js +++ new.externalModuleImmutableBindings.js -@@= skipped -58, +58 lines =@@ - "use strict"; +@@= skipped -91, +91 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); // all mutations below are illegal and should be fixed --var stuff = require("./f1"); -+const stuff = require("./f1"); +-var stuff = __importStar(require("./f1")); ++const stuff = __importStar(require("./f1")); var n = 'baz'; stuff.x = 0; stuff['x'] = 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.errors.txt b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.errors.txt new file mode 100644 index 0000000000..048144f971 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.errors.txt @@ -0,0 +1,13 @@ +fieldAndGetterWithSameName.ts(2,5): error TS2300: Duplicate identifier 'x'. +fieldAndGetterWithSameName.ts(3,7): error TS2300: Duplicate identifier 'x'. + + +==== fieldAndGetterWithSameName.ts (2 errors) ==== + export class C { + x: number; + ~ +!!! error TS2300: Duplicate identifier 'x'. + get x(): number { return 1; } + ~ +!!! error TS2300: Duplicate identifier 'x'. + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.js b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.js new file mode 100644 index 0000000000..c4b9234c84 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.js @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/fieldAndGetterWithSameName.ts] //// + +//// [fieldAndGetterWithSameName.ts] +export class C { + x: number; + get x(): number { return 1; } +} + +//// [fieldAndGetterWithSameName.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.C = void 0; +class C { + x; + get x() { return 1; } +} +exports.C = C; diff --git a/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.js.diff b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.js.diff new file mode 100644 index 0000000000..8130ff3d15 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.js.diff @@ -0,0 +1,10 @@ +--- old.fieldAndGetterWithSameName.js ++++ new.fieldAndGetterWithSameName.js +@@= skipped -10, +10 lines =@@ + Object.defineProperty(exports, "__esModule", { value: true }); + exports.C = void 0; + class C { ++ x; + get x() { return 1; } + } + exports.C = C; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.symbols b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.symbols new file mode 100644 index 0000000000..71e5070074 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.symbols @@ -0,0 +1,12 @@ +//// [tests/cases/compiler/fieldAndGetterWithSameName.ts] //// + +=== fieldAndGetterWithSameName.ts === +export class C { +>C : Symbol(C, Decl(fieldAndGetterWithSameName.ts, 0, 0)) + + x: number; +>x : Symbol(C.x, Decl(fieldAndGetterWithSameName.ts, 0, 16)) + + get x(): number { return 1; } +>x : Symbol(C.x, Decl(fieldAndGetterWithSameName.ts, 1, 14)) +} diff --git a/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.types b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.types new file mode 100644 index 0000000000..6232c8682f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/fieldAndGetterWithSameName.types @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/fieldAndGetterWithSameName.ts] //// + +=== fieldAndGetterWithSameName.ts === +export class C { +>C : C + + x: number; +>x : number + + get x(): number { return 1; } +>x : number +>1 : 1 +} diff --git a/testdata/baselines/reference/submodule/compiler/genericMemberFunction.errors.txt b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.errors.txt new file mode 100644 index 0000000000..16af297523 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.errors.txt @@ -0,0 +1,34 @@ +genericMemberFunction.ts(16,5): error TS2304: Cannot find name 'a'. +genericMemberFunction.ts(17,5): error TS2304: Cannot find name 'removedFiles'. +genericMemberFunction.ts(18,12): error TS2339: Property 'removeFile' does not exist on type 'BuildResult'. + + +==== genericMemberFunction.ts (3 errors) ==== + export class BuildError{ + public parent(): FileWithErrors { + return undefined; + } + } + export class FileWithErrors{ + public errors(): BuildError[] { + return undefined; + } + public parent(): BuildResult { + return undefined; + } + } + export class BuildResult{ + public merge(other: BuildResult): void { + a.b.c.d.e.f.g = 0; + ~ +!!! error TS2304: Cannot find name 'a'. + removedFiles.forEach((each: FileWithErrors) => { + ~~~~~~~~~~~~ +!!! error TS2304: Cannot find name 'removedFiles'. + this.removeFile(each); + ~~~~~~~~~~ +!!! error TS2339: Property 'removeFile' does not exist on type 'BuildResult'. + }); + } + } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/genericMemberFunction.js b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.js new file mode 100644 index 0000000000..121c82c788 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.js @@ -0,0 +1,48 @@ +//// [tests/cases/compiler/genericMemberFunction.ts] //// + +//// [genericMemberFunction.ts] +export class BuildError{ + public parent(): FileWithErrors { + return undefined; + } +} +export class FileWithErrors{ + public errors(): BuildError[] { + return undefined; + } + public parent(): BuildResult { + return undefined; + } +} +export class BuildResult{ + public merge(other: BuildResult): void { + a.b.c.d.e.f.g = 0; + removedFiles.forEach((each: FileWithErrors) => { + this.removeFile(each); + }); + } +} + + +//// [genericMemberFunction.js] +export class BuildError { + parent() { + return undefined; + } +} +export class FileWithErrors { + errors() { + return undefined; + } + parent() { + return undefined; + } +} +export class BuildResult { + merge(other) { + a.b.c.d.e.f.g = 0; + removedFiles.forEach((each) => { + this.removeFile(each); + }); + } +} diff --git a/testdata/baselines/reference/submodule/compiler/genericMemberFunction.symbols b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.symbols new file mode 100644 index 0000000000..8488c82bc8 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.symbols @@ -0,0 +1,97 @@ +//// [tests/cases/compiler/genericMemberFunction.ts] //// + +=== genericMemberFunction.ts === +export class BuildError{ +>BuildError : Symbol(BuildError, Decl(genericMemberFunction.ts, 0, 0)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 0, 24)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 0, 26)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 0, 29)) + + public parent(): FileWithErrors { +>parent : Symbol(BuildError.parent, Decl(genericMemberFunction.ts, 0, 33)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 1, 16)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 1, 18)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 1, 16)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 1, 31)) +>FileWithErrors : Symbol(FileWithErrors, Decl(genericMemberFunction.ts, 4, 1)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 1, 16)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 1, 18)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 1, 31)) + + return undefined; +>undefined : Symbol(undefined) + } +} +export class FileWithErrors{ +>FileWithErrors : Symbol(FileWithErrors, Decl(genericMemberFunction.ts, 4, 1)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 5, 28)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 5, 30)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 5, 33)) + + public errors(): BuildError[] { +>errors : Symbol(FileWithErrors.errors, Decl(genericMemberFunction.ts, 5, 37)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 6, 16)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 6, 18)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 6, 16)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 6, 31)) +>BuildError : Symbol(BuildError, Decl(genericMemberFunction.ts, 0, 0)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 6, 16)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 6, 18)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 6, 31)) + + return undefined; +>undefined : Symbol(undefined) + } + public parent(): BuildResult { +>parent : Symbol(FileWithErrors.parent, Decl(genericMemberFunction.ts, 8, 3)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 9, 16)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 9, 18)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 9, 16)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 9, 31)) +>BuildResult : Symbol(BuildResult, Decl(genericMemberFunction.ts, 12, 1)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 9, 16)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 9, 18)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 9, 31)) + + return undefined; +>undefined : Symbol(undefined) + } +} +export class BuildResult{ +>BuildResult : Symbol(BuildResult, Decl(genericMemberFunction.ts, 12, 1)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 13, 25)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 13, 27)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 13, 30)) + + public merge(other: BuildResult): void { +>merge : Symbol(BuildResult.merge, Decl(genericMemberFunction.ts, 13, 34)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 14, 15)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 14, 17)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 14, 15)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 14, 30)) +>other : Symbol(other, Decl(genericMemberFunction.ts, 14, 34)) +>BuildResult : Symbol(BuildResult, Decl(genericMemberFunction.ts, 12, 1)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 14, 15)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 14, 17)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 14, 30)) + + a.b.c.d.e.f.g = 0; + removedFiles.forEach((each: FileWithErrors) => { +>A : Symbol(A, Decl(genericMemberFunction.ts, 16, 26)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 16, 28)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 16, 26)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 16, 41)) +>each : Symbol(each, Decl(genericMemberFunction.ts, 16, 45)) +>FileWithErrors : Symbol(FileWithErrors, Decl(genericMemberFunction.ts, 4, 1)) +>A : Symbol(A, Decl(genericMemberFunction.ts, 16, 26)) +>B : Symbol(B, Decl(genericMemberFunction.ts, 16, 28)) +>C : Symbol(C, Decl(genericMemberFunction.ts, 16, 41)) + + this.removeFile(each); +>this : Symbol(BuildResult, Decl(genericMemberFunction.ts, 12, 1)) +>each : Symbol(each, Decl(genericMemberFunction.ts, 16, 45)) + + }); + } +} + diff --git a/testdata/baselines/reference/submodule/compiler/genericMemberFunction.types b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.types new file mode 100644 index 0000000000..a203f8ffea --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.types @@ -0,0 +1,72 @@ +//// [tests/cases/compiler/genericMemberFunction.ts] //// + +=== genericMemberFunction.ts === +export class BuildError{ +>BuildError : BuildError + + public parent(): FileWithErrors { +>parent : () => FileWithErrors + + return undefined; +>undefined : undefined + } +} +export class FileWithErrors{ +>FileWithErrors : FileWithErrors + + public errors(): BuildError[] { +>errors : () => BuildError[] + + return undefined; +>undefined : undefined + } + public parent(): BuildResult { +>parent : () => BuildResult + + return undefined; +>undefined : undefined + } +} +export class BuildResult{ +>BuildResult : BuildResult + + public merge(other: BuildResult): void { +>merge : (other: BuildResult) => void +>other : BuildResult + + a.b.c.d.e.f.g = 0; +>a.b.c.d.e.f.g = 0 : 0 +>a.b.c.d.e.f.g : any +>a.b.c.d.e.f : any +>a.b.c.d.e : any +>a.b.c.d : any +>a.b.c : any +>a.b : any +>a : any +>b : any +>c : any +>d : any +>e : any +>f : any +>g : any +>0 : 0 + + removedFiles.forEach((each: FileWithErrors) => { +>removedFiles.forEach((each: FileWithErrors) => { this.removeFile(each); }) : any +>removedFiles.forEach : any +>removedFiles : any +>forEach : any +>(each: FileWithErrors) => { this.removeFile(each); } : (each: FileWithErrors) => void +>each : FileWithErrors + + this.removeFile(each); +>this.removeFile(each) : any +>this.removeFile : any +>this : this +>removeFile : any +>each : FileWithErrors + + }); + } +} + diff --git a/testdata/baselines/reference/submodule/compiler/genericMemberFunction.types.diff b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.types.diff new file mode 100644 index 0000000000..b2abff18a4 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericMemberFunction.types.diff @@ -0,0 +1,11 @@ +--- old.genericMemberFunction.types ++++ new.genericMemberFunction.types +@@= skipped -30, +30 lines =@@ + >BuildResult : BuildResult + + public merge(other: BuildResult): void { +->merge : (other: BuildResult) => void ++>merge : (other: BuildResult) => void + >other : BuildResult + + a.b.c.d.e.f.g = 0; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.errors.txt b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.errors.txt new file mode 100644 index 0000000000..80cb5a9db8 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.errors.txt @@ -0,0 +1,14 @@ +genericReturnTypeFromGetter1.ts(5,18): error TS2314: Generic type 'A' requires 1 type argument(s). + + +==== genericReturnTypeFromGetter1.ts (1 errors) ==== + export interface A { + new (dbSet: DbSet): T; + } + export class DbSet { + _entityType: A; + ~ +!!! error TS2314: Generic type 'A' requires 1 type argument(s). + get entityType() { return this._entityType; } // used to ICE without return type annotation + } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.js b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.js new file mode 100644 index 0000000000..3be833d75c --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.js @@ -0,0 +1,21 @@ +//// [tests/cases/compiler/genericReturnTypeFromGetter1.ts] //// + +//// [genericReturnTypeFromGetter1.ts] +export interface A { + new (dbSet: DbSet): T; +} +export class DbSet { + _entityType: A; + get entityType() { return this._entityType; } // used to ICE without return type annotation +} + + +//// [genericReturnTypeFromGetter1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.DbSet = void 0; +class DbSet { + _entityType; + get entityType() { return this._entityType; } // used to ICE without return type annotation +} +exports.DbSet = DbSet; diff --git a/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.js.diff b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.js.diff new file mode 100644 index 0000000000..fed7900e73 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.js.diff @@ -0,0 +1,10 @@ +--- old.genericReturnTypeFromGetter1.js ++++ new.genericReturnTypeFromGetter1.js +@@= skipped -14, +14 lines =@@ + Object.defineProperty(exports, "__esModule", { value: true }); + exports.DbSet = void 0; + class DbSet { ++ _entityType; + get entityType() { return this._entityType; } // used to ICE without return type annotation + } + exports.DbSet = DbSet; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.symbols b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.symbols new file mode 100644 index 0000000000..3722433471 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.symbols @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/genericReturnTypeFromGetter1.ts] //// + +=== genericReturnTypeFromGetter1.ts === +export interface A { +>A : Symbol(A, Decl(genericReturnTypeFromGetter1.ts, 0, 0)) +>T : Symbol(T, Decl(genericReturnTypeFromGetter1.ts, 0, 19)) + + new (dbSet: DbSet): T; +>dbSet : Symbol(dbSet, Decl(genericReturnTypeFromGetter1.ts, 1, 8)) +>DbSet : Symbol(DbSet, Decl(genericReturnTypeFromGetter1.ts, 2, 1)) +>T : Symbol(T, Decl(genericReturnTypeFromGetter1.ts, 0, 19)) +>T : Symbol(T, Decl(genericReturnTypeFromGetter1.ts, 0, 19)) +} +export class DbSet { +>DbSet : Symbol(DbSet, Decl(genericReturnTypeFromGetter1.ts, 2, 1)) +>T : Symbol(T, Decl(genericReturnTypeFromGetter1.ts, 3, 19)) + + _entityType: A; +>_entityType : Symbol(DbSet._entityType, Decl(genericReturnTypeFromGetter1.ts, 3, 23)) +>A : Symbol(A, Decl(genericReturnTypeFromGetter1.ts, 0, 0)) + + get entityType() { return this._entityType; } // used to ICE without return type annotation +>entityType : Symbol(DbSet.entityType, Decl(genericReturnTypeFromGetter1.ts, 4, 19)) +>this._entityType : Symbol(DbSet._entityType, Decl(genericReturnTypeFromGetter1.ts, 3, 23)) +>this : Symbol(DbSet, Decl(genericReturnTypeFromGetter1.ts, 2, 1)) +>_entityType : Symbol(DbSet._entityType, Decl(genericReturnTypeFromGetter1.ts, 3, 23)) +} + diff --git a/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.types b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.types new file mode 100644 index 0000000000..c6d8904b05 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/genericReturnTypeFromGetter1.types @@ -0,0 +1,20 @@ +//// [tests/cases/compiler/genericReturnTypeFromGetter1.ts] //// + +=== genericReturnTypeFromGetter1.ts === +export interface A { + new (dbSet: DbSet): T; +>dbSet : DbSet +} +export class DbSet { +>DbSet : DbSet + + _entityType: A; +>_entityType : any + + get entityType() { return this._entityType; } // used to ICE without return type annotation +>entityType : any +>this._entityType : any +>this : this +>_entityType : any +} + diff --git a/testdata/baselines/reference/submodule/compiler/giant.errors.txt b/testdata/baselines/reference/submodule/compiler/giant.errors.txt new file mode 100644 index 0000000000..47c79a67ce --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/giant.errors.txt @@ -0,0 +1,1377 @@ +giant.ts(23,12): error TS2300: Duplicate identifier 'pgF'. +giant.ts(24,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(24,20): error TS1005: '{' expected. +giant.ts(25,12): error TS2300: Duplicate identifier 'psF'. +giant.ts(26,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(26,29): error TS1005: '{' expected. +giant.ts(27,13): error TS2300: Duplicate identifier 'rgF'. +giant.ts(28,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(28,21): error TS1005: '{' expected. +giant.ts(29,13): error TS2300: Duplicate identifier 'rsF'. +giant.ts(30,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(30,30): error TS1005: '{' expected. +giant.ts(33,12): error TS2300: Duplicate identifier 'tsF'. +giant.ts(34,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(34,29): error TS1005: '{' expected. +giant.ts(35,12): error TS2300: Duplicate identifier 'tgF'. +giant.ts(36,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(36,20): error TS1005: '{' expected. +giant.ts(62,5): error TS1021: An index signature must have a type annotation. +giant.ts(63,6): error TS1096: An index signature must have exactly one parameter. +giant.ts(76,5): error TS2386: Overload signatures must all be optional or required. +giant.ts(87,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(88,20): error TS2300: Duplicate identifier 'pgF'. +giant.ts(88,24): error TS1005: '{' expected. +giant.ts(89,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(90,20): error TS2300: Duplicate identifier 'psF'. +giant.ts(90,33): error TS1005: '{' expected. +giant.ts(91,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(92,21): error TS2300: Duplicate identifier 'rgF'. +giant.ts(92,25): error TS1005: '{' expected. +giant.ts(93,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(94,21): error TS2300: Duplicate identifier 'rsF'. +giant.ts(94,34): error TS1005: '{' expected. +giant.ts(97,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(98,20): error TS2300: Duplicate identifier 'tsF'. +giant.ts(98,33): error TS1005: '{' expected. +giant.ts(99,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(100,20): error TS2300: Duplicate identifier 'tgF'. +giant.ts(100,24): error TS1005: '{' expected. +giant.ts(126,9): error TS1021: An index signature must have a type annotation. +giant.ts(127,10): error TS1096: An index signature must have exactly one parameter. +giant.ts(140,9): error TS2386: Overload signatures must all be optional or required. +giant.ts(154,39): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(166,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(167,20): error TS2300: Duplicate identifier 'pgF'. +giant.ts(167,24): error TS1005: '{' expected. +giant.ts(168,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(169,20): error TS2300: Duplicate identifier 'psF'. +giant.ts(169,33): error TS1005: '{' expected. +giant.ts(170,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(171,21): error TS2300: Duplicate identifier 'rgF'. +giant.ts(171,25): error TS1005: '{' expected. +giant.ts(172,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(173,21): error TS2300: Duplicate identifier 'rsF'. +giant.ts(173,34): error TS1005: '{' expected. +giant.ts(176,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(177,20): error TS2300: Duplicate identifier 'tsF'. +giant.ts(177,33): error TS1005: '{' expected. +giant.ts(178,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(179,20): error TS2300: Duplicate identifier 'tgF'. +giant.ts(179,24): error TS1005: '{' expected. +giant.ts(205,9): error TS1021: An index signature must have a type annotation. +giant.ts(206,10): error TS1096: An index signature must have exactly one parameter. +giant.ts(219,9): error TS2386: Overload signatures must all be optional or required. +giant.ts(233,39): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(238,35): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(240,24): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(243,21): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(244,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(245,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(245,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(246,20): error TS2300: Duplicate identifier 'pgF'. +giant.ts(247,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(247,31): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(248,20): error TS2300: Duplicate identifier 'psF'. +giant.ts(249,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(249,23): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(250,21): error TS2300: Duplicate identifier 'rgF'. +giant.ts(251,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(251,32): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(252,21): error TS2300: Duplicate identifier 'rsF'. +giant.ts(254,21): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(255,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(255,31): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(256,20): error TS2300: Duplicate identifier 'tsF'. +giant.ts(257,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(257,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(258,20): error TS2300: Duplicate identifier 'tgF'. +giant.ts(262,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(262,25): error TS1036: Statements are not allowed in ambient contexts. +giant.ts(267,30): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(281,12): error TS2300: Duplicate identifier 'pgF'. +giant.ts(282,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(282,20): error TS1005: '{' expected. +giant.ts(283,12): error TS2300: Duplicate identifier 'psF'. +giant.ts(284,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(284,29): error TS1005: '{' expected. +giant.ts(285,13): error TS2300: Duplicate identifier 'rgF'. +giant.ts(286,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(286,21): error TS1005: '{' expected. +giant.ts(287,13): error TS2300: Duplicate identifier 'rsF'. +giant.ts(288,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(288,30): error TS1005: '{' expected. +giant.ts(291,12): error TS2300: Duplicate identifier 'tsF'. +giant.ts(292,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(292,29): error TS1005: '{' expected. +giant.ts(293,12): error TS2300: Duplicate identifier 'tgF'. +giant.ts(294,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(294,20): error TS1005: '{' expected. +giant.ts(320,5): error TS1021: An index signature must have a type annotation. +giant.ts(321,6): error TS1096: An index signature must have exactly one parameter. +giant.ts(334,5): error TS2386: Overload signatures must all be optional or required. +giant.ts(345,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(346,20): error TS2300: Duplicate identifier 'pgF'. +giant.ts(346,24): error TS1005: '{' expected. +giant.ts(347,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(348,20): error TS2300: Duplicate identifier 'psF'. +giant.ts(348,33): error TS1005: '{' expected. +giant.ts(349,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(350,21): error TS2300: Duplicate identifier 'rgF'. +giant.ts(350,25): error TS1005: '{' expected. +giant.ts(351,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(352,21): error TS2300: Duplicate identifier 'rsF'. +giant.ts(352,34): error TS1005: '{' expected. +giant.ts(355,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(356,20): error TS2300: Duplicate identifier 'tsF'. +giant.ts(356,33): error TS1005: '{' expected. +giant.ts(357,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(358,20): error TS2300: Duplicate identifier 'tgF'. +giant.ts(358,24): error TS1005: '{' expected. +giant.ts(384,9): error TS1021: An index signature must have a type annotation. +giant.ts(385,10): error TS1096: An index signature must have exactly one parameter. +giant.ts(398,9): error TS2386: Overload signatures must all be optional or required. +giant.ts(412,39): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(424,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(425,20): error TS2300: Duplicate identifier 'pgF'. +giant.ts(425,24): error TS1005: '{' expected. +giant.ts(426,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(427,20): error TS2300: Duplicate identifier 'psF'. +giant.ts(427,33): error TS1005: '{' expected. +giant.ts(428,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(429,21): error TS2300: Duplicate identifier 'rgF'. +giant.ts(429,25): error TS1005: '{' expected. +giant.ts(430,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(431,21): error TS2300: Duplicate identifier 'rsF'. +giant.ts(431,34): error TS1005: '{' expected. +giant.ts(434,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(435,20): error TS2300: Duplicate identifier 'tsF'. +giant.ts(435,33): error TS1005: '{' expected. +giant.ts(436,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(437,20): error TS2300: Duplicate identifier 'tgF'. +giant.ts(437,24): error TS1005: '{' expected. +giant.ts(463,9): error TS1021: An index signature must have a type annotation. +giant.ts(464,10): error TS1096: An index signature must have exactly one parameter. +giant.ts(477,9): error TS2386: Overload signatures must all be optional or required. +giant.ts(491,39): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(496,35): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(498,24): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(501,21): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(502,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(503,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(503,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(504,20): error TS2300: Duplicate identifier 'pgF'. +giant.ts(505,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(505,31): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(506,20): error TS2300: Duplicate identifier 'psF'. +giant.ts(507,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(507,23): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(508,21): error TS2300: Duplicate identifier 'rgF'. +giant.ts(509,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(509,32): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(510,21): error TS2300: Duplicate identifier 'rsF'. +giant.ts(512,21): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(513,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(513,31): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(514,20): error TS2300: Duplicate identifier 'tsF'. +giant.ts(515,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(515,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(516,20): error TS2300: Duplicate identifier 'tgF'. +giant.ts(520,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(520,25): error TS1036: Statements are not allowed in ambient contexts. +giant.ts(525,30): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(532,31): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(534,20): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(537,17): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(538,18): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(539,12): error TS2300: Duplicate identifier 'pgF'. +giant.ts(539,18): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(540,16): error TS2300: Duplicate identifier 'pgF'. +giant.ts(541,12): error TS2300: Duplicate identifier 'psF'. +giant.ts(541,27): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(542,16): error TS2300: Duplicate identifier 'psF'. +giant.ts(543,13): error TS2300: Duplicate identifier 'rgF'. +giant.ts(543,19): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(544,17): error TS2300: Duplicate identifier 'rgF'. +giant.ts(545,13): error TS2300: Duplicate identifier 'rsF'. +giant.ts(545,28): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(546,17): error TS2300: Duplicate identifier 'rsF'. +giant.ts(548,17): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(549,12): error TS2300: Duplicate identifier 'tsF'. +giant.ts(549,27): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(550,16): error TS2300: Duplicate identifier 'tsF'. +giant.ts(551,12): error TS2300: Duplicate identifier 'tgF'. +giant.ts(551,18): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(552,16): error TS2300: Duplicate identifier 'tgF'. +giant.ts(556,18): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(556,21): error TS1036: Statements are not allowed in ambient contexts. +giant.ts(558,24): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(561,21): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(563,21): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(588,9): error TS1021: An index signature must have a type annotation. +giant.ts(589,10): error TS1096: An index signature must have exactly one parameter. +giant.ts(602,9): error TS2386: Overload signatures must all be optional or required. +giant.ts(606,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(606,25): error TS1036: Statements are not allowed in ambient contexts. +giant.ts(611,30): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(615,16): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +giant.ts(616,16): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +giant.ts(616,39): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(617,16): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +giant.ts(618,16): error TS1038: A 'declare' modifier cannot be used in an already ambient context. +giant.ts(621,26): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(623,24): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(626,21): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(628,21): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(654,9): error TS1021: An index signature must have a type annotation. +giant.ts(655,10): error TS1096: An index signature must have exactly one parameter. +giant.ts(668,9): error TS2386: Overload signatures must all be optional or required. +giant.ts(672,22): error TS1183: An implementation cannot be declared in ambient contexts. +giant.ts(672,25): error TS1036: Statements are not allowed in ambient contexts. +giant.ts(676,30): error TS1183: An implementation cannot be declared in ambient contexts. + + +==== giant.ts (231 errors) ==== + /* + Prefixes + p -> public + r -> private + i -> import + e -> export + a -> ambient + t -> static + s -> set + g -> get + + MAX DEPTH 3 LEVELS + */ + const p = "propName"; + var V; + function F() { }; + class C { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1005: '{' expected. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1005: '{' expected. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1005: '{' expected. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1005: '{' expected. + static tV; + static tF() { } + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1005: '{' expected. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1005: '{' expected. + } + interface I { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + ~~~~~~~~~~~~~ +!!! error TS1021: An index signature must have a type annotation. + [p2: string, p3: number]; + ~~ +!!! error TS1096: An index signature must have exactly one parameter. + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + ~~ +!!! error TS2386: Overload signatures must all be optional or required. + } + module M { + var V; + function F() { }; + class C { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1005: '{' expected. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1005: '{' expected. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1005: '{' expected. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1005: '{' expected. + static tV; + static tF() { } + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1005: '{' expected. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1005: '{' expected. + } + interface I { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + ~~~~~~~~~~~~~ +!!! error TS1021: An index signature must have a type annotation. + [p2: string, p3: number]; + ~~ +!!! error TS1096: An index signature must have exactly one parameter. + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + ~~ +!!! error TS2386: Overload signatures must all be optional or required. + } + module M { + var V; + function F() { }; + class C { }; + interface I { }; + module M { }; + export var eV; + export function eF() { }; + export class eC { }; + export interface eI { }; + export module eM { }; + export declare var eaV; + export declare function eaF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export declare class eaC { }; + export declare module eaM { }; + } + export var eV; + export function eF() { }; + export class eC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1005: '{' expected. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1005: '{' expected. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1005: '{' expected. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1005: '{' expected. + static tV; + static tF() { } + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1005: '{' expected. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1005: '{' expected. + } + export interface eI { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + ~~~~~~~~~~~~~ +!!! error TS1021: An index signature must have a type annotation. + [p2: string, p3: number]; + ~~ +!!! error TS1096: An index signature must have exactly one parameter. + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + ~~ +!!! error TS2386: Overload signatures must all be optional or required. + } + export module eM { + var V; + function F() { }; + class C { }; + interface I { }; + module M { }; + export var eV; + export function eF() { }; + export class eC { }; + export interface eI { }; + export module eM { }; + export declare var eaV; + export declare function eaF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export declare class eaC { }; + export declare module eaM { }; + } + export declare var eaV; + export declare function eaF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export declare class eaC { + constructor () { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public pV; + private rV; + public pF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private rF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + static tV; + static tF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + } + export declare module eaM { + var V; + function F() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + ~ +!!! error TS1036: Statements are not allowed in ambient contexts. + class C { } + interface I { } + module M { } + export var eV; + export function eF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export class eC { } + export interface eI { } + export module eM { } + } + } + export var eV; + export function eF() { }; + export class eC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1005: '{' expected. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1005: '{' expected. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1005: '{' expected. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1005: '{' expected. + static tV; + static tF() { } + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1005: '{' expected. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1005: '{' expected. + } + export interface eI { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + ~~~~~~~~~~~~~ +!!! error TS1021: An index signature must have a type annotation. + [p2: string, p3: number]; + ~~ +!!! error TS1096: An index signature must have exactly one parameter. + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + ~~ +!!! error TS2386: Overload signatures must all be optional or required. + } + export module eM { + var V; + function F() { }; + class C { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1005: '{' expected. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1005: '{' expected. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1005: '{' expected. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1005: '{' expected. + static tV; + static tF() { } + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1005: '{' expected. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1005: '{' expected. + } + interface I { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + ~~~~~~~~~~~~~ +!!! error TS1021: An index signature must have a type annotation. + [p2: string, p3: number]; + ~~ +!!! error TS1096: An index signature must have exactly one parameter. + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + ~~ +!!! error TS2386: Overload signatures must all be optional or required. + } + module M { + var V; + function F() { }; + class C { }; + interface I { }; + module M { }; + export var eV; + export function eF() { }; + export class eC { }; + export interface eI { }; + export module eM { }; + export declare var eaV; + export declare function eaF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export declare class eaC { }; + export declare module eaM { }; + } + export var eV; + export function eF() { }; + export class eC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1005: '{' expected. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1005: '{' expected. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1005: '{' expected. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1005: '{' expected. + static tV; + static tF() { } + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1005: '{' expected. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1005: '{' expected. + } + export interface eI { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + ~~~~~~~~~~~~~ +!!! error TS1021: An index signature must have a type annotation. + [p2: string, p3: number]; + ~~ +!!! error TS1096: An index signature must have exactly one parameter. + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + ~~ +!!! error TS2386: Overload signatures must all be optional or required. + } + export module eM { + var V; + function F() { }; + class C { }; + interface I { }; + module M { }; + export var eV; + export function eF() { }; + export class eC { }; + export interface eI { }; + export module eM { }; + export declare var eaV; + export declare function eaF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export declare class eaC { }; + export declare module eaM { }; + } + export declare var eaV; + export declare function eaF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export declare class eaC { + constructor () { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public pV; + private rV; + public pF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private rF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + static tV; + static tF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + } + export declare module eaM { + var V; + function F() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + ~ +!!! error TS1036: Statements are not allowed in ambient contexts. + class C { } + interface I { } + module M { } + export var eV; + export function eF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export class eC { } + export interface eI { } + export module eM { } + } + } + export declare var eaV; + export declare function eaF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export declare class eaC { + constructor () { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public pV; + private rV; + public pF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private rF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public pgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public get pgF() + ~~~ +!!! error TS2300: Duplicate identifier 'pgF'. + public psF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public set psF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'psF'. + private rgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private get rgF() + ~~~ +!!! error TS2300: Duplicate identifier 'rgF'. + private rsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + private set rsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'rsF'. + static tV; + static tF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static tsF(param:any) { } + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static set tsF(param:any) + ~~~ +!!! error TS2300: Duplicate identifier 'tsF'. + static tgF() { } + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static get tgF() + ~~~ +!!! error TS2300: Duplicate identifier 'tgF'. + } + export declare module eaM { + var V; + function F() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + ~ +!!! error TS1036: Statements are not allowed in ambient contexts. + class C { + constructor () { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public pV; + private rV; + public pF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static tV; + static tF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + } + interface I { + //Call Signature + (); + (): number; + (p: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + ~~~~~~~~~~~~~ +!!! error TS1021: An index signature must have a type annotation. + [p2: string, p3: number]; + ~~ +!!! error TS1096: An index signature must have exactly one parameter. + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + ~~ +!!! error TS2386: Overload signatures must all be optional or required. + } + module M { + var V; + function F() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + ~ +!!! error TS1036: Statements are not allowed in ambient contexts. + class C { } + interface I { } + module M { } + export var eV; + export function eF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export class eC { } + export interface eI { } + export module eM { } + export declare var eaV + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + export declare function eaF() { }; + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export declare class eaC { } + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + export declare module eaM { } + ~~~~~~~ +!!! error TS1038: A 'declare' modifier cannot be used in an already ambient context. + } + export var eV; + export function eF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export class eC { + constructor () { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + public pV; + private rV; + public pF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + static tV + static tF() { } + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + } + export interface eI { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + ~~~~~~~~~~~~~ +!!! error TS1021: An index signature must have a type annotation. + [p2: string, p3: number]; + ~~ +!!! error TS1096: An index signature must have exactly one parameter. + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + ~~ +!!! error TS2386: Overload signatures must all be optional or required. + } + export module eM { + var V; + function F() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + ~ +!!! error TS1036: Statements are not allowed in ambient contexts. + class C { } + module M { } + export var eV; + export function eF() { }; + ~ +!!! error TS1183: An implementation cannot be declared in ambient contexts. + export class eC { } + export interface eI { } + export module eM { } + } + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/giant.js b/testdata/baselines/reference/submodule/compiler/giant.js new file mode 100644 index 0000000000..2965b76c07 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/giant.js @@ -0,0 +1,1216 @@ +//// [tests/cases/compiler/giant.ts] //// + +//// [giant.ts] +/* + Prefixes + p -> public + r -> private + i -> import + e -> export + a -> ambient + t -> static + s -> set + g -> get + + MAX DEPTH 3 LEVELS +*/ +const p = "propName"; +var V; +function F() { }; +class C { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() +} +interface I { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + [p2: string, p3: number]; + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; +} +module M { + var V; + function F() { }; + class C { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() + } + interface I { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + [p2: string, p3: number]; + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + } + module M { + var V; + function F() { }; + class C { }; + interface I { }; + module M { }; + export var eV; + export function eF() { }; + export class eC { }; + export interface eI { }; + export module eM { }; + export declare var eaV; + export declare function eaF() { }; + export declare class eaC { }; + export declare module eaM { }; + } + export var eV; + export function eF() { }; + export class eC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() + } + export interface eI { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + [p2: string, p3: number]; + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + } + export module eM { + var V; + function F() { }; + class C { }; + interface I { }; + module M { }; + export var eV; + export function eF() { }; + export class eC { }; + export interface eI { }; + export module eM { }; + export declare var eaV; + export declare function eaF() { }; + export declare class eaC { }; + export declare module eaM { }; + } + export declare var eaV; + export declare function eaF() { }; + export declare class eaC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() + } + export declare module eaM { + var V; + function F() { }; + class C { } + interface I { } + module M { } + export var eV; + export function eF() { }; + export class eC { } + export interface eI { } + export module eM { } + } +} +export var eV; +export function eF() { }; +export class eC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() +} +export interface eI { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + [p2: string, p3: number]; + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; +} +export module eM { + var V; + function F() { }; + class C { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() + } + interface I { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + [p2: string, p3: number]; + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + } + module M { + var V; + function F() { }; + class C { }; + interface I { }; + module M { }; + export var eV; + export function eF() { }; + export class eC { }; + export interface eI { }; + export module eM { }; + export declare var eaV; + export declare function eaF() { }; + export declare class eaC { }; + export declare module eaM { }; + } + export var eV; + export function eF() { }; + export class eC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() + } + export interface eI { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + [p2: string, p3: number]; + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + } + export module eM { + var V; + function F() { }; + class C { }; + interface I { }; + module M { }; + export var eV; + export function eF() { }; + export class eC { }; + export interface eI { }; + export module eM { }; + export declare var eaV; + export declare function eaF() { }; + export declare class eaC { }; + export declare module eaM { }; + } + export declare var eaV; + export declare function eaF() { }; + export declare class eaC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() + } + export declare module eaM { + var V; + function F() { }; + class C { } + interface I { } + module M { } + export var eV; + export function eF() { }; + export class eC { } + export interface eI { } + export module eM { } + } +} +export declare var eaV; +export declare function eaF() { }; +export declare class eaC { + constructor () { } + public pV; + private rV; + public pF() { } + private rF() { } + public pgF() { } + public get pgF() + public psF(param:any) { } + public set psF(param:any) + private rgF() { } + private get rgF() + private rsF(param:any) { } + private set rsF(param:any) + static tV; + static tF() { } + static tsF(param:any) { } + static set tsF(param:any) + static tgF() { } + static get tgF() +} +export declare module eaM { + var V; + function F() { }; + class C { + constructor () { } + public pV; + private rV; + public pF() { } + static tV; + static tF() { } + } + interface I { + //Call Signature + (); + (): number; + (p: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + [p2: string, p3: number]; + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + } + module M { + var V; + function F() { }; + class C { } + interface I { } + module M { } + export var eV; + export function eF() { }; + export class eC { } + export interface eI { } + export module eM { } + export declare var eaV + export declare function eaF() { }; + export declare class eaC { } + export declare module eaM { } + } + export var eV; + export function eF() { }; + export class eC { + constructor () { } + public pV; + private rV; + public pF() { } + static tV + static tF() { } + } + export interface eI { + //Call Signature + (); + (): number; + (p); + (p1: string); + (p2?: string); + (...p3: any[]); + (p4: string, p5?: string); + (p6: string, ...p7: any[]); + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); + new (p2?: string); + new (...p3: any[]); + new (p4: string, p5?: string); + new (p6: string, ...p7: any[]); + + //Index Signature + [p]; + [p1: string]; + [p2: string, p3: number]; + + //Property Signature + p; + p1?; + p2?: string; + + //Function Signature + p3(); + p4? (); + p5? (): void; + p6(pa1): void; + p7(pa1, pa2): void; + p7? (pa1, pa2): void; + } + export module eM { + var V; + function F() { }; + class C { } + module M { } + export var eV; + export function eF() { }; + export class eC { } + export interface eI { } + export module eM { } + } +} + +//// [giant.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.eM = exports.eC = exports.eV = void 0; +exports.eF = eF; +/* + Prefixes + p -> public + r -> private + i -> import + e -> export + a -> ambient + t -> static + s -> set + g -> get + + MAX DEPTH 3 LEVELS +*/ +const p = "propName"; +var V; +function F() { } +; +class C { + constructor() { } + pV; + rV; + pF() { } + rF() { } + pgF() { } + psF(param) { } + rgF() { } + rsF(param) { } + static tV; + static tF() { } + static tsF(param) { } + static tgF() { } +} +var M; +(function (M_1) { + var V; + function F() { } + ; + class C { + constructor() { } + pV; + rV; + pF() { } + rF() { } + pgF() { } + psF(param) { } + rgF() { } + rsF(param) { } + static tV; + static tF() { } + static tsF(param) { } + static tgF() { } + } + let M; + (function (M) { + var V; + function F() { } + ; + class C { + } + ; + ; + ; + function eF() { } + M.eF = eF; + ; + class eC { + } + M.eC = eC; + ; + ; + ; + ; + ; + ; + })(M || (M = {})); + function eF() { } + M_1.eF = eF; + ; + class eC { + constructor() { } + pV; + rV; + pF() { } + rF() { } + pgF() { } + psF(param) { } + rgF() { } + rsF(param) { } + static tV; + static tF() { } + static tsF(param) { } + static tgF() { } + } + M_1.eC = eC; + let eM; + (function (eM) { + var V; + function F() { } + ; + class C { + } + ; + ; + ; + function eF() { } + eM.eF = eF; + ; + class eC { + } + eM.eC = eC; + ; + ; + ; + ; + ; + ; + })(eM = M_1.eM || (M_1.eM = {})); + ; +})(M || (M = {})); +function eF() { } +; +class eC { + constructor() { } + pV; + rV; + pF() { } + rF() { } + pgF() { } + psF(param) { } + rgF() { } + rsF(param) { } + static tV; + static tF() { } + static tsF(param) { } + static tgF() { } +} +exports.eC = eC; +var eM; +(function (eM_1) { + var V; + function F() { } + ; + class C { + constructor() { } + pV; + rV; + pF() { } + rF() { } + pgF() { } + psF(param) { } + rgF() { } + rsF(param) { } + static tV; + static tF() { } + static tsF(param) { } + static tgF() { } + } + let M; + (function (M) { + var V; + function F() { } + ; + class C { + } + ; + ; + ; + function eF() { } + M.eF = eF; + ; + class eC { + } + M.eC = eC; + ; + ; + ; + ; + ; + ; + })(M || (M = {})); + function eF() { } + eM_1.eF = eF; + ; + class eC { + constructor() { } + pV; + rV; + pF() { } + rF() { } + pgF() { } + psF(param) { } + rgF() { } + rsF(param) { } + static tV; + static tF() { } + static tsF(param) { } + static tgF() { } + } + eM_1.eC = eC; + let eM; + (function (eM) { + var V; + function F() { } + ; + class C { + } + ; + ; + ; + function eF() { } + eM.eF = eF; + ; + class eC { + } + eM.eC = eC; + ; + ; + ; + ; + ; + ; + })(eM = eM_1.eM || (eM_1.eM = {})); + ; +})(eM || (exports.eM = eM = {})); +; + + +//// [giant.d.ts] +declare const p = "propName"; +export declare var eV: any; +export declare function eF(): void; +export declare class eC { + constructor(); + pV: any; + private rV; + pF(): void; + private rF; + pgF(): void; + get pgF(): any; + psF(param: any): void; + set psF(param: any); + private rgF; + private get rgF(); + private rsF; + private set rsF(value); + static tV: any; + static tF(): void; + static tsF(param: any): void; + static set tsF(param: any); + static tgF(): void; + static get tgF(): any; +} +export interface eI { + (): any; + (): number; + (p: any): any; + (p1: string): any; + (p2?: string): any; + (...p3: any[]): any; + (p4: string, p5?: string): any; + (p6: string, ...p7: any[]): any; + new (): any; + new (): number; + new (p: string): any; + new (p2?: string): any; + new (...p3: any[]): any; + new (p4: string, p5?: string): any; + new (p6: string, ...p7: any[]): any; + [p]: any; + [p1: string]: any; + [p2: string, p3: number]: any; + p: any; + p1?: any; + p2?: string; + p3(): any; + p4?(): any; + p5?(): void; + p6(pa1: any): void; + p7(pa1: any, pa2: any): void; + p7?(pa1: any, pa2: any): void; +} +export declare namespace eM { + var eV: any; + function eF(): void; + class eC { + constructor(); + pV: any; + private rV; + pF(): void; + private rF; + pgF(): void; + get pgF(): any; + psF(param: any): void; + set psF(param: any); + private rgF; + private get rgF(); + private rsF; + private set rsF(value); + static tV: any; + static tF(): void; + static tsF(param: any): void; + static set tsF(param: any); + static tgF(): void; + static get tgF(): any; + } + interface eI { + (): any; + (): number; + (p: any): any; + (p1: string): any; + (p2?: string): any; + (...p3: any[]): any; + (p4: string, p5?: string): any; + (p6: string, ...p7: any[]): any; + new (): any; + new (): number; + new (p: string): any; + new (p2?: string): any; + new (...p3: any[]): any; + new (p4: string, p5?: string): any; + new (p6: string, ...p7: any[]): any; + [p]: any; + [p1: string]: any; + [p2: string, p3: number]: any; + p: any; + p1?: any; + p2?: string; + p3(): any; + p4?(): any; + p5?(): void; + p6(pa1: any): void; + p7(pa1: any, pa2: any): void; + p7?(pa1: any, pa2: any): void; + } + namespace eM { + var eV: any; + function eF(): void; + class eC { + } + interface eI { + } + namespace eM { } + var eaV: any; + function eaF(): void; + class eaC { + } + namespace eaM { } + } + var eaV: any; + function eaF(): void; + class eaC { + constructor(); + pV: any; + private rV; + pF(): void; + private rF; + pgF(): void; + get pgF(): any; + psF(param: any): void; + set psF(param: any); + private rgF; + private get rgF(); + private rsF; + private set rsF(value); + static tV: any; + static tF(): void; + static tsF(param: any): void; + static set tsF(param: any); + static tgF(): void; + static get tgF(): any; + } + namespace eaM { + var V: any; + function F(): void; + class C { + } + interface I { + } + namespace M { } + var eV: any; + function eF(): void; + class eC { + } + interface eI { + } + namespace eM { } + } +} +export declare var eaV: any; +export declare function eaF(): void; +export declare class eaC { + constructor(); + pV: any; + private rV; + pF(): void; + private rF; + pgF(): void; + get pgF(): any; + psF(param: any): void; + set psF(param: any); + private rgF; + private get rgF(); + private rsF; + private set rsF(value); + static tV: any; + static tF(): void; + static tsF(param: any): void; + static set tsF(param: any); + static tgF(): void; + static get tgF(): any; +} +export declare namespace eaM { + var V: any; + function F(): void; + class C { + constructor(); + pV: any; + private rV; + pF(): void; + static tV: any; + static tF(): void; + } + interface I { + (): any; + (): number; + (p: string): any; + (p2?: string): any; + (...p3: any[]): any; + (p4: string, p5?: string): any; + (p6: string, ...p7: any[]): any; + new (): any; + new (): number; + new (p: string): any; + new (p2?: string): any; + new (...p3: any[]): any; + new (p4: string, p5?: string): any; + new (p6: string, ...p7: any[]): any; + [p]: any; + [p1: string]: any; + [p2: string, p3: number]: any; + p: any; + p1?: any; + p2?: string; + p3(): any; + p4?(): any; + p5?(): void; + p6(pa1: any): void; + p7(pa1: any, pa2: any): void; + p7?(pa1: any, pa2: any): void; + } + namespace M { + var V: any; + function F(): void; + class C { + } + interface I { + } + namespace M { } + var eV: any; + function eF(): void; + class eC { + } + interface eI { + } + namespace eM { } + var eaV: any; + function eaF(): void; + class eaC { + } + namespace eaM { } + } + var eV: any; + function eF(): void; + class eC { + constructor(); + pV: any; + private rV; + pF(): void; + static tV: any; + static tF(): void; + } + interface eI { + (): any; + (): number; + (p: any): any; + (p1: string): any; + (p2?: string): any; + (...p3: any[]): any; + (p4: string, p5?: string): any; + (p6: string, ...p7: any[]): any; + new (): any; + new (): number; + new (p: string): any; + new (p2?: string): any; + new (...p3: any[]): any; + new (p4: string, p5?: string): any; + new (p6: string, ...p7: any[]): any; + [p]: any; + [p1: string]: any; + [p2: string, p3: number]: any; + p: any; + p1?: any; + p2?: string; + p3(): any; + p4?(): any; + p5?(): void; + p6(pa1: any): void; + p7(pa1: any, pa2: any): void; + p7?(pa1: any, pa2: any): void; + } + namespace eM { + var V: any; + function F(): void; + class C { + } + namespace M { } + var eV: any; + function eF(): void; + class eC { + } + interface eI { + } + namespace eM { } + } +} +export {}; diff --git a/testdata/baselines/reference/submodule/compiler/giant.js.diff b/testdata/baselines/reference/submodule/compiler/giant.js.diff new file mode 100644 index 0000000000..60f469762b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/giant.js.diff @@ -0,0 +1,152 @@ +--- old.giant.js ++++ new.giant.js +@@= skipped -706, +706 lines =@@ + ; + class C { + constructor() { } ++ pV; ++ rV; + pF() { } + rF() { } + pgF() { } +- get pgF() { } + psF(param) { } +- set psF(param) { } + rgF() { } +- get rgF() { } + rsF(param) { } +- set rsF(param) { } ++ static tV; + static tF() { } + static tsF(param) { } +- static set tsF(param) { } + static tgF() { } +- static get tgF() { } + } + var M; + (function (M_1) { +@@= skipped -23, +20 lines =@@ + ; + class C { + constructor() { } ++ pV; ++ rV; + pF() { } + rF() { } + pgF() { } +- get pgF() { } + psF(param) { } +- set psF(param) { } + rgF() { } +- get rgF() { } + rsF(param) { } +- set rsF(param) { } ++ static tV; + static tF() { } + static tsF(param) { } +- static set tsF(param) { } + static tgF() { } +- static get tgF() { } + } + let M; + (function (M) { +@@= skipped -44, +41 lines =@@ + ; + class eC { + constructor() { } ++ pV; ++ rV; + pF() { } + rF() { } + pgF() { } +- get pgF() { } + psF(param) { } +- set psF(param) { } + rgF() { } +- get rgF() { } + rsF(param) { } +- set rsF(param) { } ++ static tV; + static tF() { } + static tsF(param) { } +- static set tsF(param) { } + static tgF() { } +- static get tgF() { } + } + M_1.eC = eC; + let eM; +@@= skipped -46, +43 lines =@@ + ; + class eC { + constructor() { } ++ pV; ++ rV; + pF() { } + rF() { } + pgF() { } +- get pgF() { } + psF(param) { } +- set psF(param) { } + rgF() { } +- get rgF() { } + rsF(param) { } +- set rsF(param) { } ++ static tV; + static tF() { } + static tsF(param) { } +- static set tsF(param) { } + static tgF() { } +- static get tgF() { } + } + exports.eC = eC; + var eM; +@@= skipped -24, +21 lines =@@ + ; + class C { + constructor() { } ++ pV; ++ rV; + pF() { } + rF() { } + pgF() { } +- get pgF() { } + psF(param) { } +- set psF(param) { } + rgF() { } +- get rgF() { } + rsF(param) { } +- set rsF(param) { } ++ static tV; + static tF() { } + static tsF(param) { } +- static set tsF(param) { } + static tgF() { } +- static get tgF() { } + } + let M; + (function (M) { +@@= skipped -44, +41 lines =@@ + ; + class eC { + constructor() { } ++ pV; ++ rV; + pF() { } + rF() { } + pgF() { } +- get pgF() { } + psF(param) { } +- set psF(param) { } + rgF() { } +- get rgF() { } + rsF(param) { } +- set rsF(param) { } ++ static tV; + static tF() { } + static tsF(param) { } +- static set tsF(param) { } + static tgF() { } +- static get tgF() { } + } + eM_1.eC = eC; + let eM; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/giant.symbols b/testdata/baselines/reference/submodule/compiler/giant.symbols new file mode 100644 index 0000000000..0c7d9c2b21 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/giant.symbols @@ -0,0 +1,1789 @@ +//// [tests/cases/compiler/giant.ts] //// + +=== giant.ts === +/* + Prefixes + p -> public + r -> private + i -> import + e -> export + a -> ambient + t -> static + s -> set + g -> get + + MAX DEPTH 3 LEVELS +*/ +const p = "propName"; +>p : Symbol(p, Decl(giant.ts, 13, 5)) + +var V; +>V : Symbol(V, Decl(giant.ts, 14, 3)) + +function F() { }; +>F : Symbol(F, Decl(giant.ts, 14, 6)) + +class C { +>C : Symbol(C, Decl(giant.ts, 15, 17)) + + constructor () { } + public pV; +>pV : Symbol(C.pV, Decl(giant.ts, 17, 22)) + + private rV; +>rV : Symbol(C.rV, Decl(giant.ts, 18, 14)) + + public pF() { } +>pF : Symbol(C.pF, Decl(giant.ts, 19, 15)) + + private rF() { } +>rF : Symbol(C.rF, Decl(giant.ts, 20, 19)) + + public pgF() { } +>pgF : Symbol(C.pgF, Decl(giant.ts, 21, 20)) + + public get pgF() +>pgF : Symbol(C.pgF, Decl(giant.ts, 22, 20)) + + public psF(param:any) { } +>psF : Symbol(C.psF, Decl(giant.ts, 23, 20)) +>param : Symbol(param, Decl(giant.ts, 24, 15)) + + public set psF(param:any) +>psF : Symbol(C.psF, Decl(giant.ts, 24, 29)) +>param : Symbol(param, Decl(giant.ts, 25, 19)) + + private rgF() { } +>rgF : Symbol(C.rgF, Decl(giant.ts, 25, 29)) + + private get rgF() +>rgF : Symbol(C.rgF, Decl(giant.ts, 26, 21)) + + private rsF(param:any) { } +>rsF : Symbol(C.rsF, Decl(giant.ts, 27, 21)) +>param : Symbol(param, Decl(giant.ts, 28, 16)) + + private set rsF(param:any) +>rsF : Symbol(C.rsF, Decl(giant.ts, 28, 30)) +>param : Symbol(param, Decl(giant.ts, 29, 20)) + + static tV; +>tV : Symbol(C.tV, Decl(giant.ts, 29, 30)) + + static tF() { } +>tF : Symbol(C.tF, Decl(giant.ts, 30, 14)) + + static tsF(param:any) { } +>tsF : Symbol(C.tsF, Decl(giant.ts, 31, 19)) +>param : Symbol(param, Decl(giant.ts, 32, 15)) + + static set tsF(param:any) +>tsF : Symbol(C.tsF, Decl(giant.ts, 32, 29)) +>param : Symbol(param, Decl(giant.ts, 33, 19)) + + static tgF() { } +>tgF : Symbol(C.tgF, Decl(giant.ts, 33, 29)) + + static get tgF() +>tgF : Symbol(C.tgF, Decl(giant.ts, 34, 20)) +} +interface I { +>I : Symbol(I, Decl(giant.ts, 36, 1)) + + //Call Signature + (); + (): number; + (p); +>p : Symbol(p, Decl(giant.ts, 41, 5)) + + (p1: string); +>p1 : Symbol(p1, Decl(giant.ts, 42, 5)) + + (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 43, 5)) + + (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 44, 5)) + + (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 45, 5)) +>p5 : Symbol(p5, Decl(giant.ts, 45, 16)) + + (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 46, 5)) +>p7 : Symbol(p7, Decl(giant.ts, 46, 16)) + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : Symbol(p, Decl(giant.ts, 53, 9)) + + new (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 54, 9)) + + new (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 55, 9)) + + new (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 56, 9)) +>p5 : Symbol(p5, Decl(giant.ts, 56, 20)) + + new (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 57, 9)) +>p7 : Symbol(p7, Decl(giant.ts, 57, 20)) + + //Index Signature + [p]; +>[p] : Symbol(I[p], Decl(giant.ts, 57, 35)) +>p : Symbol(p, Decl(giant.ts, 13, 5)) + + [p1: string]; +>p1 : Symbol(p1, Decl(giant.ts, 61, 5)) + + [p2: string, p3: number]; +>p2 : Symbol(p2, Decl(giant.ts, 62, 5)) +>p3 : Symbol(p3, Decl(giant.ts, 62, 16)) + + //Property Signature + p; +>p : Symbol(I.p, Decl(giant.ts, 62, 29)) + + p1?; +>p1 : Symbol(I.p1, Decl(giant.ts, 65, 6)) + + p2?: string; +>p2 : Symbol(I.p2, Decl(giant.ts, 66, 8)) + + //Function Signature + p3(); +>p3 : Symbol(I.p3, Decl(giant.ts, 67, 16)) + + p4? (); +>p4 : Symbol(I.p4, Decl(giant.ts, 70, 9)) + + p5? (): void; +>p5 : Symbol(I.p5, Decl(giant.ts, 71, 11)) + + p6(pa1): void; +>p6 : Symbol(I.p6, Decl(giant.ts, 72, 17)) +>pa1 : Symbol(pa1, Decl(giant.ts, 73, 7)) + + p7(pa1, pa2): void; +>p7 : Symbol(I.p7, Decl(giant.ts, 73, 18), Decl(giant.ts, 74, 23)) +>pa1 : Symbol(pa1, Decl(giant.ts, 74, 7)) +>pa2 : Symbol(pa2, Decl(giant.ts, 74, 11)) + + p7? (pa1, pa2): void; +>p7 : Symbol(I.p7, Decl(giant.ts, 73, 18), Decl(giant.ts, 74, 23)) +>pa1 : Symbol(pa1, Decl(giant.ts, 75, 9)) +>pa2 : Symbol(pa2, Decl(giant.ts, 75, 13)) +} +module M { +>M : Symbol(M, Decl(giant.ts, 76, 1)) + + var V; +>V : Symbol(V, Decl(giant.ts, 78, 7)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 78, 10)) + + class C { +>C : Symbol(C, Decl(giant.ts, 79, 21)) + + constructor () { } + public pV; +>pV : Symbol(C.pV, Decl(giant.ts, 81, 26)) + + private rV; +>rV : Symbol(C.rV, Decl(giant.ts, 82, 18)) + + public pF() { } +>pF : Symbol(C.pF, Decl(giant.ts, 83, 19)) + + private rF() { } +>rF : Symbol(C.rF, Decl(giant.ts, 84, 23)) + + public pgF() { } +>pgF : Symbol(C.pgF, Decl(giant.ts, 85, 24)) + + public get pgF() +>pgF : Symbol(C.pgF, Decl(giant.ts, 86, 24)) + + public psF(param:any) { } +>psF : Symbol(C.psF, Decl(giant.ts, 87, 24)) +>param : Symbol(param, Decl(giant.ts, 88, 19)) + + public set psF(param:any) +>psF : Symbol(C.psF, Decl(giant.ts, 88, 33)) +>param : Symbol(param, Decl(giant.ts, 89, 23)) + + private rgF() { } +>rgF : Symbol(C.rgF, Decl(giant.ts, 89, 33)) + + private get rgF() +>rgF : Symbol(C.rgF, Decl(giant.ts, 90, 25)) + + private rsF(param:any) { } +>rsF : Symbol(C.rsF, Decl(giant.ts, 91, 25)) +>param : Symbol(param, Decl(giant.ts, 92, 20)) + + private set rsF(param:any) +>rsF : Symbol(C.rsF, Decl(giant.ts, 92, 34)) +>param : Symbol(param, Decl(giant.ts, 93, 24)) + + static tV; +>tV : Symbol(C.tV, Decl(giant.ts, 93, 34)) + + static tF() { } +>tF : Symbol(C.tF, Decl(giant.ts, 94, 18)) + + static tsF(param:any) { } +>tsF : Symbol(C.tsF, Decl(giant.ts, 95, 23)) +>param : Symbol(param, Decl(giant.ts, 96, 19)) + + static set tsF(param:any) +>tsF : Symbol(C.tsF, Decl(giant.ts, 96, 33)) +>param : Symbol(param, Decl(giant.ts, 97, 23)) + + static tgF() { } +>tgF : Symbol(C.tgF, Decl(giant.ts, 97, 33)) + + static get tgF() +>tgF : Symbol(C.tgF, Decl(giant.ts, 98, 24)) + } + interface I { +>I : Symbol(I, Decl(giant.ts, 100, 5)) + + //Call Signature + (); + (): number; + (p); +>p : Symbol(p, Decl(giant.ts, 105, 9)) + + (p1: string); +>p1 : Symbol(p1, Decl(giant.ts, 106, 9)) + + (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 107, 9)) + + (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 108, 9)) + + (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 109, 9)) +>p5 : Symbol(p5, Decl(giant.ts, 109, 20)) + + (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 110, 9)) +>p7 : Symbol(p7, Decl(giant.ts, 110, 20)) + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : Symbol(p, Decl(giant.ts, 117, 13)) + + new (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 118, 13)) + + new (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 119, 13)) + + new (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 120, 13)) +>p5 : Symbol(p5, Decl(giant.ts, 120, 24)) + + new (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 121, 13)) +>p7 : Symbol(p7, Decl(giant.ts, 121, 24)) + + //Index Signature + [p]; +>[p] : Symbol(I[p], Decl(giant.ts, 121, 39)) +>p : Symbol(p, Decl(giant.ts, 13, 5)) + + [p1: string]; +>p1 : Symbol(p1, Decl(giant.ts, 125, 9)) + + [p2: string, p3: number]; +>p2 : Symbol(p2, Decl(giant.ts, 126, 9)) +>p3 : Symbol(p3, Decl(giant.ts, 126, 20)) + + //Property Signature + p; +>p : Symbol(I.p, Decl(giant.ts, 126, 33)) + + p1?; +>p1 : Symbol(I.p1, Decl(giant.ts, 129, 10)) + + p2?: string; +>p2 : Symbol(I.p2, Decl(giant.ts, 130, 12)) + + //Function Signature + p3(); +>p3 : Symbol(I.p3, Decl(giant.ts, 131, 20)) + + p4? (); +>p4 : Symbol(I.p4, Decl(giant.ts, 134, 13)) + + p5? (): void; +>p5 : Symbol(I.p5, Decl(giant.ts, 135, 15)) + + p6(pa1): void; +>p6 : Symbol(I.p6, Decl(giant.ts, 136, 21)) +>pa1 : Symbol(pa1, Decl(giant.ts, 137, 11)) + + p7(pa1, pa2): void; +>p7 : Symbol(I.p7, Decl(giant.ts, 137, 22), Decl(giant.ts, 138, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 138, 11)) +>pa2 : Symbol(pa2, Decl(giant.ts, 138, 15)) + + p7? (pa1, pa2): void; +>p7 : Symbol(I.p7, Decl(giant.ts, 137, 22), Decl(giant.ts, 138, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 139, 13)) +>pa2 : Symbol(pa2, Decl(giant.ts, 139, 17)) + } + module M { +>M : Symbol(M, Decl(giant.ts, 140, 5)) + + var V; +>V : Symbol(V, Decl(giant.ts, 142, 11)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 142, 14)) + + class C { }; +>C : Symbol(C, Decl(giant.ts, 143, 25)) + + interface I { }; +>I : Symbol(I, Decl(giant.ts, 144, 20)) + + module M { }; +>M : Symbol(M, Decl(giant.ts, 145, 24)) + + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 147, 18)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 147, 22)) + + export class eC { }; +>eC : Symbol(eC, Decl(giant.ts, 148, 33)) + + export interface eI { }; +>eI : Symbol(eI, Decl(giant.ts, 149, 28)) + + export module eM { }; +>eM : Symbol(eM, Decl(giant.ts, 150, 32)) + + export declare var eaV; +>eaV : Symbol(eaV, Decl(giant.ts, 152, 26)) + + export declare function eaF() { }; +>eaF : Symbol(eaF, Decl(giant.ts, 152, 31)) + + export declare class eaC { }; +>eaC : Symbol(eaC, Decl(giant.ts, 153, 42)) + + export declare module eaM { }; +>eaM : Symbol(eaM, Decl(giant.ts, 154, 37)) + } + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 157, 14)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 157, 18)) + + export class eC { +>eC : Symbol(eC, Decl(giant.ts, 158, 29)) + + constructor () { } + public pV; +>pV : Symbol(eC.pV, Decl(giant.ts, 160, 26)) + + private rV; +>rV : Symbol(eC.rV, Decl(giant.ts, 161, 18)) + + public pF() { } +>pF : Symbol(eC.pF, Decl(giant.ts, 162, 19)) + + private rF() { } +>rF : Symbol(eC.rF, Decl(giant.ts, 163, 23)) + + public pgF() { } +>pgF : Symbol(eC.pgF, Decl(giant.ts, 164, 24)) + + public get pgF() +>pgF : Symbol(eC.pgF, Decl(giant.ts, 165, 24)) + + public psF(param:any) { } +>psF : Symbol(eC.psF, Decl(giant.ts, 166, 24)) +>param : Symbol(param, Decl(giant.ts, 167, 19)) + + public set psF(param:any) +>psF : Symbol(eC.psF, Decl(giant.ts, 167, 33)) +>param : Symbol(param, Decl(giant.ts, 168, 23)) + + private rgF() { } +>rgF : Symbol(eC.rgF, Decl(giant.ts, 168, 33)) + + private get rgF() +>rgF : Symbol(eC.rgF, Decl(giant.ts, 169, 25)) + + private rsF(param:any) { } +>rsF : Symbol(eC.rsF, Decl(giant.ts, 170, 25)) +>param : Symbol(param, Decl(giant.ts, 171, 20)) + + private set rsF(param:any) +>rsF : Symbol(eC.rsF, Decl(giant.ts, 171, 34)) +>param : Symbol(param, Decl(giant.ts, 172, 24)) + + static tV; +>tV : Symbol(eC.tV, Decl(giant.ts, 172, 34)) + + static tF() { } +>tF : Symbol(eC.tF, Decl(giant.ts, 173, 18)) + + static tsF(param:any) { } +>tsF : Symbol(eC.tsF, Decl(giant.ts, 174, 23)) +>param : Symbol(param, Decl(giant.ts, 175, 19)) + + static set tsF(param:any) +>tsF : Symbol(eC.tsF, Decl(giant.ts, 175, 33)) +>param : Symbol(param, Decl(giant.ts, 176, 23)) + + static tgF() { } +>tgF : Symbol(eC.tgF, Decl(giant.ts, 176, 33)) + + static get tgF() +>tgF : Symbol(eC.tgF, Decl(giant.ts, 177, 24)) + } + export interface eI { +>eI : Symbol(eI, Decl(giant.ts, 179, 5)) + + //Call Signature + (); + (): number; + (p); +>p : Symbol(p, Decl(giant.ts, 184, 9)) + + (p1: string); +>p1 : Symbol(p1, Decl(giant.ts, 185, 9)) + + (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 186, 9)) + + (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 187, 9)) + + (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 188, 9)) +>p5 : Symbol(p5, Decl(giant.ts, 188, 20)) + + (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 189, 9)) +>p7 : Symbol(p7, Decl(giant.ts, 189, 20)) + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : Symbol(p, Decl(giant.ts, 196, 13)) + + new (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 197, 13)) + + new (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 198, 13)) + + new (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 199, 13)) +>p5 : Symbol(p5, Decl(giant.ts, 199, 24)) + + new (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 200, 13)) +>p7 : Symbol(p7, Decl(giant.ts, 200, 24)) + + //Index Signature + [p]; +>[p] : Symbol(eI[p], Decl(giant.ts, 200, 39)) +>p : Symbol(p, Decl(giant.ts, 13, 5)) + + [p1: string]; +>p1 : Symbol(p1, Decl(giant.ts, 204, 9)) + + [p2: string, p3: number]; +>p2 : Symbol(p2, Decl(giant.ts, 205, 9)) +>p3 : Symbol(p3, Decl(giant.ts, 205, 20)) + + //Property Signature + p; +>p : Symbol(eI.p, Decl(giant.ts, 205, 33)) + + p1?; +>p1 : Symbol(eI.p1, Decl(giant.ts, 208, 10)) + + p2?: string; +>p2 : Symbol(eI.p2, Decl(giant.ts, 209, 12)) + + //Function Signature + p3(); +>p3 : Symbol(eI.p3, Decl(giant.ts, 210, 20)) + + p4? (); +>p4 : Symbol(eI.p4, Decl(giant.ts, 213, 13)) + + p5? (): void; +>p5 : Symbol(eI.p5, Decl(giant.ts, 214, 15)) + + p6(pa1): void; +>p6 : Symbol(eI.p6, Decl(giant.ts, 215, 21)) +>pa1 : Symbol(pa1, Decl(giant.ts, 216, 11)) + + p7(pa1, pa2): void; +>p7 : Symbol(eI.p7, Decl(giant.ts, 216, 22), Decl(giant.ts, 217, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 217, 11)) +>pa2 : Symbol(pa2, Decl(giant.ts, 217, 15)) + + p7? (pa1, pa2): void; +>p7 : Symbol(eI.p7, Decl(giant.ts, 216, 22), Decl(giant.ts, 217, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 218, 13)) +>pa2 : Symbol(pa2, Decl(giant.ts, 218, 17)) + } + export module eM { +>eM : Symbol(eM, Decl(giant.ts, 219, 5)) + + var V; +>V : Symbol(V, Decl(giant.ts, 221, 11)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 221, 14)) + + class C { }; +>C : Symbol(C, Decl(giant.ts, 222, 25)) + + interface I { }; +>I : Symbol(I, Decl(giant.ts, 223, 20)) + + module M { }; +>M : Symbol(M, Decl(giant.ts, 224, 24)) + + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 226, 18)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 226, 22)) + + export class eC { }; +>eC : Symbol(eC, Decl(giant.ts, 227, 33)) + + export interface eI { }; +>eI : Symbol(eI, Decl(giant.ts, 228, 28)) + + export module eM { }; +>eM : Symbol(eM, Decl(giant.ts, 229, 32)) + + export declare var eaV; +>eaV : Symbol(eaV, Decl(giant.ts, 231, 26)) + + export declare function eaF() { }; +>eaF : Symbol(eaF, Decl(giant.ts, 231, 31)) + + export declare class eaC { }; +>eaC : Symbol(eaC, Decl(giant.ts, 232, 42)) + + export declare module eaM { }; +>eaM : Symbol(eaM, Decl(giant.ts, 233, 37)) + } + export declare var eaV; +>eaV : Symbol(eaV, Decl(giant.ts, 236, 22)) + + export declare function eaF() { }; +>eaF : Symbol(eaF, Decl(giant.ts, 236, 27)) + + export declare class eaC { +>eaC : Symbol(eaC, Decl(giant.ts, 237, 38)) + + constructor () { } + public pV; +>pV : Symbol(eaC.pV, Decl(giant.ts, 239, 26)) + + private rV; +>rV : Symbol(eaC.rV, Decl(giant.ts, 240, 18)) + + public pF() { } +>pF : Symbol(eaC.pF, Decl(giant.ts, 241, 19)) + + private rF() { } +>rF : Symbol(eaC.rF, Decl(giant.ts, 242, 23)) + + public pgF() { } +>pgF : Symbol(eaC.pgF, Decl(giant.ts, 243, 24)) + + public get pgF() +>pgF : Symbol(eaC.pgF, Decl(giant.ts, 244, 24)) + + public psF(param:any) { } +>psF : Symbol(eaC.psF, Decl(giant.ts, 245, 24)) +>param : Symbol(param, Decl(giant.ts, 246, 19)) + + public set psF(param:any) +>psF : Symbol(eaC.psF, Decl(giant.ts, 246, 33)) +>param : Symbol(param, Decl(giant.ts, 247, 23)) + + private rgF() { } +>rgF : Symbol(eaC.rgF, Decl(giant.ts, 247, 33)) + + private get rgF() +>rgF : Symbol(eaC.rgF, Decl(giant.ts, 248, 25)) + + private rsF(param:any) { } +>rsF : Symbol(eaC.rsF, Decl(giant.ts, 249, 25)) +>param : Symbol(param, Decl(giant.ts, 250, 20)) + + private set rsF(param:any) +>rsF : Symbol(eaC.rsF, Decl(giant.ts, 250, 34)) +>param : Symbol(param, Decl(giant.ts, 251, 24)) + + static tV; +>tV : Symbol(eaC.tV, Decl(giant.ts, 251, 34)) + + static tF() { } +>tF : Symbol(eaC.tF, Decl(giant.ts, 252, 18)) + + static tsF(param:any) { } +>tsF : Symbol(eaC.tsF, Decl(giant.ts, 253, 23)) +>param : Symbol(param, Decl(giant.ts, 254, 19)) + + static set tsF(param:any) +>tsF : Symbol(eaC.tsF, Decl(giant.ts, 254, 33)) +>param : Symbol(param, Decl(giant.ts, 255, 23)) + + static tgF() { } +>tgF : Symbol(eaC.tgF, Decl(giant.ts, 255, 33)) + + static get tgF() +>tgF : Symbol(eaC.tgF, Decl(giant.ts, 256, 24)) + } + export declare module eaM { +>eaM : Symbol(eaM, Decl(giant.ts, 258, 5)) + + var V; +>V : Symbol(V, Decl(giant.ts, 260, 11)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 260, 14)) + + class C { } +>C : Symbol(C, Decl(giant.ts, 261, 25)) + + interface I { } +>I : Symbol(I, Decl(giant.ts, 262, 19)) + + module M { } +>M : Symbol(M, Decl(giant.ts, 263, 23)) + + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 265, 18)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 265, 22)) + + export class eC { } +>eC : Symbol(eC, Decl(giant.ts, 266, 33)) + + export interface eI { } +>eI : Symbol(eI, Decl(giant.ts, 267, 27)) + + export module eM { } +>eM : Symbol(eM, Decl(giant.ts, 268, 31)) + } +} +export var eV; +>eV : Symbol(eV, Decl(giant.ts, 272, 10)) + +export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 272, 14)) + +export class eC { +>eC : Symbol(eC, Decl(giant.ts, 273, 25)) + + constructor () { } + public pV; +>pV : Symbol(eC.pV, Decl(giant.ts, 275, 22)) + + private rV; +>rV : Symbol(eC.rV, Decl(giant.ts, 276, 14)) + + public pF() { } +>pF : Symbol(eC.pF, Decl(giant.ts, 277, 15)) + + private rF() { } +>rF : Symbol(eC.rF, Decl(giant.ts, 278, 19)) + + public pgF() { } +>pgF : Symbol(eC.pgF, Decl(giant.ts, 279, 20)) + + public get pgF() +>pgF : Symbol(eC.pgF, Decl(giant.ts, 280, 20)) + + public psF(param:any) { } +>psF : Symbol(eC.psF, Decl(giant.ts, 281, 20)) +>param : Symbol(param, Decl(giant.ts, 282, 15)) + + public set psF(param:any) +>psF : Symbol(eC.psF, Decl(giant.ts, 282, 29)) +>param : Symbol(param, Decl(giant.ts, 283, 19)) + + private rgF() { } +>rgF : Symbol(eC.rgF, Decl(giant.ts, 283, 29)) + + private get rgF() +>rgF : Symbol(eC.rgF, Decl(giant.ts, 284, 21)) + + private rsF(param:any) { } +>rsF : Symbol(eC.rsF, Decl(giant.ts, 285, 21)) +>param : Symbol(param, Decl(giant.ts, 286, 16)) + + private set rsF(param:any) +>rsF : Symbol(eC.rsF, Decl(giant.ts, 286, 30)) +>param : Symbol(param, Decl(giant.ts, 287, 20)) + + static tV; +>tV : Symbol(eC.tV, Decl(giant.ts, 287, 30)) + + static tF() { } +>tF : Symbol(eC.tF, Decl(giant.ts, 288, 14)) + + static tsF(param:any) { } +>tsF : Symbol(eC.tsF, Decl(giant.ts, 289, 19)) +>param : Symbol(param, Decl(giant.ts, 290, 15)) + + static set tsF(param:any) +>tsF : Symbol(eC.tsF, Decl(giant.ts, 290, 29)) +>param : Symbol(param, Decl(giant.ts, 291, 19)) + + static tgF() { } +>tgF : Symbol(eC.tgF, Decl(giant.ts, 291, 29)) + + static get tgF() +>tgF : Symbol(eC.tgF, Decl(giant.ts, 292, 20)) +} +export interface eI { +>eI : Symbol(eI, Decl(giant.ts, 294, 1)) + + //Call Signature + (); + (): number; + (p); +>p : Symbol(p, Decl(giant.ts, 299, 5)) + + (p1: string); +>p1 : Symbol(p1, Decl(giant.ts, 300, 5)) + + (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 301, 5)) + + (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 302, 5)) + + (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 303, 5)) +>p5 : Symbol(p5, Decl(giant.ts, 303, 16)) + + (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 304, 5)) +>p7 : Symbol(p7, Decl(giant.ts, 304, 16)) + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : Symbol(p, Decl(giant.ts, 311, 9)) + + new (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 312, 9)) + + new (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 313, 9)) + + new (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 314, 9)) +>p5 : Symbol(p5, Decl(giant.ts, 314, 20)) + + new (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 315, 9)) +>p7 : Symbol(p7, Decl(giant.ts, 315, 20)) + + //Index Signature + [p]; +>[p] : Symbol(eI[p], Decl(giant.ts, 315, 35)) +>p : Symbol(p, Decl(giant.ts, 13, 5)) + + [p1: string]; +>p1 : Symbol(p1, Decl(giant.ts, 319, 5)) + + [p2: string, p3: number]; +>p2 : Symbol(p2, Decl(giant.ts, 320, 5)) +>p3 : Symbol(p3, Decl(giant.ts, 320, 16)) + + //Property Signature + p; +>p : Symbol(eI.p, Decl(giant.ts, 320, 29)) + + p1?; +>p1 : Symbol(eI.p1, Decl(giant.ts, 323, 6)) + + p2?: string; +>p2 : Symbol(eI.p2, Decl(giant.ts, 324, 8)) + + //Function Signature + p3(); +>p3 : Symbol(eI.p3, Decl(giant.ts, 325, 16)) + + p4? (); +>p4 : Symbol(eI.p4, Decl(giant.ts, 328, 9)) + + p5? (): void; +>p5 : Symbol(eI.p5, Decl(giant.ts, 329, 11)) + + p6(pa1): void; +>p6 : Symbol(eI.p6, Decl(giant.ts, 330, 17)) +>pa1 : Symbol(pa1, Decl(giant.ts, 331, 7)) + + p7(pa1, pa2): void; +>p7 : Symbol(eI.p7, Decl(giant.ts, 331, 18), Decl(giant.ts, 332, 23)) +>pa1 : Symbol(pa1, Decl(giant.ts, 332, 7)) +>pa2 : Symbol(pa2, Decl(giant.ts, 332, 11)) + + p7? (pa1, pa2): void; +>p7 : Symbol(eI.p7, Decl(giant.ts, 331, 18), Decl(giant.ts, 332, 23)) +>pa1 : Symbol(pa1, Decl(giant.ts, 333, 9)) +>pa2 : Symbol(pa2, Decl(giant.ts, 333, 13)) +} +export module eM { +>eM : Symbol(eM, Decl(giant.ts, 334, 1)) + + var V; +>V : Symbol(V, Decl(giant.ts, 336, 7)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 336, 10)) + + class C { +>C : Symbol(C, Decl(giant.ts, 337, 21)) + + constructor () { } + public pV; +>pV : Symbol(C.pV, Decl(giant.ts, 339, 26)) + + private rV; +>rV : Symbol(C.rV, Decl(giant.ts, 340, 18)) + + public pF() { } +>pF : Symbol(C.pF, Decl(giant.ts, 341, 19)) + + private rF() { } +>rF : Symbol(C.rF, Decl(giant.ts, 342, 23)) + + public pgF() { } +>pgF : Symbol(C.pgF, Decl(giant.ts, 343, 24)) + + public get pgF() +>pgF : Symbol(C.pgF, Decl(giant.ts, 344, 24)) + + public psF(param:any) { } +>psF : Symbol(C.psF, Decl(giant.ts, 345, 24)) +>param : Symbol(param, Decl(giant.ts, 346, 19)) + + public set psF(param:any) +>psF : Symbol(C.psF, Decl(giant.ts, 346, 33)) +>param : Symbol(param, Decl(giant.ts, 347, 23)) + + private rgF() { } +>rgF : Symbol(C.rgF, Decl(giant.ts, 347, 33)) + + private get rgF() +>rgF : Symbol(C.rgF, Decl(giant.ts, 348, 25)) + + private rsF(param:any) { } +>rsF : Symbol(C.rsF, Decl(giant.ts, 349, 25)) +>param : Symbol(param, Decl(giant.ts, 350, 20)) + + private set rsF(param:any) +>rsF : Symbol(C.rsF, Decl(giant.ts, 350, 34)) +>param : Symbol(param, Decl(giant.ts, 351, 24)) + + static tV; +>tV : Symbol(C.tV, Decl(giant.ts, 351, 34)) + + static tF() { } +>tF : Symbol(C.tF, Decl(giant.ts, 352, 18)) + + static tsF(param:any) { } +>tsF : Symbol(C.tsF, Decl(giant.ts, 353, 23)) +>param : Symbol(param, Decl(giant.ts, 354, 19)) + + static set tsF(param:any) +>tsF : Symbol(C.tsF, Decl(giant.ts, 354, 33)) +>param : Symbol(param, Decl(giant.ts, 355, 23)) + + static tgF() { } +>tgF : Symbol(C.tgF, Decl(giant.ts, 355, 33)) + + static get tgF() +>tgF : Symbol(C.tgF, Decl(giant.ts, 356, 24)) + } + interface I { +>I : Symbol(I, Decl(giant.ts, 358, 5)) + + //Call Signature + (); + (): number; + (p); +>p : Symbol(p, Decl(giant.ts, 363, 9)) + + (p1: string); +>p1 : Symbol(p1, Decl(giant.ts, 364, 9)) + + (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 365, 9)) + + (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 366, 9)) + + (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 367, 9)) +>p5 : Symbol(p5, Decl(giant.ts, 367, 20)) + + (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 368, 9)) +>p7 : Symbol(p7, Decl(giant.ts, 368, 20)) + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : Symbol(p, Decl(giant.ts, 375, 13)) + + new (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 376, 13)) + + new (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 377, 13)) + + new (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 378, 13)) +>p5 : Symbol(p5, Decl(giant.ts, 378, 24)) + + new (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 379, 13)) +>p7 : Symbol(p7, Decl(giant.ts, 379, 24)) + + //Index Signature + [p]; +>[p] : Symbol(I[p], Decl(giant.ts, 379, 39)) +>p : Symbol(p, Decl(giant.ts, 13, 5)) + + [p1: string]; +>p1 : Symbol(p1, Decl(giant.ts, 383, 9)) + + [p2: string, p3: number]; +>p2 : Symbol(p2, Decl(giant.ts, 384, 9)) +>p3 : Symbol(p3, Decl(giant.ts, 384, 20)) + + //Property Signature + p; +>p : Symbol(I.p, Decl(giant.ts, 384, 33)) + + p1?; +>p1 : Symbol(I.p1, Decl(giant.ts, 387, 10)) + + p2?: string; +>p2 : Symbol(I.p2, Decl(giant.ts, 388, 12)) + + //Function Signature + p3(); +>p3 : Symbol(I.p3, Decl(giant.ts, 389, 20)) + + p4? (); +>p4 : Symbol(I.p4, Decl(giant.ts, 392, 13)) + + p5? (): void; +>p5 : Symbol(I.p5, Decl(giant.ts, 393, 15)) + + p6(pa1): void; +>p6 : Symbol(I.p6, Decl(giant.ts, 394, 21)) +>pa1 : Symbol(pa1, Decl(giant.ts, 395, 11)) + + p7(pa1, pa2): void; +>p7 : Symbol(I.p7, Decl(giant.ts, 395, 22), Decl(giant.ts, 396, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 396, 11)) +>pa2 : Symbol(pa2, Decl(giant.ts, 396, 15)) + + p7? (pa1, pa2): void; +>p7 : Symbol(I.p7, Decl(giant.ts, 395, 22), Decl(giant.ts, 396, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 397, 13)) +>pa2 : Symbol(pa2, Decl(giant.ts, 397, 17)) + } + module M { +>M : Symbol(M, Decl(giant.ts, 398, 5)) + + var V; +>V : Symbol(V, Decl(giant.ts, 400, 11)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 400, 14)) + + class C { }; +>C : Symbol(C, Decl(giant.ts, 401, 25)) + + interface I { }; +>I : Symbol(I, Decl(giant.ts, 402, 20)) + + module M { }; +>M : Symbol(M, Decl(giant.ts, 403, 24)) + + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 405, 18)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 405, 22)) + + export class eC { }; +>eC : Symbol(eC, Decl(giant.ts, 406, 33)) + + export interface eI { }; +>eI : Symbol(eI, Decl(giant.ts, 407, 28)) + + export module eM { }; +>eM : Symbol(eM, Decl(giant.ts, 408, 32)) + + export declare var eaV; +>eaV : Symbol(eaV, Decl(giant.ts, 410, 26)) + + export declare function eaF() { }; +>eaF : Symbol(eaF, Decl(giant.ts, 410, 31)) + + export declare class eaC { }; +>eaC : Symbol(eaC, Decl(giant.ts, 411, 42)) + + export declare module eaM { }; +>eaM : Symbol(eaM, Decl(giant.ts, 412, 37)) + } + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 415, 14)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 415, 18)) + + export class eC { +>eC : Symbol(eC, Decl(giant.ts, 416, 29)) + + constructor () { } + public pV; +>pV : Symbol(eC.pV, Decl(giant.ts, 418, 26)) + + private rV; +>rV : Symbol(eC.rV, Decl(giant.ts, 419, 18)) + + public pF() { } +>pF : Symbol(eC.pF, Decl(giant.ts, 420, 19)) + + private rF() { } +>rF : Symbol(eC.rF, Decl(giant.ts, 421, 23)) + + public pgF() { } +>pgF : Symbol(eC.pgF, Decl(giant.ts, 422, 24)) + + public get pgF() +>pgF : Symbol(eC.pgF, Decl(giant.ts, 423, 24)) + + public psF(param:any) { } +>psF : Symbol(eC.psF, Decl(giant.ts, 424, 24)) +>param : Symbol(param, Decl(giant.ts, 425, 19)) + + public set psF(param:any) +>psF : Symbol(eC.psF, Decl(giant.ts, 425, 33)) +>param : Symbol(param, Decl(giant.ts, 426, 23)) + + private rgF() { } +>rgF : Symbol(eC.rgF, Decl(giant.ts, 426, 33)) + + private get rgF() +>rgF : Symbol(eC.rgF, Decl(giant.ts, 427, 25)) + + private rsF(param:any) { } +>rsF : Symbol(eC.rsF, Decl(giant.ts, 428, 25)) +>param : Symbol(param, Decl(giant.ts, 429, 20)) + + private set rsF(param:any) +>rsF : Symbol(eC.rsF, Decl(giant.ts, 429, 34)) +>param : Symbol(param, Decl(giant.ts, 430, 24)) + + static tV; +>tV : Symbol(eC.tV, Decl(giant.ts, 430, 34)) + + static tF() { } +>tF : Symbol(eC.tF, Decl(giant.ts, 431, 18)) + + static tsF(param:any) { } +>tsF : Symbol(eC.tsF, Decl(giant.ts, 432, 23)) +>param : Symbol(param, Decl(giant.ts, 433, 19)) + + static set tsF(param:any) +>tsF : Symbol(eC.tsF, Decl(giant.ts, 433, 33)) +>param : Symbol(param, Decl(giant.ts, 434, 23)) + + static tgF() { } +>tgF : Symbol(eC.tgF, Decl(giant.ts, 434, 33)) + + static get tgF() +>tgF : Symbol(eC.tgF, Decl(giant.ts, 435, 24)) + } + export interface eI { +>eI : Symbol(eI, Decl(giant.ts, 437, 5)) + + //Call Signature + (); + (): number; + (p); +>p : Symbol(p, Decl(giant.ts, 442, 9)) + + (p1: string); +>p1 : Symbol(p1, Decl(giant.ts, 443, 9)) + + (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 444, 9)) + + (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 445, 9)) + + (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 446, 9)) +>p5 : Symbol(p5, Decl(giant.ts, 446, 20)) + + (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 447, 9)) +>p7 : Symbol(p7, Decl(giant.ts, 447, 20)) + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : Symbol(p, Decl(giant.ts, 454, 13)) + + new (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 455, 13)) + + new (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 456, 13)) + + new (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 457, 13)) +>p5 : Symbol(p5, Decl(giant.ts, 457, 24)) + + new (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 458, 13)) +>p7 : Symbol(p7, Decl(giant.ts, 458, 24)) + + //Index Signature + [p]; +>[p] : Symbol(eI[p], Decl(giant.ts, 458, 39)) +>p : Symbol(p, Decl(giant.ts, 13, 5)) + + [p1: string]; +>p1 : Symbol(p1, Decl(giant.ts, 462, 9)) + + [p2: string, p3: number]; +>p2 : Symbol(p2, Decl(giant.ts, 463, 9)) +>p3 : Symbol(p3, Decl(giant.ts, 463, 20)) + + //Property Signature + p; +>p : Symbol(eI.p, Decl(giant.ts, 463, 33)) + + p1?; +>p1 : Symbol(eI.p1, Decl(giant.ts, 466, 10)) + + p2?: string; +>p2 : Symbol(eI.p2, Decl(giant.ts, 467, 12)) + + //Function Signature + p3(); +>p3 : Symbol(eI.p3, Decl(giant.ts, 468, 20)) + + p4? (); +>p4 : Symbol(eI.p4, Decl(giant.ts, 471, 13)) + + p5? (): void; +>p5 : Symbol(eI.p5, Decl(giant.ts, 472, 15)) + + p6(pa1): void; +>p6 : Symbol(eI.p6, Decl(giant.ts, 473, 21)) +>pa1 : Symbol(pa1, Decl(giant.ts, 474, 11)) + + p7(pa1, pa2): void; +>p7 : Symbol(eI.p7, Decl(giant.ts, 474, 22), Decl(giant.ts, 475, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 475, 11)) +>pa2 : Symbol(pa2, Decl(giant.ts, 475, 15)) + + p7? (pa1, pa2): void; +>p7 : Symbol(eI.p7, Decl(giant.ts, 474, 22), Decl(giant.ts, 475, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 476, 13)) +>pa2 : Symbol(pa2, Decl(giant.ts, 476, 17)) + } + export module eM { +>eM : Symbol(eM, Decl(giant.ts, 477, 5)) + + var V; +>V : Symbol(V, Decl(giant.ts, 479, 11)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 479, 14)) + + class C { }; +>C : Symbol(C, Decl(giant.ts, 480, 25)) + + interface I { }; +>I : Symbol(I, Decl(giant.ts, 481, 20)) + + module M { }; +>M : Symbol(M, Decl(giant.ts, 482, 24)) + + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 484, 18)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 484, 22)) + + export class eC { }; +>eC : Symbol(eC, Decl(giant.ts, 485, 33)) + + export interface eI { }; +>eI : Symbol(eI, Decl(giant.ts, 486, 28)) + + export module eM { }; +>eM : Symbol(eM, Decl(giant.ts, 487, 32)) + + export declare var eaV; +>eaV : Symbol(eaV, Decl(giant.ts, 489, 26)) + + export declare function eaF() { }; +>eaF : Symbol(eaF, Decl(giant.ts, 489, 31)) + + export declare class eaC { }; +>eaC : Symbol(eaC, Decl(giant.ts, 490, 42)) + + export declare module eaM { }; +>eaM : Symbol(eaM, Decl(giant.ts, 491, 37)) + } + export declare var eaV; +>eaV : Symbol(eaV, Decl(giant.ts, 494, 22)) + + export declare function eaF() { }; +>eaF : Symbol(eaF, Decl(giant.ts, 494, 27)) + + export declare class eaC { +>eaC : Symbol(eaC, Decl(giant.ts, 495, 38)) + + constructor () { } + public pV; +>pV : Symbol(eaC.pV, Decl(giant.ts, 497, 26)) + + private rV; +>rV : Symbol(eaC.rV, Decl(giant.ts, 498, 18)) + + public pF() { } +>pF : Symbol(eaC.pF, Decl(giant.ts, 499, 19)) + + private rF() { } +>rF : Symbol(eaC.rF, Decl(giant.ts, 500, 23)) + + public pgF() { } +>pgF : Symbol(eaC.pgF, Decl(giant.ts, 501, 24)) + + public get pgF() +>pgF : Symbol(eaC.pgF, Decl(giant.ts, 502, 24)) + + public psF(param:any) { } +>psF : Symbol(eaC.psF, Decl(giant.ts, 503, 24)) +>param : Symbol(param, Decl(giant.ts, 504, 19)) + + public set psF(param:any) +>psF : Symbol(eaC.psF, Decl(giant.ts, 504, 33)) +>param : Symbol(param, Decl(giant.ts, 505, 23)) + + private rgF() { } +>rgF : Symbol(eaC.rgF, Decl(giant.ts, 505, 33)) + + private get rgF() +>rgF : Symbol(eaC.rgF, Decl(giant.ts, 506, 25)) + + private rsF(param:any) { } +>rsF : Symbol(eaC.rsF, Decl(giant.ts, 507, 25)) +>param : Symbol(param, Decl(giant.ts, 508, 20)) + + private set rsF(param:any) +>rsF : Symbol(eaC.rsF, Decl(giant.ts, 508, 34)) +>param : Symbol(param, Decl(giant.ts, 509, 24)) + + static tV; +>tV : Symbol(eaC.tV, Decl(giant.ts, 509, 34)) + + static tF() { } +>tF : Symbol(eaC.tF, Decl(giant.ts, 510, 18)) + + static tsF(param:any) { } +>tsF : Symbol(eaC.tsF, Decl(giant.ts, 511, 23)) +>param : Symbol(param, Decl(giant.ts, 512, 19)) + + static set tsF(param:any) +>tsF : Symbol(eaC.tsF, Decl(giant.ts, 512, 33)) +>param : Symbol(param, Decl(giant.ts, 513, 23)) + + static tgF() { } +>tgF : Symbol(eaC.tgF, Decl(giant.ts, 513, 33)) + + static get tgF() +>tgF : Symbol(eaC.tgF, Decl(giant.ts, 514, 24)) + } + export declare module eaM { +>eaM : Symbol(eaM, Decl(giant.ts, 516, 5)) + + var V; +>V : Symbol(V, Decl(giant.ts, 518, 11)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 518, 14)) + + class C { } +>C : Symbol(C, Decl(giant.ts, 519, 25)) + + interface I { } +>I : Symbol(I, Decl(giant.ts, 520, 19)) + + module M { } +>M : Symbol(M, Decl(giant.ts, 521, 23)) + + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 523, 18)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 523, 22)) + + export class eC { } +>eC : Symbol(eC, Decl(giant.ts, 524, 33)) + + export interface eI { } +>eI : Symbol(eI, Decl(giant.ts, 525, 27)) + + export module eM { } +>eM : Symbol(eM, Decl(giant.ts, 526, 31)) + } +} +export declare var eaV; +>eaV : Symbol(eaV, Decl(giant.ts, 530, 18)) + +export declare function eaF() { }; +>eaF : Symbol(eaF, Decl(giant.ts, 530, 23)) + +export declare class eaC { +>eaC : Symbol(eaC, Decl(giant.ts, 531, 34)) + + constructor () { } + public pV; +>pV : Symbol(eaC.pV, Decl(giant.ts, 533, 22)) + + private rV; +>rV : Symbol(eaC.rV, Decl(giant.ts, 534, 14)) + + public pF() { } +>pF : Symbol(eaC.pF, Decl(giant.ts, 535, 15)) + + private rF() { } +>rF : Symbol(eaC.rF, Decl(giant.ts, 536, 19)) + + public pgF() { } +>pgF : Symbol(eaC.pgF, Decl(giant.ts, 537, 20)) + + public get pgF() +>pgF : Symbol(eaC.pgF, Decl(giant.ts, 538, 20)) + + public psF(param:any) { } +>psF : Symbol(eaC.psF, Decl(giant.ts, 539, 20)) +>param : Symbol(param, Decl(giant.ts, 540, 15)) + + public set psF(param:any) +>psF : Symbol(eaC.psF, Decl(giant.ts, 540, 29)) +>param : Symbol(param, Decl(giant.ts, 541, 19)) + + private rgF() { } +>rgF : Symbol(eaC.rgF, Decl(giant.ts, 541, 29)) + + private get rgF() +>rgF : Symbol(eaC.rgF, Decl(giant.ts, 542, 21)) + + private rsF(param:any) { } +>rsF : Symbol(eaC.rsF, Decl(giant.ts, 543, 21)) +>param : Symbol(param, Decl(giant.ts, 544, 16)) + + private set rsF(param:any) +>rsF : Symbol(eaC.rsF, Decl(giant.ts, 544, 30)) +>param : Symbol(param, Decl(giant.ts, 545, 20)) + + static tV; +>tV : Symbol(eaC.tV, Decl(giant.ts, 545, 30)) + + static tF() { } +>tF : Symbol(eaC.tF, Decl(giant.ts, 546, 14)) + + static tsF(param:any) { } +>tsF : Symbol(eaC.tsF, Decl(giant.ts, 547, 19)) +>param : Symbol(param, Decl(giant.ts, 548, 15)) + + static set tsF(param:any) +>tsF : Symbol(eaC.tsF, Decl(giant.ts, 548, 29)) +>param : Symbol(param, Decl(giant.ts, 549, 19)) + + static tgF() { } +>tgF : Symbol(eaC.tgF, Decl(giant.ts, 549, 29)) + + static get tgF() +>tgF : Symbol(eaC.tgF, Decl(giant.ts, 550, 20)) +} +export declare module eaM { +>eaM : Symbol(eaM, Decl(giant.ts, 552, 1)) + + var V; +>V : Symbol(V, Decl(giant.ts, 554, 7)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 554, 10)) + + class C { +>C : Symbol(C, Decl(giant.ts, 555, 21)) + + constructor () { } + public pV; +>pV : Symbol(C.pV, Decl(giant.ts, 557, 26)) + + private rV; +>rV : Symbol(C.rV, Decl(giant.ts, 558, 18)) + + public pF() { } +>pF : Symbol(C.pF, Decl(giant.ts, 559, 19)) + + static tV; +>tV : Symbol(C.tV, Decl(giant.ts, 560, 23)) + + static tF() { } +>tF : Symbol(C.tF, Decl(giant.ts, 561, 18)) + } + interface I { +>I : Symbol(I, Decl(giant.ts, 563, 5)) + + //Call Signature + (); + (): number; + (p: string); +>p : Symbol(p, Decl(giant.ts, 568, 9)) + + (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 569, 9)) + + (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 570, 9)) + + (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 571, 9)) +>p5 : Symbol(p5, Decl(giant.ts, 571, 20)) + + (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 572, 9)) +>p7 : Symbol(p7, Decl(giant.ts, 572, 20)) + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : Symbol(p, Decl(giant.ts, 579, 13)) + + new (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 580, 13)) + + new (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 581, 13)) + + new (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 582, 13)) +>p5 : Symbol(p5, Decl(giant.ts, 582, 24)) + + new (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 583, 13)) +>p7 : Symbol(p7, Decl(giant.ts, 583, 24)) + + //Index Signature + [p]; +>[p] : Symbol(I[p], Decl(giant.ts, 583, 39)) +>p : Symbol(p, Decl(giant.ts, 13, 5)) + + [p1: string]; +>p1 : Symbol(p1, Decl(giant.ts, 587, 9)) + + [p2: string, p3: number]; +>p2 : Symbol(p2, Decl(giant.ts, 588, 9)) +>p3 : Symbol(p3, Decl(giant.ts, 588, 20)) + + //Property Signature + p; +>p : Symbol(I.p, Decl(giant.ts, 588, 33)) + + p1?; +>p1 : Symbol(I.p1, Decl(giant.ts, 591, 10)) + + p2?: string; +>p2 : Symbol(I.p2, Decl(giant.ts, 592, 12)) + + //Function Signature + p3(); +>p3 : Symbol(I.p3, Decl(giant.ts, 593, 20)) + + p4? (); +>p4 : Symbol(I.p4, Decl(giant.ts, 596, 13)) + + p5? (): void; +>p5 : Symbol(I.p5, Decl(giant.ts, 597, 15)) + + p6(pa1): void; +>p6 : Symbol(I.p6, Decl(giant.ts, 598, 21)) +>pa1 : Symbol(pa1, Decl(giant.ts, 599, 11)) + + p7(pa1, pa2): void; +>p7 : Symbol(I.p7, Decl(giant.ts, 599, 22), Decl(giant.ts, 600, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 600, 11)) +>pa2 : Symbol(pa2, Decl(giant.ts, 600, 15)) + + p7? (pa1, pa2): void; +>p7 : Symbol(I.p7, Decl(giant.ts, 599, 22), Decl(giant.ts, 600, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 601, 13)) +>pa2 : Symbol(pa2, Decl(giant.ts, 601, 17)) + } + module M { +>M : Symbol(M, Decl(giant.ts, 602, 5)) + + var V; +>V : Symbol(V, Decl(giant.ts, 604, 11)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 604, 14)) + + class C { } +>C : Symbol(C, Decl(giant.ts, 605, 25)) + + interface I { } +>I : Symbol(I, Decl(giant.ts, 606, 19)) + + module M { } +>M : Symbol(M, Decl(giant.ts, 607, 23)) + + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 609, 18)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 609, 22)) + + export class eC { } +>eC : Symbol(eC, Decl(giant.ts, 610, 33)) + + export interface eI { } +>eI : Symbol(eI, Decl(giant.ts, 611, 27)) + + export module eM { } +>eM : Symbol(eM, Decl(giant.ts, 612, 31)) + + export declare var eaV +>eaV : Symbol(eaV, Decl(giant.ts, 614, 26)) + + export declare function eaF() { }; +>eaF : Symbol(eaF, Decl(giant.ts, 614, 30)) + + export declare class eaC { } +>eaC : Symbol(eaC, Decl(giant.ts, 615, 42)) + + export declare module eaM { } +>eaM : Symbol(eaM, Decl(giant.ts, 616, 36)) + } + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 619, 14)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 619, 18)) + + export class eC { +>eC : Symbol(eC, Decl(giant.ts, 620, 29)) + + constructor () { } + public pV; +>pV : Symbol(eC.pV, Decl(giant.ts, 622, 26)) + + private rV; +>rV : Symbol(eC.rV, Decl(giant.ts, 623, 18)) + + public pF() { } +>pF : Symbol(eC.pF, Decl(giant.ts, 624, 19)) + + static tV +>tV : Symbol(eC.tV, Decl(giant.ts, 625, 23)) + + static tF() { } +>tF : Symbol(eC.tF, Decl(giant.ts, 626, 17)) + } + export interface eI { +>eI : Symbol(eI, Decl(giant.ts, 628, 5)) + + //Call Signature + (); + (): number; + (p); +>p : Symbol(p, Decl(giant.ts, 633, 9)) + + (p1: string); +>p1 : Symbol(p1, Decl(giant.ts, 634, 9)) + + (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 635, 9)) + + (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 636, 9)) + + (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 637, 9)) +>p5 : Symbol(p5, Decl(giant.ts, 637, 20)) + + (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 638, 9)) +>p7 : Symbol(p7, Decl(giant.ts, 638, 20)) + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : Symbol(p, Decl(giant.ts, 645, 13)) + + new (p2?: string); +>p2 : Symbol(p2, Decl(giant.ts, 646, 13)) + + new (...p3: any[]); +>p3 : Symbol(p3, Decl(giant.ts, 647, 13)) + + new (p4: string, p5?: string); +>p4 : Symbol(p4, Decl(giant.ts, 648, 13)) +>p5 : Symbol(p5, Decl(giant.ts, 648, 24)) + + new (p6: string, ...p7: any[]); +>p6 : Symbol(p6, Decl(giant.ts, 649, 13)) +>p7 : Symbol(p7, Decl(giant.ts, 649, 24)) + + //Index Signature + [p]; +>[p] : Symbol(eI[p], Decl(giant.ts, 649, 39)) +>p : Symbol(p, Decl(giant.ts, 13, 5)) + + [p1: string]; +>p1 : Symbol(p1, Decl(giant.ts, 653, 9)) + + [p2: string, p3: number]; +>p2 : Symbol(p2, Decl(giant.ts, 654, 9)) +>p3 : Symbol(p3, Decl(giant.ts, 654, 20)) + + //Property Signature + p; +>p : Symbol(eI.p, Decl(giant.ts, 654, 33)) + + p1?; +>p1 : Symbol(eI.p1, Decl(giant.ts, 657, 10)) + + p2?: string; +>p2 : Symbol(eI.p2, Decl(giant.ts, 658, 12)) + + //Function Signature + p3(); +>p3 : Symbol(eI.p3, Decl(giant.ts, 659, 20)) + + p4? (); +>p4 : Symbol(eI.p4, Decl(giant.ts, 662, 13)) + + p5? (): void; +>p5 : Symbol(eI.p5, Decl(giant.ts, 663, 15)) + + p6(pa1): void; +>p6 : Symbol(eI.p6, Decl(giant.ts, 664, 21)) +>pa1 : Symbol(pa1, Decl(giant.ts, 665, 11)) + + p7(pa1, pa2): void; +>p7 : Symbol(eI.p7, Decl(giant.ts, 665, 22), Decl(giant.ts, 666, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 666, 11)) +>pa2 : Symbol(pa2, Decl(giant.ts, 666, 15)) + + p7? (pa1, pa2): void; +>p7 : Symbol(eI.p7, Decl(giant.ts, 665, 22), Decl(giant.ts, 666, 27)) +>pa1 : Symbol(pa1, Decl(giant.ts, 667, 13)) +>pa2 : Symbol(pa2, Decl(giant.ts, 667, 17)) + } + export module eM { +>eM : Symbol(eM, Decl(giant.ts, 668, 5)) + + var V; +>V : Symbol(V, Decl(giant.ts, 670, 11)) + + function F() { }; +>F : Symbol(F, Decl(giant.ts, 670, 14)) + + class C { } +>C : Symbol(C, Decl(giant.ts, 671, 25)) + + module M { } +>M : Symbol(M, Decl(giant.ts, 672, 19)) + + export var eV; +>eV : Symbol(eV, Decl(giant.ts, 674, 18)) + + export function eF() { }; +>eF : Symbol(eF, Decl(giant.ts, 674, 22)) + + export class eC { } +>eC : Symbol(eC, Decl(giant.ts, 675, 33)) + + export interface eI { } +>eI : Symbol(eI, Decl(giant.ts, 676, 27)) + + export module eM { } +>eM : Symbol(eM, Decl(giant.ts, 677, 31)) + } +} diff --git a/testdata/baselines/reference/submodule/compiler/giant.types b/testdata/baselines/reference/submodule/compiler/giant.types new file mode 100644 index 0000000000..61d2019461 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/giant.types @@ -0,0 +1,1710 @@ +//// [tests/cases/compiler/giant.ts] //// + +=== giant.ts === +/* + Prefixes + p -> public + r -> private + i -> import + e -> export + a -> ambient + t -> static + s -> set + g -> get + + MAX DEPTH 3 LEVELS +*/ +const p = "propName"; +>p : "propName" +>"propName" : "propName" + +var V; +>V : any + +function F() { }; +>F : () => void + +class C { +>C : C + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any +} +interface I { + //Call Signature + (); + (): number; + (p); +>p : any + + (p1: string); +>p1 : string + + (p2?: string); +>p2 : string + + (...p3: any[]); +>p3 : any[] + + (p4: string, p5?: string); +>p4 : string +>p5 : string + + (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : string + + new (p2?: string); +>p2 : string + + new (...p3: any[]); +>p3 : any[] + + new (p4: string, p5?: string); +>p4 : string +>p5 : string + + new (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //Index Signature + [p]; +>[p] : any +>p : "propName" + + [p1: string]; +>p1 : string + + [p2: string, p3: number]; +>p2 : string +>p3 : number + + //Property Signature + p; +>p : any + + p1?; +>p1 : any + + p2?: string; +>p2 : string + + //Function Signature + p3(); +>p3 : () => any + + p4? (); +>p4 : () => any + + p5? (): void; +>p5 : () => void + + p6(pa1): void; +>p6 : (pa1: any) => void +>pa1 : any + + p7(pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + + p7? (pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any +} +module M { +>M : typeof M + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { +>C : C + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any + } + interface I { + //Call Signature + (); + (): number; + (p); +>p : any + + (p1: string); +>p1 : string + + (p2?: string); +>p2 : string + + (...p3: any[]); +>p3 : any[] + + (p4: string, p5?: string); +>p4 : string +>p5 : string + + (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : string + + new (p2?: string); +>p2 : string + + new (...p3: any[]); +>p3 : any[] + + new (p4: string, p5?: string); +>p4 : string +>p5 : string + + new (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //Index Signature + [p]; +>[p] : any +>p : "propName" + + [p1: string]; +>p1 : string + + [p2: string, p3: number]; +>p2 : string +>p3 : number + + //Property Signature + p; +>p : any + + p1?; +>p1 : any + + p2?: string; +>p2 : string + + //Function Signature + p3(); +>p3 : () => any + + p4? (); +>p4 : () => any + + p5? (): void; +>p5 : () => void + + p6(pa1): void; +>p6 : (pa1: any) => void +>pa1 : any + + p7(pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + + p7? (pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + } + module M { +>M : typeof M + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { }; +>C : C + + interface I { }; + module M { }; + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { }; +>eC : eC + + export interface eI { }; + export module eM { }; + export declare var eaV; +>eaV : any + + export declare function eaF() { }; +>eaF : () => void + + export declare class eaC { }; +>eaC : eaC + + export declare module eaM { }; + } + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { +>eC : eC + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any + } + export interface eI { + //Call Signature + (); + (): number; + (p); +>p : any + + (p1: string); +>p1 : string + + (p2?: string); +>p2 : string + + (...p3: any[]); +>p3 : any[] + + (p4: string, p5?: string); +>p4 : string +>p5 : string + + (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : string + + new (p2?: string); +>p2 : string + + new (...p3: any[]); +>p3 : any[] + + new (p4: string, p5?: string); +>p4 : string +>p5 : string + + new (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //Index Signature + [p]; +>[p] : any +>p : "propName" + + [p1: string]; +>p1 : string + + [p2: string, p3: number]; +>p2 : string +>p3 : number + + //Property Signature + p; +>p : any + + p1?; +>p1 : any + + p2?: string; +>p2 : string + + //Function Signature + p3(); +>p3 : () => any + + p4? (); +>p4 : () => any + + p5? (): void; +>p5 : () => void + + p6(pa1): void; +>p6 : (pa1: any) => void +>pa1 : any + + p7(pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + + p7? (pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + } + export module eM { +>eM : typeof eM + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { }; +>C : C + + interface I { }; + module M { }; + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { }; +>eC : eC + + export interface eI { }; + export module eM { }; + export declare var eaV; +>eaV : any + + export declare function eaF() { }; +>eaF : () => void + + export declare class eaC { }; +>eaC : eaC + + export declare module eaM { }; + } + export declare var eaV; +>eaV : any + + export declare function eaF() { }; +>eaF : () => void + + export declare class eaC { +>eaC : eaC + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any + } + export declare module eaM { +>eaM : typeof eaM + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { } +>C : C + + interface I { } + module M { } + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { } +>eC : eC + + export interface eI { } + export module eM { } + } +} +export var eV; +>eV : any + +export function eF() { }; +>eF : () => void + +export class eC { +>eC : eC + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any +} +export interface eI { + //Call Signature + (); + (): number; + (p); +>p : any + + (p1: string); +>p1 : string + + (p2?: string); +>p2 : string + + (...p3: any[]); +>p3 : any[] + + (p4: string, p5?: string); +>p4 : string +>p5 : string + + (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : string + + new (p2?: string); +>p2 : string + + new (...p3: any[]); +>p3 : any[] + + new (p4: string, p5?: string); +>p4 : string +>p5 : string + + new (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //Index Signature + [p]; +>[p] : any +>p : "propName" + + [p1: string]; +>p1 : string + + [p2: string, p3: number]; +>p2 : string +>p3 : number + + //Property Signature + p; +>p : any + + p1?; +>p1 : any + + p2?: string; +>p2 : string + + //Function Signature + p3(); +>p3 : () => any + + p4? (); +>p4 : () => any + + p5? (): void; +>p5 : () => void + + p6(pa1): void; +>p6 : (pa1: any) => void +>pa1 : any + + p7(pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + + p7? (pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any +} +export module eM { +>eM : typeof import("giant").eM + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { +>C : C + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any + } + interface I { + //Call Signature + (); + (): number; + (p); +>p : any + + (p1: string); +>p1 : string + + (p2?: string); +>p2 : string + + (...p3: any[]); +>p3 : any[] + + (p4: string, p5?: string); +>p4 : string +>p5 : string + + (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : string + + new (p2?: string); +>p2 : string + + new (...p3: any[]); +>p3 : any[] + + new (p4: string, p5?: string); +>p4 : string +>p5 : string + + new (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //Index Signature + [p]; +>[p] : any +>p : "propName" + + [p1: string]; +>p1 : string + + [p2: string, p3: number]; +>p2 : string +>p3 : number + + //Property Signature + p; +>p : any + + p1?; +>p1 : any + + p2?: string; +>p2 : string + + //Function Signature + p3(); +>p3 : () => any + + p4? (); +>p4 : () => any + + p5? (): void; +>p5 : () => void + + p6(pa1): void; +>p6 : (pa1: any) => void +>pa1 : any + + p7(pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + + p7? (pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + } + module M { +>M : typeof M + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { }; +>C : C + + interface I { }; + module M { }; + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { }; +>eC : eC + + export interface eI { }; + export module eM { }; + export declare var eaV; +>eaV : any + + export declare function eaF() { }; +>eaF : () => void + + export declare class eaC { }; +>eaC : eaC + + export declare module eaM { }; + } + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { +>eC : eC + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any + } + export interface eI { + //Call Signature + (); + (): number; + (p); +>p : any + + (p1: string); +>p1 : string + + (p2?: string); +>p2 : string + + (...p3: any[]); +>p3 : any[] + + (p4: string, p5?: string); +>p4 : string +>p5 : string + + (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : string + + new (p2?: string); +>p2 : string + + new (...p3: any[]); +>p3 : any[] + + new (p4: string, p5?: string); +>p4 : string +>p5 : string + + new (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //Index Signature + [p]; +>[p] : any +>p : "propName" + + [p1: string]; +>p1 : string + + [p2: string, p3: number]; +>p2 : string +>p3 : number + + //Property Signature + p; +>p : any + + p1?; +>p1 : any + + p2?: string; +>p2 : string + + //Function Signature + p3(); +>p3 : () => any + + p4? (); +>p4 : () => any + + p5? (): void; +>p5 : () => void + + p6(pa1): void; +>p6 : (pa1: any) => void +>pa1 : any + + p7(pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + + p7? (pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + } + export module eM { +>eM : typeof eM + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { }; +>C : C + + interface I { }; + module M { }; + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { }; +>eC : eC + + export interface eI { }; + export module eM { }; + export declare var eaV; +>eaV : any + + export declare function eaF() { }; +>eaF : () => void + + export declare class eaC { }; +>eaC : eaC + + export declare module eaM { }; + } + export declare var eaV; +>eaV : any + + export declare function eaF() { }; +>eaF : () => void + + export declare class eaC { +>eaC : eaC + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any + } + export declare module eaM { +>eaM : typeof eaM + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { } +>C : C + + interface I { } + module M { } + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { } +>eC : eC + + export interface eI { } + export module eM { } + } +} +export declare var eaV; +>eaV : any + +export declare function eaF() { }; +>eaF : () => void + +export declare class eaC { +>eaC : eaC + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + private rF() { } +>rF : () => void + + public pgF() { } +>pgF : () => void + + public get pgF() +>pgF : any + + public psF(param:any) { } +>psF : (param: any) => void +>param : any + + public set psF(param:any) +>psF : any +>param : any + + private rgF() { } +>rgF : () => void + + private get rgF() +>rgF : any + + private rsF(param:any) { } +>rsF : (param: any) => void +>param : any + + private set rsF(param:any) +>rsF : any +>param : any + + static tV; +>tV : any + + static tF() { } +>tF : () => void + + static tsF(param:any) { } +>tsF : (param: any) => void +>param : any + + static set tsF(param:any) +>tsF : any +>param : any + + static tgF() { } +>tgF : () => void + + static get tgF() +>tgF : any +} +export declare module eaM { +>eaM : typeof eaM + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { +>C : C + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + static tV; +>tV : any + + static tF() { } +>tF : () => void + } + interface I { + //Call Signature + (); + (): number; + (p: string); +>p : string + + (p2?: string); +>p2 : string + + (...p3: any[]); +>p3 : any[] + + (p4: string, p5?: string); +>p4 : string +>p5 : string + + (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : string + + new (p2?: string); +>p2 : string + + new (...p3: any[]); +>p3 : any[] + + new (p4: string, p5?: string); +>p4 : string +>p5 : string + + new (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //Index Signature + [p]; +>[p] : any +>p : "propName" + + [p1: string]; +>p1 : string + + [p2: string, p3: number]; +>p2 : string +>p3 : number + + //Property Signature + p; +>p : any + + p1?; +>p1 : any + + p2?: string; +>p2 : string + + //Function Signature + p3(); +>p3 : () => any + + p4? (); +>p4 : () => any + + p5? (): void; +>p5 : () => void + + p6(pa1): void; +>p6 : (pa1: any) => void +>pa1 : any + + p7(pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + + p7? (pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + } + module M { +>M : typeof M + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { } +>C : C + + interface I { } + module M { } + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { } +>eC : eC + + export interface eI { } + export module eM { } + export declare var eaV +>eaV : any + + export declare function eaF() { }; +>eaF : () => void + + export declare class eaC { } +>eaC : eaC + + export declare module eaM { } + } + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { +>eC : eC + + constructor () { } + public pV; +>pV : any + + private rV; +>rV : any + + public pF() { } +>pF : () => void + + static tV +>tV : any + + static tF() { } +>tF : () => void + } + export interface eI { + //Call Signature + (); + (): number; + (p); +>p : any + + (p1: string); +>p1 : string + + (p2?: string); +>p2 : string + + (...p3: any[]); +>p3 : any[] + + (p4: string, p5?: string); +>p4 : string +>p5 : string + + (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //(p8?: string, ...p9: any[]); + //(p10:string, p8?: string, ...p9: any[]); + + //Construct Signature + new (); + new (): number; + new (p: string); +>p : string + + new (p2?: string); +>p2 : string + + new (...p3: any[]); +>p3 : any[] + + new (p4: string, p5?: string); +>p4 : string +>p5 : string + + new (p6: string, ...p7: any[]); +>p6 : string +>p7 : any[] + + //Index Signature + [p]; +>[p] : any +>p : "propName" + + [p1: string]; +>p1 : string + + [p2: string, p3: number]; +>p2 : string +>p3 : number + + //Property Signature + p; +>p : any + + p1?; +>p1 : any + + p2?: string; +>p2 : string + + //Function Signature + p3(); +>p3 : () => any + + p4? (); +>p4 : () => any + + p5? (): void; +>p5 : () => void + + p6(pa1): void; +>p6 : (pa1: any) => void +>pa1 : any + + p7(pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + + p7? (pa1, pa2): void; +>p7 : { (pa1: any, pa2: any): void; (pa1: any, pa2: any): void; } +>pa1 : any +>pa2 : any + } + export module eM { +>eM : typeof eM + + var V; +>V : any + + function F() { }; +>F : () => void + + class C { } +>C : C + + module M { } + export var eV; +>eV : any + + export function eF() { }; +>eF : () => void + + export class eC { } +>eC : eC + + export interface eI { } + export module eM { } + } +} diff --git a/testdata/baselines/reference/submodule/compiler/ignoredJsxAttributes.js b/testdata/baselines/reference/submodule/compiler/ignoredJsxAttributes.js index f2d8c25c70..c2662909f9 100644 --- a/testdata/baselines/reference/submodule/compiler/ignoredJsxAttributes.js +++ b/testdata/baselines/reference/submodule/compiler/ignoredJsxAttributes.js @@ -26,9 +26,42 @@ let x2 = ; // Error //// [ignoredJsxAttributes.js] "use strict"; /// +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // Repro from #44797 -const React = require("react"); +const React = __importStar(require("react")); let props = { foo: "", "data-yadda": 42, // Error diff --git a/testdata/baselines/reference/submodule/compiler/ignoredJsxAttributes.js.diff b/testdata/baselines/reference/submodule/compiler/ignoredJsxAttributes.js.diff index 1dc2a3e2ff..27f718e4f3 100644 --- a/testdata/baselines/reference/submodule/compiler/ignoredJsxAttributes.js.diff +++ b/testdata/baselines/reference/submodule/compiler/ignoredJsxAttributes.js.diff @@ -1,11 +1,11 @@ --- old.ignoredJsxAttributes.js +++ new.ignoredJsxAttributes.js -@@= skipped -27, +27 lines =@@ - /// +@@= skipped -60, +60 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); // Repro from #44797 --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); let props = { foo: "", "data-yadda": 42, // Error \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.errors.txt b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.errors.txt new file mode 100644 index 0000000000..12e30795ff --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.errors.txt @@ -0,0 +1,39 @@ +importDeclWithClassModifiers.ts(5,8): error TS1044: 'public' modifier cannot appear on a module or namespace element. +importDeclWithClassModifiers.ts(5,26): error TS2708: Cannot use namespace 'x' as a value. +importDeclWithClassModifiers.ts(5,28): error TS2694: Namespace 'x' has no exported member 'c'. +importDeclWithClassModifiers.ts(6,8): error TS1044: 'private' modifier cannot appear on a module or namespace element. +importDeclWithClassModifiers.ts(6,27): error TS2708: Cannot use namespace 'x' as a value. +importDeclWithClassModifiers.ts(6,29): error TS2694: Namespace 'x' has no exported member 'c'. +importDeclWithClassModifiers.ts(7,8): error TS1044: 'static' modifier cannot appear on a module or namespace element. +importDeclWithClassModifiers.ts(7,26): error TS2708: Cannot use namespace 'x' as a value. +importDeclWithClassModifiers.ts(7,28): error TS2694: Namespace 'x' has no exported member 'c'. + + +==== importDeclWithClassModifiers.ts (9 errors) ==== + namespace x { + interface c { + } + } + export public import a = x.c; + ~~~~~~ +!!! error TS1044: 'public' modifier cannot appear on a module or namespace element. + ~ +!!! error TS2708: Cannot use namespace 'x' as a value. + ~ +!!! error TS2694: Namespace 'x' has no exported member 'c'. + export private import b = x.c; + ~~~~~~~ +!!! error TS1044: 'private' modifier cannot appear on a module or namespace element. + ~ +!!! error TS2708: Cannot use namespace 'x' as a value. + ~ +!!! error TS2694: Namespace 'x' has no exported member 'c'. + export static import c = x.c; + ~~~~~~ +!!! error TS1044: 'static' modifier cannot appear on a module or namespace element. + ~ +!!! error TS2708: Cannot use namespace 'x' as a value. + ~ +!!! error TS2694: Namespace 'x' has no exported member 'c'. + var b: a; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.js b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.js new file mode 100644 index 0000000000..daf66572ad --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.js @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/importDeclWithClassModifiers.ts] //// + +//// [importDeclWithClassModifiers.ts] +namespace x { + interface c { + } +} +export public import a = x.c; +export private import b = x.c; +export static import c = x.c; +var b: a; + + +//// [importDeclWithClassModifiers.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var b; diff --git a/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.js.diff b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.js.diff new file mode 100644 index 0000000000..9f03b5ceda --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.js.diff @@ -0,0 +1,11 @@ +--- old.importDeclWithClassModifiers.js ++++ new.importDeclWithClassModifiers.js +@@= skipped -13, +13 lines =@@ + //// [importDeclWithClassModifiers.js] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-exports.c = exports.b = exports.a = void 0; +-exports.a = x.c; +-exports.b = x.c; +-exports.c = x.c; + var b; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.symbols b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.symbols new file mode 100644 index 0000000000..4defa696fb --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.symbols @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/importDeclWithClassModifiers.ts] //// + +=== importDeclWithClassModifiers.ts === +namespace x { +>x : Symbol(x, Decl(importDeclWithClassModifiers.ts, 0, 0)) + + interface c { +>c : Symbol(c, Decl(importDeclWithClassModifiers.ts, 0, 13)) + } +} +export public import a = x.c; +>a : Symbol(a, Decl(importDeclWithClassModifiers.ts, 3, 1)) +>x : Symbol(x, Decl(importDeclWithClassModifiers.ts, 0, 0)) + +export private import b = x.c; +>b : Symbol(b, Decl(importDeclWithClassModifiers.ts, 4, 29)) +>x : Symbol(x, Decl(importDeclWithClassModifiers.ts, 0, 0)) + +export static import c = x.c; +>c : Symbol(c, Decl(importDeclWithClassModifiers.ts, 5, 30)) +>x : Symbol(x, Decl(importDeclWithClassModifiers.ts, 0, 0)) + +var b: a; +>b : Symbol(b, Decl(importDeclWithClassModifiers.ts, 7, 3)) +>a : Symbol(a, Decl(importDeclWithClassModifiers.ts, 3, 1)) + diff --git a/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.types b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.types new file mode 100644 index 0000000000..a915e8be3e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/importDeclWithClassModifiers.types @@ -0,0 +1,25 @@ +//// [tests/cases/compiler/importDeclWithClassModifiers.ts] //// + +=== importDeclWithClassModifiers.ts === +namespace x { + interface c { + } +} +export public import a = x.c; +>a : any +>x : any +>c : any + +export private import b = x.c; +>b : any +>x : any +>c : any + +export static import c = x.c; +>c : any +>x : any +>c : any + +var b: a; +>b : a + diff --git a/testdata/baselines/reference/submodule/compiler/importHelpers.js b/testdata/baselines/reference/submodule/compiler/importHelpers.js index b6f49b26d4..3f818f167e 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpers.js +++ b/testdata/baselines/reference/submodule/compiler/importHelpers.js @@ -36,7 +36,7 @@ function id(x: T) { const result = id`hello world`; -//// [tslib.d.ts] +//// [index.d.ts] export declare function __extends(d: Function, b: Function): void; export declare function __assign(t: any, ...sources: any[]): any; export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpers.symbols b/testdata/baselines/reference/submodule/compiler/importHelpers.symbols index 89b7a935c4..b5129fc716 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpers.symbols +++ b/testdata/baselines/reference/submodule/compiler/importHelpers.symbols @@ -76,52 +76,52 @@ const result = id`hello world`; >result : Symbol(result, Decl(script.ts, 15, 5)) >id : Symbol(id, Decl(script.ts, 9, 1)) -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === export declare function __extends(d: Function, b: Function): void; ->__extends : Symbol(__extends, Decl(tslib.d.ts, 0, 0)) ->d : Symbol(d, Decl(tslib.d.ts, 0, 34)) +>__extends : Symbol(__extends, Decl(index.d.ts, 0, 0)) +>d : Symbol(d, Decl(index.d.ts, 0, 34)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->b : Symbol(b, Decl(tslib.d.ts, 0, 46)) +>b : Symbol(b, Decl(index.d.ts, 0, 46)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __assign(t: any, ...sources: any[]): any; ->__assign : Symbol(__assign, Decl(tslib.d.ts, 0, 66)) ->t : Symbol(t, Decl(tslib.d.ts, 1, 33)) ->sources : Symbol(sources, Decl(tslib.d.ts, 1, 40)) +>__assign : Symbol(__assign, Decl(index.d.ts, 0, 66)) +>t : Symbol(t, Decl(index.d.ts, 1, 33)) +>sources : Symbol(sources, Decl(index.d.ts, 1, 40)) export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; ->__decorate : Symbol(__decorate, Decl(tslib.d.ts, 1, 65)) ->decorators : Symbol(decorators, Decl(tslib.d.ts, 2, 35)) +>__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65)) +>decorators : Symbol(decorators, Decl(index.d.ts, 2, 35)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->target : Symbol(target, Decl(tslib.d.ts, 2, 58)) ->key : Symbol(key, Decl(tslib.d.ts, 2, 71)) ->desc : Symbol(desc, Decl(tslib.d.ts, 2, 94)) +>target : Symbol(target, Decl(index.d.ts, 2, 58)) +>key : Symbol(key, Decl(index.d.ts, 2, 71)) +>desc : Symbol(desc, Decl(index.d.ts, 2, 94)) export declare function __param(paramIndex: number, decorator: Function): Function; ->__param : Symbol(__param, Decl(tslib.d.ts, 2, 112)) ->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, 3, 32)) ->decorator : Symbol(decorator, Decl(tslib.d.ts, 3, 51)) +>__param : Symbol(__param, Decl(index.d.ts, 2, 112)) +>paramIndex : Symbol(paramIndex, Decl(index.d.ts, 3, 32)) +>decorator : Symbol(decorator, Decl(index.d.ts, 3, 51)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __metadata(metadataKey: any, metadataValue: any): Function; ->__metadata : Symbol(__metadata, Decl(tslib.d.ts, 3, 83)) ->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, 4, 35)) ->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, 4, 52)) +>__metadata : Symbol(__metadata, Decl(index.d.ts, 3, 83)) +>metadataKey : Symbol(metadataKey, Decl(index.d.ts, 4, 35)) +>metadataValue : Symbol(metadataValue, Decl(index.d.ts, 4, 52)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; ->__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, 4, 83)) ->thisArg : Symbol(thisArg, Decl(tslib.d.ts, 5, 34)) ->_arguments : Symbol(_arguments, Decl(tslib.d.ts, 5, 47)) ->P : Symbol(P, Decl(tslib.d.ts, 5, 64)) +>__awaiter : Symbol(__awaiter, Decl(index.d.ts, 4, 83)) +>thisArg : Symbol(thisArg, Decl(index.d.ts, 5, 34)) +>_arguments : Symbol(_arguments, Decl(index.d.ts, 5, 47)) +>P : Symbol(P, Decl(index.d.ts, 5, 64)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->generator : Symbol(generator, Decl(tslib.d.ts, 5, 77)) +>generator : Symbol(generator, Decl(index.d.ts, 5, 77)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __makeTemplateObject(cooked: string[], raw: string[]): TemplateStringsArray; ->__makeTemplateObject : Symbol(__makeTemplateObject, Decl(tslib.d.ts, 5, 104)) ->cooked : Symbol(cooked, Decl(tslib.d.ts, 6, 45)) ->raw : Symbol(raw, Decl(tslib.d.ts, 6, 62)) +>__makeTemplateObject : Symbol(__makeTemplateObject, Decl(index.d.ts, 5, 104)) +>cooked : Symbol(cooked, Decl(index.d.ts, 6, 45)) +>raw : Symbol(raw, Decl(index.d.ts, 6, 62)) >TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --)) diff --git a/testdata/baselines/reference/submodule/compiler/importHelpers.symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpers.symbols.diff deleted file mode 100644 index de9c2fe80d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpers.symbols.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- old.importHelpers.symbols -+++ new.importHelpers.symbols -@@= skipped -77, +77 lines =@@ - - === tslib.d.ts === - export declare function __extends(d: Function, b: Function): void; -->__extends : Symbol(__extends, Decl(tslib.d.ts, --, --)) -->d : Symbol(d, Decl(tslib.d.ts, --, --)) -+>__extends : Symbol(__extends, Decl(tslib.d.ts, 0, 0)) -+>d : Symbol(d, Decl(tslib.d.ts, 0, 34)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->b : Symbol(b, Decl(tslib.d.ts, --, --)) -+>b : Symbol(b, Decl(tslib.d.ts, 0, 46)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __assign(t: any, ...sources: any[]): any; -->__assign : Symbol(__assign, Decl(tslib.d.ts, --, --)) -->t : Symbol(t, Decl(tslib.d.ts, --, --)) -->sources : Symbol(sources, Decl(tslib.d.ts, --, --)) -+>__assign : Symbol(__assign, Decl(tslib.d.ts, 0, 66)) -+>t : Symbol(t, Decl(tslib.d.ts, 1, 33)) -+>sources : Symbol(sources, Decl(tslib.d.ts, 1, 40)) - - export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; -->__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --)) -->decorators : Symbol(decorators, Decl(tslib.d.ts, --, --)) -+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, 1, 65)) -+>decorators : Symbol(decorators, Decl(tslib.d.ts, 2, 35)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->target : Symbol(target, Decl(tslib.d.ts, --, --)) -->key : Symbol(key, Decl(tslib.d.ts, --, --)) -->desc : Symbol(desc, Decl(tslib.d.ts, --, --)) -+>target : Symbol(target, Decl(tslib.d.ts, 2, 58)) -+>key : Symbol(key, Decl(tslib.d.ts, 2, 71)) -+>desc : Symbol(desc, Decl(tslib.d.ts, 2, 94)) - - export declare function __param(paramIndex: number, decorator: Function): Function; -->__param : Symbol(__param, Decl(tslib.d.ts, --, --)) -->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --)) -->decorator : Symbol(decorator, Decl(tslib.d.ts, --, --)) -+>__param : Symbol(__param, Decl(tslib.d.ts, 2, 112)) -+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, 3, 32)) -+>decorator : Symbol(decorator, Decl(tslib.d.ts, 3, 51)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __metadata(metadataKey: any, metadataValue: any): Function; -->__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --)) -->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --)) -->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --)) -+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, 3, 83)) -+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, 4, 35)) -+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, 4, 52)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; -->__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --)) -->thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --)) -->_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --)) -->P : Symbol(P, Decl(tslib.d.ts, --, --)) -+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, 4, 83)) -+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, 5, 34)) -+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, 5, 47)) -+>P : Symbol(P, Decl(tslib.d.ts, 5, 64)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->generator : Symbol(generator, Decl(tslib.d.ts, --, --)) -+>generator : Symbol(generator, Decl(tslib.d.ts, 5, 77)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __makeTemplateObject(cooked: string[], raw: string[]): TemplateStringsArray; -->__makeTemplateObject : Symbol(__makeTemplateObject, Decl(tslib.d.ts, --, --)) -->cooked : Symbol(cooked, Decl(tslib.d.ts, --, --)) -->raw : Symbol(raw, Decl(tslib.d.ts, --, --)) -+>__makeTemplateObject : Symbol(__makeTemplateObject, Decl(tslib.d.ts, 5, 104)) -+>cooked : Symbol(cooked, Decl(tslib.d.ts, 6, 45)) -+>raw : Symbol(raw, Decl(tslib.d.ts, 6, 62)) - >TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --)) diff --git a/testdata/baselines/reference/submodule/compiler/importHelpers.types b/testdata/baselines/reference/submodule/compiler/importHelpers.types index 2027d3c598..55bc2641cf 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpers.types +++ b/testdata/baselines/reference/submodule/compiler/importHelpers.types @@ -76,7 +76,7 @@ const result = id`hello world`; >id : (x: T) => T >`hello world` : "hello world" -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === export declare function __extends(d: Function, b: Function): void; >__extends : (d: Function, b: Function) => void >d : Function diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersES6.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importHelpersES6.errors.txt.diff new file mode 100644 index 0000000000..60f9121f02 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/importHelpersES6.errors.txt.diff @@ -0,0 +1,30 @@ +--- old.importHelpersES6.errors.txt ++++ new.importHelpersES6.errors.txt +@@= skipped -0, +0 lines =@@ +-a.ts(2,1): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found. +- +- +-==== a.ts (1 errors) ==== +- declare var dec: any; +- @dec export class A { +- ~~~~ +-!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found. +- #x: number = 1; +- async f() { this.#x = await this.#x; } +- g(u) { return #x in u; } +- } +- +- const o = { a: 1 }; +- const y = { ...o }; +- +-==== tslib.d.ts (0 errors) ==== +- export declare function __extends(d: Function, b: Function): void; +- export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; +- export declare function __param(paramIndex: number, decorator: Function): Function; +- export declare function __metadata(metadataKey: any, metadataValue: any): Function; +- export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; +- export declare function __classPrivateFieldGet(a: any, b: any, c: any, d: any): any; +- export declare function __classPrivateFieldSet(a: any, b: any, c: any, d: any, e: any): any; +- export declare function __classPrivateFieldIn(a: any, b: any): boolean; +- ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.js b/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.js index e455c9c63b..c38d01d11f 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.js +++ b/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.js @@ -24,7 +24,7 @@ class C { } } -//// [tslib.d.ts] +//// [index.d.ts] export declare function __extends(d: Function, b: Function): void; export declare function __assign(t: any, ...sources: any[]): any; export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.symbols b/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.symbols index 99e81761f9..dd10b49a53 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.symbols +++ b/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.symbols @@ -48,46 +48,46 @@ class C { } } -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === export declare function __extends(d: Function, b: Function): void; ->__extends : Symbol(__extends, Decl(tslib.d.ts, 0, 0)) ->d : Symbol(d, Decl(tslib.d.ts, 0, 34)) +>__extends : Symbol(__extends, Decl(index.d.ts, 0, 0)) +>d : Symbol(d, Decl(index.d.ts, 0, 34)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->b : Symbol(b, Decl(tslib.d.ts, 0, 46)) +>b : Symbol(b, Decl(index.d.ts, 0, 46)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __assign(t: any, ...sources: any[]): any; ->__assign : Symbol(__assign, Decl(tslib.d.ts, 0, 66)) ->t : Symbol(t, Decl(tslib.d.ts, 1, 33)) ->sources : Symbol(sources, Decl(tslib.d.ts, 1, 40)) +>__assign : Symbol(__assign, Decl(index.d.ts, 0, 66)) +>t : Symbol(t, Decl(index.d.ts, 1, 33)) +>sources : Symbol(sources, Decl(index.d.ts, 1, 40)) export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; ->__decorate : Symbol(__decorate, Decl(tslib.d.ts, 1, 65)) ->decorators : Symbol(decorators, Decl(tslib.d.ts, 2, 35)) +>__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65)) +>decorators : Symbol(decorators, Decl(index.d.ts, 2, 35)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->target : Symbol(target, Decl(tslib.d.ts, 2, 58)) ->key : Symbol(key, Decl(tslib.d.ts, 2, 71)) ->desc : Symbol(desc, Decl(tslib.d.ts, 2, 94)) +>target : Symbol(target, Decl(index.d.ts, 2, 58)) +>key : Symbol(key, Decl(index.d.ts, 2, 71)) +>desc : Symbol(desc, Decl(index.d.ts, 2, 94)) export declare function __param(paramIndex: number, decorator: Function): Function; ->__param : Symbol(__param, Decl(tslib.d.ts, 2, 112)) ->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, 3, 32)) ->decorator : Symbol(decorator, Decl(tslib.d.ts, 3, 51)) +>__param : Symbol(__param, Decl(index.d.ts, 2, 112)) +>paramIndex : Symbol(paramIndex, Decl(index.d.ts, 3, 32)) +>decorator : Symbol(decorator, Decl(index.d.ts, 3, 51)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __metadata(metadataKey: any, metadataValue: any): Function; ->__metadata : Symbol(__metadata, Decl(tslib.d.ts, 3, 83)) ->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, 4, 35)) ->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, 4, 52)) +>__metadata : Symbol(__metadata, Decl(index.d.ts, 3, 83)) +>metadataKey : Symbol(metadataKey, Decl(index.d.ts, 4, 35)) +>metadataValue : Symbol(metadataValue, Decl(index.d.ts, 4, 52)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; ->__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, 4, 83)) ->thisArg : Symbol(thisArg, Decl(tslib.d.ts, 5, 34)) ->_arguments : Symbol(_arguments, Decl(tslib.d.ts, 5, 47)) ->P : Symbol(P, Decl(tslib.d.ts, 5, 64)) +>__awaiter : Symbol(__awaiter, Decl(index.d.ts, 4, 83)) +>thisArg : Symbol(thisArg, Decl(index.d.ts, 5, 34)) +>_arguments : Symbol(_arguments, Decl(index.d.ts, 5, 47)) +>P : Symbol(P, Decl(index.d.ts, 5, 64)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->generator : Symbol(generator, Decl(tslib.d.ts, 5, 77)) +>generator : Symbol(generator, Decl(index.d.ts, 5, 77)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.symbols.diff deleted file mode 100644 index c41fc7d7fc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.symbols.diff +++ /dev/null @@ -1,68 +0,0 @@ ---- old.importHelpersInIsolatedModules.symbols -+++ new.importHelpersInIsolatedModules.symbols -@@= skipped -49, +49 lines =@@ - - === tslib.d.ts === - export declare function __extends(d: Function, b: Function): void; -->__extends : Symbol(__extends, Decl(tslib.d.ts, --, --)) -->d : Symbol(d, Decl(tslib.d.ts, --, --)) -+>__extends : Symbol(__extends, Decl(tslib.d.ts, 0, 0)) -+>d : Symbol(d, Decl(tslib.d.ts, 0, 34)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->b : Symbol(b, Decl(tslib.d.ts, --, --)) -+>b : Symbol(b, Decl(tslib.d.ts, 0, 46)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __assign(t: any, ...sources: any[]): any; -->__assign : Symbol(__assign, Decl(tslib.d.ts, --, --)) -->t : Symbol(t, Decl(tslib.d.ts, --, --)) -->sources : Symbol(sources, Decl(tslib.d.ts, --, --)) -+>__assign : Symbol(__assign, Decl(tslib.d.ts, 0, 66)) -+>t : Symbol(t, Decl(tslib.d.ts, 1, 33)) -+>sources : Symbol(sources, Decl(tslib.d.ts, 1, 40)) - - export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; -->__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --)) -->decorators : Symbol(decorators, Decl(tslib.d.ts, --, --)) -+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, 1, 65)) -+>decorators : Symbol(decorators, Decl(tslib.d.ts, 2, 35)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->target : Symbol(target, Decl(tslib.d.ts, --, --)) -->key : Symbol(key, Decl(tslib.d.ts, --, --)) -->desc : Symbol(desc, Decl(tslib.d.ts, --, --)) -+>target : Symbol(target, Decl(tslib.d.ts, 2, 58)) -+>key : Symbol(key, Decl(tslib.d.ts, 2, 71)) -+>desc : Symbol(desc, Decl(tslib.d.ts, 2, 94)) - - export declare function __param(paramIndex: number, decorator: Function): Function; -->__param : Symbol(__param, Decl(tslib.d.ts, --, --)) -->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --)) -->decorator : Symbol(decorator, Decl(tslib.d.ts, --, --)) -+>__param : Symbol(__param, Decl(tslib.d.ts, 2, 112)) -+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, 3, 32)) -+>decorator : Symbol(decorator, Decl(tslib.d.ts, 3, 51)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __metadata(metadataKey: any, metadataValue: any): Function; -->__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --)) -->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --)) -->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --)) -+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, 3, 83)) -+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, 4, 35)) -+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, 4, 52)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; -->__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --)) -->thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --)) -->_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --)) -->P : Symbol(P, Decl(tslib.d.ts, --, --)) -+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, 4, 83)) -+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, 5, 34)) -+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, 5, 47)) -+>P : Symbol(P, Decl(tslib.d.ts, 5, 64)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->generator : Symbol(generator, Decl(tslib.d.ts, --, --)) -+>generator : Symbol(generator, Decl(tslib.d.ts, 5, 77)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.types b/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.types index c90d5e1872..3620f8a01c 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.types +++ b/testdata/baselines/reference/submodule/compiler/importHelpersInIsolatedModules.types @@ -48,7 +48,7 @@ class C { } } -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === export declare function __extends(d: Function, b: Function): void; >__extends : (d: Function, b: Function) => void >d : Function diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.js b/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.js index bb85abcce9..5541448594 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.js +++ b/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.js @@ -10,7 +10,7 @@ declare var React: any; declare var o: any; const x = -//// [tslib.d.ts] +//// [index.d.ts] export declare function __extends(d: Function, b: Function): void; export declare function __assign(t: any, ...sources: any[]): any; export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.symbols b/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.symbols index 5196660bdb..e6c5d0a6f3 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.symbols +++ b/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.symbols @@ -22,46 +22,46 @@ const x = >x : Symbol(x, Decl(script.tsx, 2, 5)) >o : Symbol(o, Decl(script.tsx, 1, 11)) -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === export declare function __extends(d: Function, b: Function): void; ->__extends : Symbol(__extends, Decl(tslib.d.ts, 0, 0)) ->d : Symbol(d, Decl(tslib.d.ts, 0, 34)) +>__extends : Symbol(__extends, Decl(index.d.ts, 0, 0)) +>d : Symbol(d, Decl(index.d.ts, 0, 34)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->b : Symbol(b, Decl(tslib.d.ts, 0, 46)) +>b : Symbol(b, Decl(index.d.ts, 0, 46)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __assign(t: any, ...sources: any[]): any; ->__assign : Symbol(__assign, Decl(tslib.d.ts, 0, 66)) ->t : Symbol(t, Decl(tslib.d.ts, 1, 33)) ->sources : Symbol(sources, Decl(tslib.d.ts, 1, 40)) +>__assign : Symbol(__assign, Decl(index.d.ts, 0, 66)) +>t : Symbol(t, Decl(index.d.ts, 1, 33)) +>sources : Symbol(sources, Decl(index.d.ts, 1, 40)) export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; ->__decorate : Symbol(__decorate, Decl(tslib.d.ts, 1, 65)) ->decorators : Symbol(decorators, Decl(tslib.d.ts, 2, 35)) +>__decorate : Symbol(__decorate, Decl(index.d.ts, 1, 65)) +>decorators : Symbol(decorators, Decl(index.d.ts, 2, 35)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->target : Symbol(target, Decl(tslib.d.ts, 2, 58)) ->key : Symbol(key, Decl(tslib.d.ts, 2, 71)) ->desc : Symbol(desc, Decl(tslib.d.ts, 2, 94)) +>target : Symbol(target, Decl(index.d.ts, 2, 58)) +>key : Symbol(key, Decl(index.d.ts, 2, 71)) +>desc : Symbol(desc, Decl(index.d.ts, 2, 94)) export declare function __param(paramIndex: number, decorator: Function): Function; ->__param : Symbol(__param, Decl(tslib.d.ts, 2, 112)) ->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, 3, 32)) ->decorator : Symbol(decorator, Decl(tslib.d.ts, 3, 51)) +>__param : Symbol(__param, Decl(index.d.ts, 2, 112)) +>paramIndex : Symbol(paramIndex, Decl(index.d.ts, 3, 32)) +>decorator : Symbol(decorator, Decl(index.d.ts, 3, 51)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __metadata(metadataKey: any, metadataValue: any): Function; ->__metadata : Symbol(__metadata, Decl(tslib.d.ts, 3, 83)) ->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, 4, 35)) ->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, 4, 52)) +>__metadata : Symbol(__metadata, Decl(index.d.ts, 3, 83)) +>metadataKey : Symbol(metadataKey, Decl(index.d.ts, 4, 35)) +>metadataValue : Symbol(metadataValue, Decl(index.d.ts, 4, 52)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; ->__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, 4, 83)) ->thisArg : Symbol(thisArg, Decl(tslib.d.ts, 5, 34)) ->_arguments : Symbol(_arguments, Decl(tslib.d.ts, 5, 47)) ->P : Symbol(P, Decl(tslib.d.ts, 5, 64)) +>__awaiter : Symbol(__awaiter, Decl(index.d.ts, 4, 83)) +>thisArg : Symbol(thisArg, Decl(index.d.ts, 5, 34)) +>_arguments : Symbol(_arguments, Decl(index.d.ts, 5, 47)) +>P : Symbol(P, Decl(index.d.ts, 5, 64)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->generator : Symbol(generator, Decl(tslib.d.ts, 5, 77)) +>generator : Symbol(generator, Decl(index.d.ts, 5, 77)) >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.symbols.diff deleted file mode 100644 index 941b519187..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.symbols.diff +++ /dev/null @@ -1,68 +0,0 @@ ---- old.importHelpersInTsx.symbols -+++ new.importHelpersInTsx.symbols -@@= skipped -23, +23 lines =@@ - - === tslib.d.ts === - export declare function __extends(d: Function, b: Function): void; -->__extends : Symbol(__extends, Decl(tslib.d.ts, --, --)) -->d : Symbol(d, Decl(tslib.d.ts, --, --)) -+>__extends : Symbol(__extends, Decl(tslib.d.ts, 0, 0)) -+>d : Symbol(d, Decl(tslib.d.ts, 0, 34)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->b : Symbol(b, Decl(tslib.d.ts, --, --)) -+>b : Symbol(b, Decl(tslib.d.ts, 0, 46)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __assign(t: any, ...sources: any[]): any; -->__assign : Symbol(__assign, Decl(tslib.d.ts, --, --)) -->t : Symbol(t, Decl(tslib.d.ts, --, --)) -->sources : Symbol(sources, Decl(tslib.d.ts, --, --)) -+>__assign : Symbol(__assign, Decl(tslib.d.ts, 0, 66)) -+>t : Symbol(t, Decl(tslib.d.ts, 1, 33)) -+>sources : Symbol(sources, Decl(tslib.d.ts, 1, 40)) - - export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; -->__decorate : Symbol(__decorate, Decl(tslib.d.ts, --, --)) -->decorators : Symbol(decorators, Decl(tslib.d.ts, --, --)) -+>__decorate : Symbol(__decorate, Decl(tslib.d.ts, 1, 65)) -+>decorators : Symbol(decorators, Decl(tslib.d.ts, 2, 35)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->target : Symbol(target, Decl(tslib.d.ts, --, --)) -->key : Symbol(key, Decl(tslib.d.ts, --, --)) -->desc : Symbol(desc, Decl(tslib.d.ts, --, --)) -+>target : Symbol(target, Decl(tslib.d.ts, 2, 58)) -+>key : Symbol(key, Decl(tslib.d.ts, 2, 71)) -+>desc : Symbol(desc, Decl(tslib.d.ts, 2, 94)) - - export declare function __param(paramIndex: number, decorator: Function): Function; -->__param : Symbol(__param, Decl(tslib.d.ts, --, --)) -->paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, --, --)) -->decorator : Symbol(decorator, Decl(tslib.d.ts, --, --)) -+>__param : Symbol(__param, Decl(tslib.d.ts, 2, 112)) -+>paramIndex : Symbol(paramIndex, Decl(tslib.d.ts, 3, 32)) -+>decorator : Symbol(decorator, Decl(tslib.d.ts, 3, 51)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __metadata(metadataKey: any, metadataValue: any): Function; -->__metadata : Symbol(__metadata, Decl(tslib.d.ts, --, --)) -->metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, --, --)) -->metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, --, --)) -+>__metadata : Symbol(__metadata, Decl(tslib.d.ts, 3, 83)) -+>metadataKey : Symbol(metadataKey, Decl(tslib.d.ts, 4, 35)) -+>metadataValue : Symbol(metadataValue, Decl(tslib.d.ts, 4, 52)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) - - export declare function __awaiter(thisArg: any, _arguments: any, P: Function, generator: Function): any; -->__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, --, --)) -->thisArg : Symbol(thisArg, Decl(tslib.d.ts, --, --)) -->_arguments : Symbol(_arguments, Decl(tslib.d.ts, --, --)) -->P : Symbol(P, Decl(tslib.d.ts, --, --)) -+>__awaiter : Symbol(__awaiter, Decl(tslib.d.ts, 4, 83)) -+>thisArg : Symbol(thisArg, Decl(tslib.d.ts, 5, 34)) -+>_arguments : Symbol(_arguments, Decl(tslib.d.ts, 5, 47)) -+>P : Symbol(P, Decl(tslib.d.ts, 5, 64)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) -->generator : Symbol(generator, Decl(tslib.d.ts, --, --)) -+>generator : Symbol(generator, Decl(tslib.d.ts, 5, 77)) - >Function : Symbol(Function, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.types b/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.types index e05eea951f..6ad008e20a 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.types +++ b/testdata/baselines/reference/submodule/compiler/importHelpersInTsx.types @@ -26,7 +26,7 @@ const x = >span : any >o : any -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === export declare function __extends(d: Function, b: Function): void; >__extends : (d: Function, b: Function) => void >d : Function diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.errors.txt.diff deleted file mode 100644 index d8198de297..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.errors.txt.diff +++ /dev/null @@ -1,62 +0,0 @@ ---- old.importHelpersNoHelpers.errors.txt -+++ new.importHelpersNoHelpers.errors.txt -@@= skipped -0, +0 lines =@@ --external.ts(1,1): error TS2343: This syntax requires an imported helper named '__exportStar' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --external.ts(3,16): error TS2343: This syntax requires an imported helper named '__extends' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --external.ts(7,1): error TS2343: This syntax requires an imported helper named '__decorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --external.ts(7,1): error TS2343: This syntax requires an imported helper named '__metadata' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --external.ts(9,12): error TS2343: This syntax requires an imported helper named '__param' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --external.ts(14,13): error TS2343: This syntax requires an imported helper named '__assign' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --external.ts(15,12): error TS2343: This syntax requires an imported helper named '__rest' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== external.ts (7 errors) ==== -- export * from "./other"; -- ~~~~~~~~~~~~~~~~~~~~~~~~ --!!! error TS2343: This syntax requires an imported helper named '__exportStar' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- export class A { } -- export class B extends A { } -- ~~~~~~~~~ --!!! error TS2343: This syntax requires an imported helper named '__extends' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- declare var dec: any; -- -- @dec -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__decorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__metadata' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- class C { -- method(@dec x: number) { -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__param' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- } -- -- const o = { a: 1 }; -- const y = { ...o }; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__assign' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- const { ...x } = y; -- ~ --!!! error TS2343: This syntax requires an imported helper named '__rest' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== other.ts (0 errors) ==== -- export const x = 1; -- --==== script.ts (0 errors) ==== -- class A { } -- class B extends A { } -- -- declare var dec: any; -- -- @dec -- class C { -- method(@dec x: number) { -- } -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.js b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.js deleted file mode 100644 index 67899671f1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.js +++ /dev/null @@ -1,73 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpers.ts] //// - -//// [external.ts] -export * from "./other"; -export class A { } -export class B extends A { } - -declare var dec: any; - -@dec -class C { - method(@dec x: number) { - } -} - -const o = { a: 1 }; -const y = { ...o }; -const { ...x } = y; - -//// [other.ts] -export const x = 1; - -//// [script.ts] -class A { } -class B extends A { } - -declare var dec: any; - -@dec -class C { - method(@dec x: number) { - } -} - -//// [tslib.d.ts] -export {} - - -//// [other.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -exports.x = 1; -//// [external.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.B = exports.A = void 0; -const tslib_1 = require("tslib"); -tslib_1.__exportStar(require("./other"), exports); -class A { -} -exports.A = A; -class B extends A { -} -exports.B = B; -@dec -class C { - method(x) { - } -} -const o = { a: 1 }; -const y = tslib_1.__assign({}, o); -const x = tslib_1.__rest(y, []); -//// [script.js] -class A { -} -class B extends A { -} -@dec -class C { - method(x) { - } -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.js.diff b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.js.diff deleted file mode 100644 index 0ac6654328..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.js.diff +++ /dev/null @@ -1,77 +0,0 @@ ---- old.importHelpersNoHelpers.js -+++ new.importHelpersNoHelpers.js -@@= skipped -44, +44 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.B = exports.A = void 0; --var tslib_1 = require("tslib"); -+const tslib_1 = require("tslib"); - tslib_1.__exportStar(require("./other"), exports); - class A { - } -@@= skipped -8, +8 lines =@@ - class B extends A { - } - exports.B = B; --let C = (() => { -- let C = class C { -- method(x) { -- } -- }; -- tslib_1.__decorate([ -- tslib_1.__param(0, dec), -- tslib_1.__metadata("design:type", Function), -- tslib_1.__metadata("design:paramtypes", [Number]), -- tslib_1.__metadata("design:returntype", void 0) -- ], C.prototype, "method", null); -- C = tslib_1.__decorate([ -- dec -- ], C); -- return C; --})(); -+@dec -+class C { -+ method(x) { -+ } -+} - const o = { a: 1 }; - const y = tslib_1.__assign({}, o); - const x = tslib_1.__rest(y, []); - //// [script.js] --var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { -- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; -- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); -- 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 __metadata = (this && this.__metadata) || function (k, v) { -- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); --}; --var __param = (this && this.__param) || function (paramIndex, decorator) { -- return function (target, key) { decorator(target, key, paramIndex); } --}; - class A { - } - class B extends A { - } --let C = (() => { -- let C = class C { -- method(x) { -- } -- }; -- __decorate([ -- __param(0, dec), -- __metadata("design:type", Function), -- __metadata("design:paramtypes", [Number]), -- __metadata("design:returntype", void 0) -- ], C.prototype, "method", null); -- C = __decorate([ -- dec -- ], C); -- return C; --})(); -+@dec -+class C { -+ method(x) { -+ } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.symbols b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.symbols deleted file mode 100644 index 787d61d0f6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.symbols +++ /dev/null @@ -1,71 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpers.ts] //// - -=== external.ts === -export * from "./other"; -export class A { } ->A : Symbol(A, Decl(external.ts, 0, 24)) - -export class B extends A { } ->B : Symbol(B, Decl(external.ts, 1, 18)) ->A : Symbol(A, Decl(external.ts, 0, 24)) - -declare var dec: any; ->dec : Symbol(dec, Decl(external.ts, 4, 11)) - -@dec ->dec : Symbol(dec, Decl(external.ts, 4, 11)) - -class C { ->C : Symbol(C, Decl(external.ts, 4, 21)) - - method(@dec x: number) { ->method : Symbol(C.method, Decl(external.ts, 7, 9)) ->dec : Symbol(dec, Decl(external.ts, 4, 11)) ->x : Symbol(x, Decl(external.ts, 8, 11)) - } -} - -const o = { a: 1 }; ->o : Symbol(o, Decl(external.ts, 12, 5)) ->a : Symbol(a, Decl(external.ts, 12, 11)) - -const y = { ...o }; ->y : Symbol(y, Decl(external.ts, 13, 5)) ->o : Symbol(o, Decl(external.ts, 12, 5)) - -const { ...x } = y; ->x : Symbol(x, Decl(external.ts, 14, 7)) ->y : Symbol(y, Decl(external.ts, 13, 5)) - -=== other.ts === -export const x = 1; ->x : Symbol(x, Decl(other.ts, 0, 12)) - -=== script.ts === -class A { } ->A : Symbol(A, Decl(script.ts, 0, 0)) - -class B extends A { } ->B : Symbol(B, Decl(script.ts, 0, 11)) ->A : Symbol(A, Decl(script.ts, 0, 0)) - -declare var dec: any; ->dec : Symbol(dec, Decl(script.ts, 3, 11)) - -@dec ->dec : Symbol(dec, Decl(script.ts, 3, 11)) - -class C { ->C : Symbol(C, Decl(script.ts, 3, 21)) - - method(@dec x: number) { ->method : Symbol(C.method, Decl(script.ts, 6, 9)) ->dec : Symbol(dec, Decl(script.ts, 3, 11)) ->x : Symbol(x, Decl(script.ts, 7, 11)) - } -} - -=== tslib.d.ts === - -export {} - diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.types b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.types deleted file mode 100644 index a1fa560625..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpers.types +++ /dev/null @@ -1,75 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpers.ts] //// - -=== external.ts === -export * from "./other"; -export class A { } ->A : A - -export class B extends A { } ->B : B ->A : A - -declare var dec: any; ->dec : any - -@dec ->dec : any - -class C { ->C : C - - method(@dec x: number) { ->method : (x: number) => void ->dec : any ->x : number - } -} - -const o = { a: 1 }; ->o : { a: number; } ->{ a: 1 } : { a: number; } ->a : number ->1 : 1 - -const y = { ...o }; ->y : { a: number; } ->{ ...o } : { a: number; } ->o : { a: number; } - -const { ...x } = y; ->x : { a: number; } ->y : { a: number; } - -=== other.ts === -export const x = 1; ->x : 1 ->1 : 1 - -=== script.ts === -class A { } ->A : A - -class B extends A { } ->B : B ->A : A - -declare var dec: any; ->dec : any - -@dec ->dec : any - -class C { ->C : C - - method(@dec x: number) { ->method : (x: number) => void ->dec : any ->x : number - } -} - -=== tslib.d.ts === - -export {} - diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.errors.txt.diff deleted file mode 100644 index 251577a030..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.errors.txt.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.importHelpersNoHelpersForAsyncGenerators.errors.txt -+++ new.importHelpersNoHelpersForAsyncGenerators.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(1,25): error TS2343: This syntax requires an imported helper named '__asyncGenerator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(1,25): error TS2343: This syntax requires an imported helper named '__await' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(1,25): error TS2343: This syntax requires an imported helper named '__generator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncDelegator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncValues' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (5 errors) ==== -- export async function * f() { -- ~ --!!! error TS2343: This syntax requires an imported helper named '__asyncGenerator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~ --!!! error TS2343: This syntax requires an imported helper named '__await' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~ --!!! error TS2343: This syntax requires an imported helper named '__generator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- await 1; -- yield 2; -- yield* [3]; -- ~~~~~ --!!! error TS2343: This syntax requires an imported helper named '__asyncDelegator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~~ --!!! error TS2343: This syntax requires an imported helper named '__asyncValues' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.js b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.js deleted file mode 100644 index 7d563b778a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.js +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpersForAsyncGenerators.ts] //// - -//// [main.ts] -export async function * f() { - await 1; - yield 2; - yield* [3]; -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.f = f; -async function* f() { - await 1; - yield 2; - yield* [3]; -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.js.diff b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.js.diff deleted file mode 100644 index 623b1326fc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.js.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.importHelpersNoHelpersForAsyncGenerators.js -+++ new.importHelpersNoHelpersForAsyncGenerators.js -@@= skipped -14, +14 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.f = f; --var tslib_1 = require("tslib"); --function f() { -- return tslib_1.__asyncGenerator(this, arguments, function* f_1() { -- yield tslib_1.__await(1); -- yield yield tslib_1.__await(2); -- yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues([3]))); -- }); -+async function* f() { -+ await 1; -+ yield 2; -+ yield* [3]; - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.symbols b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.symbols deleted file mode 100644 index 30c0590218..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.symbols +++ /dev/null @@ -1,15 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpersForAsyncGenerators.ts] //// - -=== main.ts === -export async function * f() { ->f : Symbol(f, Decl(main.ts, 0, 0)) - - await 1; - yield 2; - yield* [3]; -} - -=== tslib.d.ts === - -export {} - diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.types b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.types deleted file mode 100644 index 3d7e2647df..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForAsyncGenerators.types +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpersForAsyncGenerators.ts] //// - -=== main.ts === -export async function * f() { ->f : () => AsyncGenerator - - await 1; ->await 1 : 1 ->1 : 1 - - yield 2; ->yield 2 : any ->2 : 2 - - yield* [3]; ->yield* [3] : any ->[3] : number[] ->3 : 3 -} - -=== tslib.d.ts === - -export {} - diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.errors.txt.diff deleted file mode 100644 index 631943e825..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.importHelpersNoHelpersForPrivateFields.errors.txt -+++ new.importHelpersNoHelpersForPrivateFields.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(4,9): error TS2343: This syntax requires an imported helper named '__classPrivateFieldSet' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,23): error TS2343: This syntax requires an imported helper named '__classPrivateFieldGet' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(5,9): error TS2343: This syntax requires an imported helper named '__classPrivateFieldIn' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export class Foo { -- #field = true; -- f() { -- this.#field = this.#field; -- ~~~~~~~~~~~ --!!! error TS2343: This syntax requires an imported helper named '__classPrivateFieldSet' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~~~~~~~~ --!!! error TS2343: This syntax requires an imported helper named '__classPrivateFieldGet' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- #field in this; -- ~~~~~~ --!!! error TS2343: This syntax requires an imported helper named '__classPrivateFieldIn' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.js b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.js deleted file mode 100644 index 47dadd336e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.js +++ /dev/null @@ -1,27 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpersForPrivateFields.ts] //// - -//// [main.ts] -export class Foo { - #field = true; - f() { - this.#field = this.#field; - #field in this; - } -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.Foo = void 0; -class Foo { - #field = true; - f() { - this.#field = this.#field; - #field in this; - } -} -exports.Foo = Foo; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.js.diff b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.js.diff deleted file mode 100644 index 21b9d7c63b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.js.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.importHelpersNoHelpersForPrivateFields.js -+++ new.importHelpersNoHelpersForPrivateFields.js -@@= skipped -14, +14 lines =@@ - - //// [main.js] - "use strict"; --var _Foo_field; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.Foo = void 0; --const tslib_1 = require("tslib"); - class Foo { -- constructor() { -- _Foo_field.set(this, true); -- } -+ #field = true; - f() { -- tslib_1.__classPrivateFieldSet(this, _Foo_field, tslib_1.__classPrivateFieldGet(this, _Foo_field, "f"), "f"); -- tslib_1.__classPrivateFieldIn(_Foo_field, this); -+ this.#field = this.#field; -+ #field in this; - } - } - exports.Foo = Foo; --_Foo_field = new WeakMap(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.symbols b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.symbols deleted file mode 100644 index 6e306866c6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.symbols +++ /dev/null @@ -1,28 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpersForPrivateFields.ts] //// - -=== main.ts === -export class Foo { ->Foo : Symbol(Foo, Decl(main.ts, 0, 0)) - - #field = true; ->#field : Symbol(Foo.#field, Decl(main.ts, 0, 18)) - - f() { ->f : Symbol(Foo.f, Decl(main.ts, 1, 18)) - - this.#field = this.#field; ->this.#field : Symbol(Foo.#field, Decl(main.ts, 0, 18)) ->this : Symbol(Foo, Decl(main.ts, 0, 0)) ->this.#field : Symbol(Foo.#field, Decl(main.ts, 0, 18)) ->this : Symbol(Foo, Decl(main.ts, 0, 0)) - - #field in this; ->#field : Symbol(Foo.#field, Decl(main.ts, 0, 18)) ->this : Symbol(Foo, Decl(main.ts, 0, 0)) - } -} - -=== tslib.d.ts === - -export {} - diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.types b/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.types deleted file mode 100644 index 56db496360..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoHelpersForPrivateFields.types +++ /dev/null @@ -1,31 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoHelpersForPrivateFields.ts] //// - -=== main.ts === -export class Foo { ->Foo : Foo - - #field = true; ->#field : boolean ->true : true - - f() { ->f : () => void - - this.#field = this.#field; ->this.#field = this.#field : boolean ->this.#field : boolean ->this : this ->this.#field : boolean ->this : this - - #field in this; ->#field in this : boolean ->#field : any ->this : this - } -} - -=== tslib.d.ts === - -export {} - diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.errors.txt.diff deleted file mode 100644 index 7d4467114f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.errors.txt.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- old.importHelpersNoModule.errors.txt -+++ new.importHelpersNoModule.errors.txt -@@= skipped -0, +0 lines =@@ --external.ts(2,16): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found. -- -- --==== external.ts (1 errors) ==== -- export class A { } -- export class B extends A { } -- ~~~~~~~~~ --!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found. -- -- declare var dec: any; -- -- @dec -- class C { -- method(@dec x: number) { -- } -- } -- --==== script.ts (0 errors) ==== -- class A { } -- class B extends A { } -- -- declare var dec: any; -- -- @dec -- class C { -- method(@dec x: number) { -- } -- } -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.js b/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.js deleted file mode 100644 index 70c25909d3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.js +++ /dev/null @@ -1,52 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoModule.ts] //// - -//// [external.ts] -export class A { } -export class B extends A { } - -declare var dec: any; - -@dec -class C { - method(@dec x: number) { - } -} - -//// [script.ts] -class A { } -class B extends A { } - -declare var dec: any; - -@dec -class C { - method(@dec x: number) { - } -} - - -//// [external.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.B = exports.A = void 0; -class A { -} -exports.A = A; -class B extends A { -} -exports.B = B; -@dec -class C { - method(x) { - } -} -//// [script.js] -class A { -} -class B extends A { -} -@dec -class C { - method(x) { - } -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.js.diff b/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.js.diff deleted file mode 100644 index aa0453ed96..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.js.diff +++ /dev/null @@ -1,72 +0,0 @@ ---- old.importHelpersNoModule.js -+++ new.importHelpersNoModule.js -@@= skipped -28, +28 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.B = exports.A = void 0; --var tslib_1 = require("tslib"); - class A { - } - exports.A = A; - class B extends A { - } - exports.B = B; --let C = (() => { -- let C = class C { -- method(x) { -- } -- }; -- tslib_1.__decorate([ -- tslib_1.__param(0, dec), -- tslib_1.__metadata("design:type", Function), -- tslib_1.__metadata("design:paramtypes", [Number]), -- tslib_1.__metadata("design:returntype", void 0) -- ], C.prototype, "method", null); -- C = tslib_1.__decorate([ -- dec -- ], C); -- return C; --})(); -+@dec -+class C { -+ method(x) { -+ } -+} - //// [script.js] --var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { -- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; -- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); -- 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 __metadata = (this && this.__metadata) || function (k, v) { -- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); --}; --var __param = (this && this.__param) || function (paramIndex, decorator) { -- return function (target, key) { decorator(target, key, paramIndex); } --}; - class A { - } - class B extends A { - } --let C = (() => { -- let C = class C { -- method(x) { -- } -- }; -- __decorate([ -- __param(0, dec), -- __metadata("design:type", Function), -- __metadata("design:paramtypes", [Number]), -- __metadata("design:returntype", void 0) -- ], C.prototype, "method", null); -- C = __decorate([ -- dec -- ], C); -- return C; --})(); -+@dec -+class C { -+ method(x) { -+ } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.symbols b/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.symbols deleted file mode 100644 index 684f87cd57..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.symbols +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoModule.ts] //// - -=== external.ts === -export class A { } ->A : Symbol(A, Decl(external.ts, 0, 0)) - -export class B extends A { } ->B : Symbol(B, Decl(external.ts, 0, 18)) ->A : Symbol(A, Decl(external.ts, 0, 0)) - -declare var dec: any; ->dec : Symbol(dec, Decl(external.ts, 3, 11)) - -@dec ->dec : Symbol(dec, Decl(external.ts, 3, 11)) - -class C { ->C : Symbol(C, Decl(external.ts, 3, 21)) - - method(@dec x: number) { ->method : Symbol(C.method, Decl(external.ts, 6, 9)) ->dec : Symbol(dec, Decl(external.ts, 3, 11)) ->x : Symbol(x, Decl(external.ts, 7, 11)) - } -} - -=== script.ts === -class A { } ->A : Symbol(A, Decl(script.ts, 0, 0)) - -class B extends A { } ->B : Symbol(B, Decl(script.ts, 0, 11)) ->A : Symbol(A, Decl(script.ts, 0, 0)) - -declare var dec: any; ->dec : Symbol(dec, Decl(script.ts, 3, 11)) - -@dec ->dec : Symbol(dec, Decl(script.ts, 3, 11)) - -class C { ->C : Symbol(C, Decl(script.ts, 3, 21)) - - method(@dec x: number) { ->method : Symbol(C.method, Decl(script.ts, 6, 9)) ->dec : Symbol(dec, Decl(script.ts, 3, 11)) ->x : Symbol(x, Decl(script.ts, 7, 11)) - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.types b/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.types deleted file mode 100644 index fd4e40576b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersNoModule.types +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/compiler/importHelpersNoModule.ts] //// - -=== external.ts === -export class A { } ->A : A - -export class B extends A { } ->B : B ->A : A - -declare var dec: any; ->dec : any - -@dec ->dec : any - -class C { ->C : C - - method(@dec x: number) { ->method : (x: number) => void ->dec : any ->x : number - } -} - -=== script.ts === -class A { } ->A : A - -class B extends A { } ->B : B ->A : A - -declare var dec: any; ->dec : any - -@dec ->dec : any - -class C { ->C : C - - method(@dec x: number) { ->method : (x: number) => void ->dec : any ->x : number - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).js deleted file mode 100644 index 31beae743c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).js +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -//// [a.ts] -export class A { } - -//// [b.ts] -export * as a from "./a"; - -//// [tslib.d.ts] -declare module "tslib" { - function __importStar(m: any): void; -} - -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.A = void 0; -class A { -} -exports.A = A; -//// [b.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -exports.a = require("./a"); diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).symbols deleted file mode 100644 index 97555e2107..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).symbols +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -export * as a from "./a"; ->a : Symbol(a, Decl(b.ts, 0, 6)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; ->__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 26)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).symbols.diff deleted file mode 100644 index d85648207f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).symbols -+++ new.importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).symbols -@@= skipped -9, +9 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; -->__importStar : Symbol(__importStar, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 26)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types deleted file mode 100644 index f5df44496d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=commonjs).types +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : A - -=== b.ts === -export * as a from "./a"; ->a : typeof import("a") - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importStar(m: any): void; ->__importStar : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).js deleted file mode 100644 index 68116bf951..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).js +++ /dev/null @@ -1,19 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -//// [a.ts] -export class A { } - -//// [b.ts] -export * as a from "./a"; - -//// [tslib.d.ts] -declare module "tslib" { - function __importStar(m: any): void; -} - -//// [a.js] -export class A { -} -//// [b.js] -import * as a_1 from "./a"; -export { a_1 as a }; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).symbols deleted file mode 100644 index 97555e2107..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).symbols +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -export * as a from "./a"; ->a : Symbol(a, Decl(b.ts, 0, 6)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; ->__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 26)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).symbols.diff deleted file mode 100644 index b9bb3ff358..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).symbols -+++ new.importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).symbols -@@= skipped -9, +9 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; -->__importStar : Symbol(__importStar, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 26)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types deleted file mode 100644 index f5df44496d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2015).types +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : A - -=== b.ts === -export * as a from "./a"; ->a : typeof import("a") - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importStar(m: any): void; ->__importStar : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).js deleted file mode 100644 index 28e70a903d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).js +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -//// [a.ts] -export class A { } - -//// [b.ts] -export * as a from "./a"; - -//// [tslib.d.ts] -declare module "tslib" { - function __importStar(m: any): void; -} - -//// [a.js] -export class A { -} -//// [b.js] -export * as a from "./a"; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).symbols deleted file mode 100644 index 97555e2107..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).symbols +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -export * as a from "./a"; ->a : Symbol(a, Decl(b.ts, 0, 6)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; ->__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 26)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).symbols.diff deleted file mode 100644 index e3bdde4826..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).symbols -+++ new.importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).symbols -@@= skipped -9, +9 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; -->__importStar : Symbol(__importStar, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 26)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types deleted file mode 100644 index f5df44496d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithExportStarAs(esmoduleinterop=false,module=es2020).types +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithExportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : A - -=== b.ts === -export * as a from "./a"; ->a : typeof import("a") - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importStar(m: any): void; ->__importStar : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).js deleted file mode 100644 index ea14d2e7de..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).js +++ /dev/null @@ -1,32 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -//// [a.ts] -export default class { } - -//// [b.ts] -export { default } from "./a"; -export { default as a } from "./a"; -import { default as b } from "./a"; -void b; - -//// [tslib.d.ts] -declare module "tslib" { - function __importDefault(m: any): void; -} - -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -class default_1 { -} -exports.default = default_1; -//// [b.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = exports.default = void 0; -const a_1 = require("./a"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return a_1.default; } }); -const a_2 = require("./a"); -Object.defineProperty(exports, "a", { enumerable: true, get: function () { return a_2.default; } }); -const a_3 = require("./a"); -void a_3.default; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).js.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).js.diff deleted file mode 100644 index eb54926434..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).js.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).js -+++ new.importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).js -@@= skipped -23, +23 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.a = exports.default = void 0; --var a_1 = require("./a"); -+const a_1 = require("./a"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { return a_1.default; } }); --var a_2 = require("./a"); -+const a_2 = require("./a"); - Object.defineProperty(exports, "a", { enumerable: true, get: function () { return a_2.default; } }); - const a_3 = require("./a"); - void a_3.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).symbols deleted file mode 100644 index 59499f9085..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).symbols +++ /dev/null @@ -1,29 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -=== a.ts === - -export default class { } - -=== b.ts === -export { default } from "./a"; ->default : Symbol(default, Decl(b.ts, 0, 8)) - -export { default as a } from "./a"; ->default : Symbol(b, Decl(a.ts, 0, 0)) ->a : Symbol(a, Decl(b.ts, 1, 8)) - -import { default as b } from "./a"; ->default : Symbol(b, Decl(a.ts, 0, 0)) ->b : Symbol(b, Decl(b.ts, 2, 8)) - -void b; ->b : Symbol(b, Decl(b.ts, 2, 8)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importDefault(m: any): void; ->__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 29)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).symbols.diff deleted file mode 100644 index 50f126b9d6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).symbols -+++ new.importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).symbols -@@= skipped -20, +20 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importDefault(m: any): void; -->__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 29)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types deleted file mode 100644 index 8bd28a2027..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=commonjs).types +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -=== a.ts === - -export default class { } - -=== b.ts === -export { default } from "./a"; ->default : typeof b - -export { default as a } from "./a"; ->default : typeof b ->a : typeof b - -import { default as b } from "./a"; ->default : typeof b ->b : typeof b - -void b; ->void b : undefined ->b : typeof b - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importDefault(m: any): void; ->__importDefault : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).js deleted file mode 100644 index cb24120cb6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -//// [a.ts] -export default class { } - -//// [b.ts] -export { default } from "./a"; -export { default as a } from "./a"; -import { default as b } from "./a"; -void b; - -//// [tslib.d.ts] -declare module "tslib" { - function __importDefault(m: any): void; -} - -//// [a.js] -export default class { -} -//// [b.js] -export { default } from "./a"; -export { default as a } from "./a"; -import { default as b } from "./a"; -void b; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).symbols deleted file mode 100644 index 59499f9085..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).symbols +++ /dev/null @@ -1,29 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -=== a.ts === - -export default class { } - -=== b.ts === -export { default } from "./a"; ->default : Symbol(default, Decl(b.ts, 0, 8)) - -export { default as a } from "./a"; ->default : Symbol(b, Decl(a.ts, 0, 0)) ->a : Symbol(a, Decl(b.ts, 1, 8)) - -import { default as b } from "./a"; ->default : Symbol(b, Decl(a.ts, 0, 0)) ->b : Symbol(b, Decl(b.ts, 2, 8)) - -void b; ->b : Symbol(b, Decl(b.ts, 2, 8)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importDefault(m: any): void; ->__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 29)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).symbols.diff deleted file mode 100644 index 3a06a2d40e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).symbols -+++ new.importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).symbols -@@= skipped -20, +20 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importDefault(m: any): void; -->__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 29)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types deleted file mode 100644 index 8bd28a2027..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2015).types +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -=== a.ts === - -export default class { } - -=== b.ts === -export { default } from "./a"; ->default : typeof b - -export { default as a } from "./a"; ->default : typeof b ->a : typeof b - -import { default as b } from "./a"; ->default : typeof b ->b : typeof b - -void b; ->void b : undefined ->b : typeof b - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importDefault(m: any): void; ->__importDefault : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).js deleted file mode 100644 index cb24120cb6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -//// [a.ts] -export default class { } - -//// [b.ts] -export { default } from "./a"; -export { default as a } from "./a"; -import { default as b } from "./a"; -void b; - -//// [tslib.d.ts] -declare module "tslib" { - function __importDefault(m: any): void; -} - -//// [a.js] -export default class { -} -//// [b.js] -export { default } from "./a"; -export { default as a } from "./a"; -import { default as b } from "./a"; -void b; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).symbols deleted file mode 100644 index 59499f9085..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).symbols +++ /dev/null @@ -1,29 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -=== a.ts === - -export default class { } - -=== b.ts === -export { default } from "./a"; ->default : Symbol(default, Decl(b.ts, 0, 8)) - -export { default as a } from "./a"; ->default : Symbol(b, Decl(a.ts, 0, 0)) ->a : Symbol(a, Decl(b.ts, 1, 8)) - -import { default as b } from "./a"; ->default : Symbol(b, Decl(a.ts, 0, 0)) ->b : Symbol(b, Decl(b.ts, 2, 8)) - -void b; ->b : Symbol(b, Decl(b.ts, 2, 8)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importDefault(m: any): void; ->__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 29)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).symbols.diff deleted file mode 100644 index afbb243031..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).symbols -+++ new.importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).symbols -@@= skipped -20, +20 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importDefault(m: any): void; -->__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importDefault : Symbol(__importDefault, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 29)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types deleted file mode 100644 index 8bd28a2027..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportOrExportDefault(esmoduleinterop=false,module=es2020).types +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportOrExportDefault.ts] //// - -=== a.ts === - -export default class { } - -=== b.ts === -export { default } from "./a"; ->default : typeof b - -export { default as a } from "./a"; ->default : typeof b ->a : typeof b - -import { default as b } from "./a"; ->default : typeof b ->b : typeof b - -void b; ->void b : undefined ->b : typeof b - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importDefault(m: any): void; ->__importDefault : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).js deleted file mode 100644 index 8ecadfeab3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).js +++ /dev/null @@ -1,27 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -//// [a.ts] -export class A { } - -//// [b.ts] -import * as a from "./a"; -export { a }; - -//// [tslib.d.ts] -declare module "tslib" { - function __importStar(m: any): void; -} - -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.A = void 0; -class A { -} -exports.A = A; -//// [b.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.a = void 0; -const a = require("./a"); -exports.a = a; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).symbols deleted file mode 100644 index 06d0f645fd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).symbols +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -import * as a from "./a"; ->a : Symbol(a, Decl(b.ts, 0, 6)) - -export { a }; ->a : Symbol(a, Decl(b.ts, 1, 8)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; ->__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 26)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).symbols.diff deleted file mode 100644 index 76a8ac6ca0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).symbols -+++ new.importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).symbols -@@= skipped -12, +12 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; -->__importStar : Symbol(__importStar, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 26)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types deleted file mode 100644 index 40e598a9cc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=commonjs).types +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : A - -=== b.ts === -import * as a from "./a"; ->a : typeof a - -export { a }; ->a : typeof a - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importStar(m: any): void; ->__importStar : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).js deleted file mode 100644 index c08ff68957..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).js +++ /dev/null @@ -1,20 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -//// [a.ts] -export class A { } - -//// [b.ts] -import * as a from "./a"; -export { a }; - -//// [tslib.d.ts] -declare module "tslib" { - function __importStar(m: any): void; -} - -//// [a.js] -export class A { -} -//// [b.js] -import * as a from "./a"; -export { a }; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).symbols deleted file mode 100644 index 06d0f645fd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).symbols +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -import * as a from "./a"; ->a : Symbol(a, Decl(b.ts, 0, 6)) - -export { a }; ->a : Symbol(a, Decl(b.ts, 1, 8)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; ->__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 26)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).symbols.diff deleted file mode 100644 index 29b6b9d4b1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).symbols -+++ new.importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).symbols -@@= skipped -12, +12 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; -->__importStar : Symbol(__importStar, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 26)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types deleted file mode 100644 index 40e598a9cc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2015).types +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : A - -=== b.ts === -import * as a from "./a"; ->a : typeof a - -export { a }; ->a : typeof a - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importStar(m: any): void; ->__importStar : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).js deleted file mode 100644 index c08ff68957..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).js +++ /dev/null @@ -1,20 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -//// [a.ts] -export class A { } - -//// [b.ts] -import * as a from "./a"; -export { a }; - -//// [tslib.d.ts] -declare module "tslib" { - function __importStar(m: any): void; -} - -//// [a.js] -export class A { -} -//// [b.js] -import * as a from "./a"; -export { a }; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).symbols b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).symbols deleted file mode 100644 index 06d0f645fd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).symbols +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -import * as a from "./a"; ->a : Symbol(a, Decl(b.ts, 0, 6)) - -export { a }; ->a : Symbol(a, Decl(b.ts, 1, 8)) - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; ->__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) ->m : Symbol(m, Decl(tslib.d.ts, 1, 26)) -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).symbols.diff b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).symbols.diff deleted file mode 100644 index d59be423e4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).symbols.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).symbols -+++ new.importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).symbols -@@= skipped -12, +12 lines =@@ - - === tslib.d.ts === - declare module "tslib" { -->"tslib" : Symbol("tslib", Decl(tslib.d.ts, --, --)) -+>"tslib" : Symbol("tslib", Decl(tslib.d.ts, 0, 0)) - - function __importStar(m: any): void; -->__importStar : Symbol(__importStar, Decl(tslib.d.ts, --, --)) -->m : Symbol(m, Decl(tslib.d.ts, --, --)) -+>__importStar : Symbol(__importStar, Decl(tslib.d.ts, 0, 24)) -+>m : Symbol(m, Decl(tslib.d.ts, 1, 26)) - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types b/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types deleted file mode 100644 index 40e598a9cc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithImportStarAs(esmoduleinterop=false,module=es2020).types +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/importHelpersWithImportStarAs.ts] //// - -=== a.ts === -export class A { } ->A : A - -=== b.ts === -import * as a from "./a"; ->a : typeof a - -export { a }; ->a : typeof a - -=== tslib.d.ts === -declare module "tslib" { ->"tslib" : typeof import("tslib") - - function __importStar(m: any): void; ->__importStar : (m: any) => void ->m : any -} diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithLocalCollisions(module=commonjs).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithLocalCollisions(module=commonjs).js index 5499da070a..cc1242f528 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithLocalCollisions(module=commonjs).js +++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithLocalCollisions(module=commonjs).js @@ -9,7 +9,7 @@ declare var dec: any, __decorate: any; const o = { a: 1 }; const y = { ...o }; -//// [tslib.d.ts] +//// [index.d.ts] export declare function __extends(d: Function, b: Function): void; export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; export declare function __param(paramIndex: number, decorator: Function): Function; diff --git a/testdata/baselines/reference/submodule/compiler/importHelpersWithLocalCollisions(module=es2015).js b/testdata/baselines/reference/submodule/compiler/importHelpersWithLocalCollisions(module=es2015).js index 36fb70701c..8f7015dcd2 100644 --- a/testdata/baselines/reference/submodule/compiler/importHelpersWithLocalCollisions(module=es2015).js +++ b/testdata/baselines/reference/submodule/compiler/importHelpersWithLocalCollisions(module=es2015).js @@ -9,7 +9,7 @@ declare var dec: any, __decorate: any; const o = { a: 1 }; const y = { ...o }; -//// [tslib.d.ts] +//// [index.d.ts] export declare function __extends(d: Function, b: Function): void; export declare function __decorate(decorators: Function[], target: any, key?: string | symbol, desc?: any): any; export declare function __param(paramIndex: number, decorator: Function): Function; diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.errors.txt deleted file mode 100644 index 66f586f133..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -a.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. -b.js(1,10): error TS2596: 'Foo' can only be imported by turning on the 'esModuleInterop' flag and using a default import. -b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'allowSyntheticDefaultImports' flag and referencing its default export. - - -==== a.ts (1 errors) ==== - class Foo {} - export = Foo; - ~~~~~~~~~~~~~ -!!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. - -==== b.js (2 errors) ==== - import { Foo } from './a'; - ~~~ -!!! error TS2596: 'Foo' can only be imported by turning on the 'esModuleInterop' flag and using a default import. - ~~~~~ -!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'allowSyntheticDefaultImports' flag and referencing its default export. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.symbols b/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.symbols deleted file mode 100644 index 7c5af0d0ca..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.symbols +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember10.ts] //// - -=== a.ts === -class Foo {} ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -export = Foo; ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -=== b.js === -import { Foo } from './a'; ->Foo : Symbol(Foo, Decl(b.js, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.types b/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.types deleted file mode 100644 index c1b3848239..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember10.types +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember10.ts] //// - -=== a.ts === -class Foo {} ->Foo : Foo - -export = Foo; ->Foo : Foo - -=== b.js === -import { Foo } from './a'; ->Foo : any - diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt deleted file mode 100644 index d4294bc523..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -b.ts(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import. -b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export. - - -==== a.ts (0 errors) ==== - class Foo {} - export = Foo; - -==== b.ts (2 errors) ==== - import { Foo } from './a'; - ~~~ -!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import. - ~~~~~ -!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.js b/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.js deleted file mode 100644 index 89c572f288..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.js +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember4.ts] //// - -//// [a.ts] -class Foo {} -export = Foo; - -//// [b.ts] -import { Foo } from './a'; - -//// [a.js] -"use strict"; -class Foo { -} -module.exports = Foo; -//// [b.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.symbols b/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.symbols deleted file mode 100644 index 7f94a2da7b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.symbols +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember4.ts] //// - -=== a.ts === -class Foo {} ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -export = Foo; ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -=== b.ts === -import { Foo } from './a'; ->Foo : Symbol(Foo, Decl(b.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.types b/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.types deleted file mode 100644 index cedd4d61f8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember4.types +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember4.ts] //// - -=== a.ts === -class Foo {} ->Foo : Foo - -export = Foo; ->Foo : Foo - -=== b.ts === -import { Foo } from './a'; ->Foo : any - diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.errors.txt deleted file mode 100644 index 07938b7690..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -a.ts(2,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. -b.ts(1,10): error TS2596: 'Foo' can only be imported by turning on the 'esModuleInterop' flag and using a default import. -b.ts(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'allowSyntheticDefaultImports' flag and referencing its default export. - - -==== a.ts (1 errors) ==== - class Foo {} - export = Foo; - ~~~~~~~~~~~~~ -!!! error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. - -==== b.ts (2 errors) ==== - import { Foo } from './a'; - ~~~ -!!! error TS2596: 'Foo' can only be imported by turning on the 'esModuleInterop' flag and using a default import. - ~~~~~ -!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'allowSyntheticDefaultImports' flag and referencing its default export. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.js b/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.js deleted file mode 100644 index 8eed26d3c4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.js +++ /dev/null @@ -1,15 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember6.ts] //// - -//// [a.ts] -class Foo {} -export = Foo; - -//// [b.ts] -import { Foo } from './a'; - -//// [a.js] -class Foo { -} -export {}; -//// [b.js] -export {}; diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.symbols b/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.symbols deleted file mode 100644 index fe60c83021..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.symbols +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember6.ts] //// - -=== a.ts === -class Foo {} ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -export = Foo; ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -=== b.ts === -import { Foo } from './a'; ->Foo : Symbol(Foo, Decl(b.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.types b/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.types deleted file mode 100644 index b03c41a7c7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember6.types +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember6.ts] //// - -=== a.ts === -class Foo {} ->Foo : Foo - -export = Foo; ->Foo : Foo - -=== b.ts === -import { Foo } from './a'; ->Foo : any - diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.errors.txt b/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.errors.txt deleted file mode 100644 index 5b9b99ac88..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -b.js(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import. -b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export. - - -==== a.ts (0 errors) ==== - class Foo {} - export = Foo; - -==== b.js (2 errors) ==== - import { Foo } from './a'; - ~~~ -!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import. - ~~~~~ -!!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.symbols b/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.symbols deleted file mode 100644 index 3e39a58b8c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.symbols +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember8.ts] //// - -=== a.ts === -class Foo {} ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -export = Foo; ->Foo : Symbol(Foo, Decl(a.ts, 0, 0)) - -=== b.js === -import { Foo } from './a'; ->Foo : Symbol(Foo, Decl(b.js, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.types b/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.types deleted file mode 100644 index 7a3b7891fc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/importNonExportedMember8.types +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/importNonExportedMember8.ts] //// - -=== a.ts === -class Foo {} ->Foo : Foo - -export = Foo; ->Foo : Foo - -=== b.js === -import { Foo } from './a'; ->Foo : any - diff --git a/testdata/baselines/reference/submodule/compiler/importNotElidedWhenNotFound.js b/testdata/baselines/reference/submodule/compiler/importNotElidedWhenNotFound.js index d0c75d19d0..c2d68df4e3 100644 --- a/testdata/baselines/reference/submodule/compiler/importNotElidedWhenNotFound.js +++ b/testdata/baselines/reference/submodule/compiler/importNotElidedWhenNotFound.js @@ -21,16 +21,19 @@ class Q extends Z { //// [importNotElidedWhenNotFound.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const file_1 = require("file"); -const other_file_1 = require("other_file"); +const file_1 = __importDefault(require("file")); +const other_file_1 = __importDefault(require("other_file")); class Y extends other_file_1.default { constructor() { super(file_1.default); } } -const file2_1 = require("file2"); -const file3_1 = require("file3"); +const file2_1 = __importDefault(require("file2")); +const file3_1 = __importDefault(require("file3")); class Q extends other_file_1.default { constructor() { super(file2_1.default, file3_1.default); diff --git a/testdata/baselines/reference/submodule/compiler/importNotElidedWhenNotFound.js.diff b/testdata/baselines/reference/submodule/compiler/importNotElidedWhenNotFound.js.diff index 0e3fd5bab2..a1c8b307f5 100644 --- a/testdata/baselines/reference/submodule/compiler/importNotElidedWhenNotFound.js.diff +++ b/testdata/baselines/reference/submodule/compiler/importNotElidedWhenNotFound.js.diff @@ -1,22 +1,22 @@ --- old.importNotElidedWhenNotFound.js +++ new.importNotElidedWhenNotFound.js -@@= skipped -21, +21 lines =@@ - //// [importNotElidedWhenNotFound.js] - "use strict"; +@@= skipped -24, +24 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var file_1 = require("file"); --var other_file_1 = require("other_file"); -+const file_1 = require("file"); -+const other_file_1 = require("other_file"); +-var file_1 = __importDefault(require("file")); +-var other_file_1 = __importDefault(require("other_file")); ++const file_1 = __importDefault(require("file")); ++const other_file_1 = __importDefault(require("other_file")); class Y extends other_file_1.default { constructor() { super(file_1.default); } } --var file2_1 = require("file2"); --var file3_1 = require("file3"); -+const file2_1 = require("file2"); -+const file3_1 = require("file3"); +-var file2_1 = __importDefault(require("file2")); +-var file3_1 = __importDefault(require("file3")); ++const file2_1 = __importDefault(require("file2")); ++const file3_1 = __importDefault(require("file3")); class Q extends other_file_1.default { constructor() { super(file2_1.default, file3_1.default); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/importWithTrailingSlash.js b/testdata/baselines/reference/submodule/compiler/importWithTrailingSlash.js index 334836a3a3..4626869c56 100644 --- a/testdata/baselines/reference/submodule/compiler/importWithTrailingSlash.js +++ b/testdata/baselines/reference/submodule/compiler/importWithTrailingSlash.js @@ -29,15 +29,21 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = { aIndex: 0 }; //// [test.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const _1 = require("."); -const _2 = require("./"); +const _1 = __importDefault(require(".")); +const _2 = __importDefault(require("./")); _1.default.a; _2.default.aIndex; //// [test.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const __1 = require(".."); -const __2 = require("../"); +const __1 = __importDefault(require("..")); +const __2 = __importDefault(require("../")); __1.default.a; __2.default.aIndex; diff --git a/testdata/baselines/reference/submodule/compiler/importWithTrailingSlash.js.diff b/testdata/baselines/reference/submodule/compiler/importWithTrailingSlash.js.diff index ae54250a75..930c371999 100644 --- a/testdata/baselines/reference/submodule/compiler/importWithTrailingSlash.js.diff +++ b/testdata/baselines/reference/submodule/compiler/importWithTrailingSlash.js.diff @@ -1,21 +1,23 @@ --- old.importWithTrailingSlash.js +++ new.importWithTrailingSlash.js -@@= skipped -29, +29 lines =@@ - //// [test.js] - "use strict"; +@@= skipped -32, +32 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var _1 = require("."); --var _2 = require("./"); -+const _1 = require("."); -+const _2 = require("./"); +-var _1 = __importDefault(require(".")); +-var _2 = __importDefault(require("./")); ++const _1 = __importDefault(require(".")); ++const _2 = __importDefault(require("./")); _1.default.a; _2.default.aIndex; //// [test.js] - "use strict"; +@@= skipped -10, +10 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var __1 = require(".."); --var __2 = require("../"); -+const __1 = require(".."); -+const __2 = require("../"); +-var __1 = __importDefault(require("..")); +-var __2 = __importDefault(require("../")); ++const __1 = __importDefault(require("..")); ++const __2 = __importDefault(require("../")); __1.default.a; __2.default.aIndex; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/incrementalOut.errors.txt b/testdata/baselines/reference/submodule/compiler/incrementalOut.errors.txt deleted file mode 100644 index 387178c402..0000000000 --- a/testdata/baselines/reference/submodule/compiler/incrementalOut.errors.txt +++ /dev/null @@ -1,8 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== incrementalOut.ts (0 errors) ==== - const x = 10; - - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/incrementalOut.symbols b/testdata/baselines/reference/submodule/compiler/incrementalOut.symbols deleted file mode 100644 index 6a32ed5bdd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/incrementalOut.symbols +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/incrementalOut.ts] //// - -=== incrementalOut.ts === -const x = 10; ->x : Symbol(x, Decl(incrementalOut.ts, 0, 5)) - - diff --git a/testdata/baselines/reference/submodule/compiler/incrementalOut.types b/testdata/baselines/reference/submodule/compiler/incrementalOut.types deleted file mode 100644 index f1bfa2c6ad..0000000000 --- a/testdata/baselines/reference/submodule/compiler/incrementalOut.types +++ /dev/null @@ -1,8 +0,0 @@ -//// [tests/cases/compiler/incrementalOut.ts] //// - -=== incrementalOut.ts === -const x = 10; ->x : 10 ->10 : 10 - - diff --git a/testdata/baselines/reference/submodule/compiler/inferredIndexerOnNamespaceImport.js b/testdata/baselines/reference/submodule/compiler/inferredIndexerOnNamespaceImport.js index 91d9830d45..8e99cd0ce8 100644 --- a/testdata/baselines/reference/submodule/compiler/inferredIndexerOnNamespaceImport.js +++ b/testdata/baselines/reference/submodule/compiler/inferredIndexerOnNamespaceImport.js @@ -21,8 +21,41 @@ exports.x = 3; exports.y = 5; //// [bar.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const foo = require("./foo"); +const foo = __importStar(require("./foo")); function f(map) { // ... } diff --git a/testdata/baselines/reference/submodule/compiler/inferredIndexerOnNamespaceImport.js.diff b/testdata/baselines/reference/submodule/compiler/inferredIndexerOnNamespaceImport.js.diff index 9e0dd6d45f..ae812667a8 100644 --- a/testdata/baselines/reference/submodule/compiler/inferredIndexerOnNamespaceImport.js.diff +++ b/testdata/baselines/reference/submodule/compiler/inferredIndexerOnNamespaceImport.js.diff @@ -1,11 +1,11 @@ --- old.inferredIndexerOnNamespaceImport.js +++ new.inferredIndexerOnNamespaceImport.js -@@= skipped -21, +21 lines =@@ - //// [bar.js] - "use strict"; +@@= skipped -54, +54 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var foo = require("./foo"); -+const foo = require("./foo"); +-var foo = __importStar(require("./foo")); ++const foo = __importStar(require("./foo")); function f(map) { // ... } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.errors.txt b/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.errors.txt deleted file mode 100644 index 6578302a29..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'. -error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'. -!!! error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== inlineSourceMap2.ts (0 errors) ==== - // configuration errors - - var x = 0; - console.log(x); - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.symbols b/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.symbols deleted file mode 100644 index 8cd650b50c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/inlineSourceMap2.ts] //// - -=== inlineSourceMap2.ts === -// configuration errors - -var x = 0; ->x : Symbol(x, Decl(inlineSourceMap2.ts, 2, 3)) - -console.log(x); ->console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->console : Symbol(console, Decl(lib.dom.d.ts, --, --)) ->log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->x : Symbol(x, Decl(inlineSourceMap2.ts, 2, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.types b/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.types deleted file mode 100644 index 7dee271a14..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSourceMap2.types +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/inlineSourceMap2.ts] //// - -=== inlineSourceMap2.ts === -// configuration errors - -var x = 0; ->x : number ->0 : 0 - -console.log(x); ->console.log(x) : void ->console.log : (...data: any[]) => void ->console : Console ->log : (...data: any[]) => void ->x : number - diff --git a/testdata/baselines/reference/submodule/compiler/inlineSources.errors.txt b/testdata/baselines/reference/submodule/compiler/inlineSources.errors.txt deleted file mode 100644 index aa0cba9278..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSources.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - var a = 0; - console.log(a); - -==== b.ts (0 errors) ==== - var b = 0; - console.log(b); - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/inlineSources.symbols b/testdata/baselines/reference/submodule/compiler/inlineSources.symbols deleted file mode 100644 index 5a31c811cc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSources.symbols +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/inlineSources.ts] //// - -=== a.ts === -var a = 0; ->a : Symbol(a, Decl(a.ts, 0, 3)) - -console.log(a); ->console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->console : Symbol(console, Decl(lib.dom.d.ts, --, --)) ->log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->a : Symbol(a, Decl(a.ts, 0, 3)) - -=== b.ts === -var b = 0; ->b : Symbol(b, Decl(b.ts, 0, 3)) - -console.log(b); ->console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->console : Symbol(console, Decl(lib.dom.d.ts, --, --)) ->log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->b : Symbol(b, Decl(b.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/inlineSources.types b/testdata/baselines/reference/submodule/compiler/inlineSources.types deleted file mode 100644 index d6ff6f2c02..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSources.types +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/inlineSources.ts] //// - -=== a.ts === -var a = 0; ->a : number ->0 : 0 - -console.log(a); ->console.log(a) : void ->console.log : (...data: any[]) => void ->console : Console ->log : (...data: any[]) => void ->a : number - -=== b.ts === -var b = 0; ->b : number ->0 : 0 - -console.log(b); ->console.log(b) : void ->console.log : (...data: any[]) => void ->console : Console ->log : (...data: any[]) => void ->b : number - diff --git a/testdata/baselines/reference/submodule/compiler/inlineSources2.errors.txt b/testdata/baselines/reference/submodule/compiler/inlineSources2.errors.txt deleted file mode 100644 index aa0cba9278..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSources2.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - var a = 0; - console.log(a); - -==== b.ts (0 errors) ==== - var b = 0; - console.log(b); - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/inlineSources2.symbols b/testdata/baselines/reference/submodule/compiler/inlineSources2.symbols deleted file mode 100644 index 9519a2aa4a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSources2.symbols +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/inlineSources2.ts] //// - -=== a.ts === -var a = 0; ->a : Symbol(a, Decl(a.ts, 0, 3)) - -console.log(a); ->console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->console : Symbol(console, Decl(lib.dom.d.ts, --, --)) ->log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->a : Symbol(a, Decl(a.ts, 0, 3)) - -=== b.ts === -var b = 0; ->b : Symbol(b, Decl(b.ts, 0, 3)) - -console.log(b); ->console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->console : Symbol(console, Decl(lib.dom.d.ts, --, --)) ->log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->b : Symbol(b, Decl(b.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/inlineSources2.types b/testdata/baselines/reference/submodule/compiler/inlineSources2.types deleted file mode 100644 index 19444ec813..0000000000 --- a/testdata/baselines/reference/submodule/compiler/inlineSources2.types +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/inlineSources2.ts] //// - -=== a.ts === -var a = 0; ->a : number ->0 : 0 - -console.log(a); ->console.log(a) : void ->console.log : (...data: any[]) => void ->console : Console ->log : (...data: any[]) => void ->a : number - -=== b.ts === -var b = 0; ->b : number ->0 : 0 - -console.log(b); ->console.log(b) : void ->console.log : (...data: any[]) => void ->console : Console ->log : (...data: any[]) => void ->b : number - diff --git a/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.errors.txt b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.errors.txt new file mode 100644 index 0000000000..2c1cad0c9c --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.errors.txt @@ -0,0 +1,75 @@ +interfaceDeclaration3.ts(7,16): error TS2416: Property 'item' in type 'C1' is not assignable to the same property in base type 'I1'. + Type 'number' is not assignable to type 'string'. +interfaceDeclaration3.ts(32,16): error TS2416: Property 'item' in type 'C1' is not assignable to the same property in base type 'I1'. + Type 'number' is not assignable to type 'string'. +interfaceDeclaration3.ts(54,11): error TS2430: Interface 'I2' incorrectly extends interface 'I1'. + Types of property 'item' are incompatible. + Type 'string' is not assignable to type 'number'. + + +==== interfaceDeclaration3.ts (3 errors) ==== + interface I1 { item:number; } + + module M1 { + interface I1 { item:string; } + interface I2 { item:number; } + class C1 implements I1 { + public item:number; + ~~~~ +!!! error TS2416: Property 'item' in type 'C1' is not assignable to the same property in base type 'I1'. +!!! error TS2416: Type 'number' is not assignable to type 'string'. + } + class C2 implements I1 { + public item:string; + } + class C3 implements I2 { + public item:number; + } + + class C4 implements M2.I1 { + public item:string; + } + + class C5 implements M2.M3.I1 { + public item:string; + } + } + + export module M2 { + export interface I1 { item:string; } + export interface I2 { item:string; } + export module M3 { + export interface I1 { item:string; } + } + class C1 implements I1 { + public item:number; + ~~~~ +!!! error TS2416: Property 'item' in type 'C1' is not assignable to the same property in base type 'I1'. +!!! error TS2416: Type 'number' is not assignable to type 'string'. + } + class C2 implements I1 { + public item:string; + } + class C3 implements I2 { + public item:string; + } + } + + class C1 implements I1 { + public item:number; + } + + class C2 implements M2.I1 { + public item:string; + } + + class C3 implements M2.M3.I1 { + public item:string; + } + + interface I2 extends I1 { item:string; } + ~~ +!!! error TS2430: Interface 'I2' incorrectly extends interface 'I1'. +!!! error TS2430: Types of property 'item' are incompatible. +!!! error TS2430: Type 'string' is not assignable to type 'number'. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.js b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.js new file mode 100644 index 0000000000..bbc73c51f6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.js @@ -0,0 +1,102 @@ +//// [tests/cases/compiler/interfaceDeclaration3.ts] //// + +//// [interfaceDeclaration3.ts] +interface I1 { item:number; } + +module M1 { + interface I1 { item:string; } + interface I2 { item:number; } + class C1 implements I1 { + public item:number; + } + class C2 implements I1 { + public item:string; + } + class C3 implements I2 { + public item:number; + } + + class C4 implements M2.I1 { + public item:string; + } + + class C5 implements M2.M3.I1 { + public item:string; + } +} + +export module M2 { + export interface I1 { item:string; } + export interface I2 { item:string; } + export module M3 { + export interface I1 { item:string; } + } + class C1 implements I1 { + public item:number; + } + class C2 implements I1 { + public item:string; + } + class C3 implements I2 { + public item:string; + } +} + +class C1 implements I1 { + public item:number; +} + +class C2 implements M2.I1 { + public item:string; +} + +class C3 implements M2.M3.I1 { + public item:string; +} + +interface I2 extends I1 { item:string; } + + +//// [interfaceDeclaration3.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.M2 = void 0; +var M1; +(function (M1) { + class C1 { + item; + } + class C2 { + item; + } + class C3 { + item; + } + class C4 { + item; + } + class C5 { + item; + } +})(M1 || (M1 = {})); +var M2; +(function (M2) { + class C1 { + item; + } + class C2 { + item; + } + class C3 { + item; + } +})(M2 || (exports.M2 = M2 = {})); +class C1 { + item; +} +class C2 { + item; +} +class C3 { + item; +} diff --git a/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.js.diff b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.js.diff new file mode 100644 index 0000000000..45af37db82 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.js.diff @@ -0,0 +1,42 @@ +--- old.interfaceDeclaration3.js ++++ new.interfaceDeclaration3.js +@@= skipped -63, +63 lines =@@ + var M1; + (function (M1) { + class C1 { ++ item; + } + class C2 { ++ item; + } + class C3 { ++ item; + } + class C4 { ++ item; + } + class C5 { ++ item; + } + })(M1 || (M1 = {})); + var M2; + (function (M2) { + class C1 { ++ item; + } + class C2 { ++ item; + } + class C3 { ++ item; + } + })(M2 || (exports.M2 = M2 = {})); + class C1 { ++ item; + } + class C2 { ++ item; + } + class C3 { ++ item; + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.symbols b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.symbols new file mode 100644 index 0000000000..35e3dd71ea --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.symbols @@ -0,0 +1,139 @@ +//// [tests/cases/compiler/interfaceDeclaration3.ts] //// + +=== interfaceDeclaration3.ts === +interface I1 { item:number; } +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 0, 0)) +>item : Symbol(I1.item, Decl(interfaceDeclaration3.ts, 0, 14)) + +module M1 { +>M1 : Symbol(M1, Decl(interfaceDeclaration3.ts, 0, 29)) + + interface I1 { item:string; } +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 11)) +>item : Symbol(I1.item, Decl(interfaceDeclaration3.ts, 3, 18)) + + interface I2 { item:number; } +>I2 : Symbol(I2, Decl(interfaceDeclaration3.ts, 3, 33)) +>item : Symbol(I2.item, Decl(interfaceDeclaration3.ts, 4, 18)) + + class C1 implements I1 { +>C1 : Symbol(C1, Decl(interfaceDeclaration3.ts, 4, 33)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 11)) + + public item:number; +>item : Symbol(C1.item, Decl(interfaceDeclaration3.ts, 5, 28)) + } + class C2 implements I1 { +>C2 : Symbol(C2, Decl(interfaceDeclaration3.ts, 7, 5)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 2, 11)) + + public item:string; +>item : Symbol(C2.item, Decl(interfaceDeclaration3.ts, 8, 28)) + } + class C3 implements I2 { +>C3 : Symbol(C3, Decl(interfaceDeclaration3.ts, 10, 5)) +>I2 : Symbol(I2, Decl(interfaceDeclaration3.ts, 3, 33)) + + public item:number; +>item : Symbol(C3.item, Decl(interfaceDeclaration3.ts, 11, 28)) + } + + class C4 implements M2.I1 { +>C4 : Symbol(C4, Decl(interfaceDeclaration3.ts, 13, 5)) +>M2.I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) +>I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 18)) + + public item:string; +>item : Symbol(C4.item, Decl(interfaceDeclaration3.ts, 15, 31)) + } + + class C5 implements M2.M3.I1 { +>C5 : Symbol(C5, Decl(interfaceDeclaration3.ts, 17, 5)) +>M2.M3.I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 22)) +>M2.M3 : Symbol(M2.M3, Decl(interfaceDeclaration3.ts, 26, 40)) +>M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) +>M3 : Symbol(M2.M3, Decl(interfaceDeclaration3.ts, 26, 40)) +>I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 22)) + + public item:string; +>item : Symbol(C5.item, Decl(interfaceDeclaration3.ts, 19, 34)) + } +} + +export module M2 { +>M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) + + export interface I1 { item:string; } +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>item : Symbol(I1.item, Decl(interfaceDeclaration3.ts, 25, 25)) + + export interface I2 { item:string; } +>I2 : Symbol(I2, Decl(interfaceDeclaration3.ts, 25, 40)) +>item : Symbol(I2.item, Decl(interfaceDeclaration3.ts, 26, 25)) + + export module M3 { +>M3 : Symbol(M3, Decl(interfaceDeclaration3.ts, 26, 40)) + + export interface I1 { item:string; } +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 27, 22)) +>item : Symbol(I1.item, Decl(interfaceDeclaration3.ts, 28, 29)) + } + class C1 implements I1 { +>C1 : Symbol(C1, Decl(interfaceDeclaration3.ts, 29, 5)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 18)) + + public item:number; +>item : Symbol(C1.item, Decl(interfaceDeclaration3.ts, 30, 28)) + } + class C2 implements I1 { +>C2 : Symbol(C2, Decl(interfaceDeclaration3.ts, 32, 5)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 24, 18)) + + public item:string; +>item : Symbol(C2.item, Decl(interfaceDeclaration3.ts, 33, 28)) + } + class C3 implements I2 { +>C3 : Symbol(C3, Decl(interfaceDeclaration3.ts, 35, 5)) +>I2 : Symbol(I2, Decl(interfaceDeclaration3.ts, 25, 40)) + + public item:string; +>item : Symbol(C3.item, Decl(interfaceDeclaration3.ts, 36, 28)) + } +} + +class C1 implements I1 { +>C1 : Symbol(C1, Decl(interfaceDeclaration3.ts, 39, 1)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 0, 0)) + + public item:number; +>item : Symbol(C1.item, Decl(interfaceDeclaration3.ts, 41, 24)) +} + +class C2 implements M2.I1 { +>C2 : Symbol(C2, Decl(interfaceDeclaration3.ts, 43, 1)) +>M2.I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 18)) +>M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) +>I1 : Symbol(M2.I1, Decl(interfaceDeclaration3.ts, 24, 18)) + + public item:string; +>item : Symbol(C2.item, Decl(interfaceDeclaration3.ts, 45, 27)) +} + +class C3 implements M2.M3.I1 { +>C3 : Symbol(C3, Decl(interfaceDeclaration3.ts, 47, 1)) +>M2.M3.I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 22)) +>M2.M3 : Symbol(M2.M3, Decl(interfaceDeclaration3.ts, 26, 40)) +>M2 : Symbol(M2, Decl(interfaceDeclaration3.ts, 22, 1)) +>M3 : Symbol(M2.M3, Decl(interfaceDeclaration3.ts, 26, 40)) +>I1 : Symbol(M2.M3.I1, Decl(interfaceDeclaration3.ts, 27, 22)) + + public item:string; +>item : Symbol(C3.item, Decl(interfaceDeclaration3.ts, 49, 30)) +} + +interface I2 extends I1 { item:string; } +>I2 : Symbol(I2, Decl(interfaceDeclaration3.ts, 51, 1)) +>I1 : Symbol(I1, Decl(interfaceDeclaration3.ts, 0, 0)) +>item : Symbol(I2.item, Decl(interfaceDeclaration3.ts, 53, 25)) + diff --git a/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.types b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.types new file mode 100644 index 0000000000..4fffc4d967 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceDeclaration3.types @@ -0,0 +1,114 @@ +//// [tests/cases/compiler/interfaceDeclaration3.ts] //// + +=== interfaceDeclaration3.ts === +interface I1 { item:number; } +>item : number + +module M1 { +>M1 : typeof M1 + + interface I1 { item:string; } +>item : string + + interface I2 { item:number; } +>item : number + + class C1 implements I1 { +>C1 : C1 + + public item:number; +>item : number + } + class C2 implements I1 { +>C2 : C2 + + public item:string; +>item : string + } + class C3 implements I2 { +>C3 : C3 + + public item:number; +>item : number + } + + class C4 implements M2.I1 { +>C4 : C4 +>M2 : typeof M2 + + public item:string; +>item : string + } + + class C5 implements M2.M3.I1 { +>C5 : C5 +>M2.M3 : any +>M2 : typeof M2 +>M3 : any + + public item:string; +>item : string + } +} + +export module M2 { +>M2 : typeof M2 + + export interface I1 { item:string; } +>item : string + + export interface I2 { item:string; } +>item : string + + export module M3 { + export interface I1 { item:string; } +>item : string + } + class C1 implements I1 { +>C1 : C1 + + public item:number; +>item : number + } + class C2 implements I1 { +>C2 : C2 + + public item:string; +>item : string + } + class C3 implements I2 { +>C3 : C3 + + public item:string; +>item : string + } +} + +class C1 implements I1 { +>C1 : C1 + + public item:number; +>item : number +} + +class C2 implements M2.I1 { +>C2 : C2 +>M2 : typeof M2 + + public item:string; +>item : string +} + +class C3 implements M2.M3.I1 { +>C3 : C3 +>M2.M3 : any +>M2 : typeof M2 +>M3 : any + + public item:string; +>item : string +} + +interface I2 extends I1 { item:string; } +>item : string + diff --git a/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.errors.txt b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.errors.txt new file mode 100644 index 0000000000..ce5a76fbbe --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.errors.txt @@ -0,0 +1,38 @@ +interfaceImplementation6.ts(9,7): error TS2420: Class 'C2' incorrectly implements interface 'I1'. + Property 'item' is private in type 'C2' but not in type 'I1'. +interfaceImplementation6.ts(13,7): error TS2420: Class 'C3' incorrectly implements interface 'I1'. + Property 'item' is missing in type 'C3' but required in type 'I1'. + + +==== interfaceImplementation6.ts (2 errors) ==== + interface I1 { + item:number; + } + + class C1 implements I1 { + public item:number; + } + + class C2 implements I1 { + ~~ +!!! error TS2420: Class 'C2' incorrectly implements interface 'I1'. +!!! error TS2420: Property 'item' is private in type 'C2' but not in type 'I1'. + private item:number; + } + + class C3 implements I1 { + ~~ +!!! error TS2420: Class 'C3' incorrectly implements interface 'I1'. +!!! error TS2420: Property 'item' is missing in type 'C3' but required in type 'I1'. +!!! related TS2728 interfaceImplementation6.ts:2:5: 'item' is declared here. + constructor() { + var item: number; + } + } + + export class Test { + private pt: I1 = { item: 1 }; + } + + + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.js b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.js new file mode 100644 index 0000000000..46c62d1756 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.js @@ -0,0 +1,47 @@ +//// [tests/cases/compiler/interfaceImplementation6.ts] //// + +//// [interfaceImplementation6.ts] +interface I1 { + item:number; +} + +class C1 implements I1 { + public item:number; +} + +class C2 implements I1 { + private item:number; +} + +class C3 implements I1 { + constructor() { + var item: number; + } +} + +export class Test { + private pt: I1 = { item: 1 }; +} + + + + +//// [interfaceImplementation6.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.Test = void 0; +class C1 { + item; +} +class C2 { + item; +} +class C3 { + constructor() { + var item; + } +} +class Test { + pt = { item: 1 }; +} +exports.Test = Test; diff --git a/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.js.diff b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.js.diff new file mode 100644 index 0000000000..1a9caca8bc --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.js.diff @@ -0,0 +1,23 @@ +--- old.interfaceImplementation6.js ++++ new.interfaceImplementation6.js +@@= skipped -30, +30 lines =@@ + Object.defineProperty(exports, "__esModule", { value: true }); + exports.Test = void 0; + class C1 { ++ item; + } + class C2 { ++ item; + } + class C3 { + constructor() { +@@= skipped -9, +11 lines =@@ + } + } + class Test { +- constructor() { +- this.pt = { item: 1 }; +- } ++ pt = { item: 1 }; + } + exports.Test = Test; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.symbols b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.symbols new file mode 100644 index 0000000000..fa42f15472 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.symbols @@ -0,0 +1,47 @@ +//// [tests/cases/compiler/interfaceImplementation6.ts] //// + +=== interfaceImplementation6.ts === +interface I1 { +>I1 : Symbol(I1, Decl(interfaceImplementation6.ts, 0, 0)) + + item:number; +>item : Symbol(I1.item, Decl(interfaceImplementation6.ts, 0, 14)) +} + +class C1 implements I1 { +>C1 : Symbol(C1, Decl(interfaceImplementation6.ts, 2, 1)) +>I1 : Symbol(I1, Decl(interfaceImplementation6.ts, 0, 0)) + + public item:number; +>item : Symbol(C1.item, Decl(interfaceImplementation6.ts, 4, 24)) +} + +class C2 implements I1 { +>C2 : Symbol(C2, Decl(interfaceImplementation6.ts, 6, 1)) +>I1 : Symbol(I1, Decl(interfaceImplementation6.ts, 0, 0)) + + private item:number; +>item : Symbol(C2.item, Decl(interfaceImplementation6.ts, 8, 24)) +} + +class C3 implements I1 { +>C3 : Symbol(C3, Decl(interfaceImplementation6.ts, 10, 1)) +>I1 : Symbol(I1, Decl(interfaceImplementation6.ts, 0, 0)) + + constructor() { + var item: number; +>item : Symbol(item, Decl(interfaceImplementation6.ts, 14, 10)) + } +} + +export class Test { +>Test : Symbol(Test, Decl(interfaceImplementation6.ts, 16, 1)) + + private pt: I1 = { item: 1 }; +>pt : Symbol(Test.pt, Decl(interfaceImplementation6.ts, 18, 19)) +>I1 : Symbol(I1, Decl(interfaceImplementation6.ts, 0, 0)) +>item : Symbol(item, Decl(interfaceImplementation6.ts, 19, 22)) +} + + + diff --git a/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.types b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.types new file mode 100644 index 0000000000..8e842c8c5a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/interfaceImplementation6.types @@ -0,0 +1,43 @@ +//// [tests/cases/compiler/interfaceImplementation6.ts] //// + +=== interfaceImplementation6.ts === +interface I1 { + item:number; +>item : number +} + +class C1 implements I1 { +>C1 : C1 + + public item:number; +>item : number +} + +class C2 implements I1 { +>C2 : C2 + + private item:number; +>item : number +} + +class C3 implements I1 { +>C3 : C3 + + constructor() { + var item: number; +>item : number + } +} + +export class Test { +>Test : Test + + private pt: I1 = { item: 1 }; +>pt : I1 +>{ item: 1 } : { item: number; } +>item : number +>1 : 1 +} + + + diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt new file mode 100644 index 0000000000..ced31bd01b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.errors.txt @@ -0,0 +1,35 @@ +internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(1,1): error TS1185: Merge conflict marker encountered. +internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(3,1): error TS1185: Merge conflict marker encountered. +internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(5,1): error TS1185: Merge conflict marker encountered. +internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(7,1): error TS1185: Merge conflict marker encountered. +internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts(17,10): error TS2694: Namespace '"internalAliasInterfaceInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. + + +==== internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts (5 errors) ==== + <<<<<<< HEAD + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export module a { + ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export namespace a { + ======= + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export namespace a { + >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export interface I { + } + } + + export module c { + import b = a.I; + export var x: b; + } + + var x: c.b; + ~ +!!! error TS2694: Namespace '"internalAliasInterfaceInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js new file mode 100644 index 0000000000..bdb02a7e5d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js @@ -0,0 +1,30 @@ +//// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] //// + +//// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] +<<<<<<< HEAD +export module a { +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace a { +======= +export namespace a { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface I { + } +} + +export module c { + import b = a.I; + export var x: b; +} + +var x: c.b; + +//// [internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.c = void 0; +var c; +(function (c) { + var b = a.I; +})(c || (exports.c = c = {})); +var x; diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js.diff b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js.diff new file mode 100644 index 0000000000..8d05775abd --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js.diff @@ -0,0 +1,9 @@ +--- old.internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js ++++ new.internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.js +@@= skipped -24, +24 lines =@@ + exports.c = void 0; + var c; + (function (c) { ++ var b = a.I; + })(c || (exports.c = c = {})); + var x; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols new file mode 100644 index 0000000000..ef6118207d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.symbols @@ -0,0 +1,35 @@ +//// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] //// + +=== internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts === +<<<<<<< HEAD +export module a { +>a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) + +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace a { +======= +export namespace a { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface I { +>I : Symbol(I, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 1, 17)) + } +} + +export module c { +>c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 9, 1)) + + import b = a.I; +>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 11, 17)) +>a : Symbol(a, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) +>I : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 1, 17)) + + export var x: b; +>x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 13, 14)) +>b : Symbol(b, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 11, 17)) +} + +var x: c.b; +>x : Symbol(x, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 16, 3)) +>c : Symbol(c, Decl(internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts, 9, 1)) +>b : Symbol(c.b) + diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types new file mode 100644 index 0000000000..2e52ca27eb --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.types @@ -0,0 +1,30 @@ +//// [tests/cases/compiler/internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts] //// + +=== internalAliasInterfaceInsideLocalModuleWithoutExportAccessError.ts === +<<<<<<< HEAD +export module a { +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace a { +======= +export namespace a { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface I { + } +} + +export module c { +>c : typeof c + + import b = a.I; +>b : any +>a : any +>I : b + + export var x: b; +>x : b +} + +var x: c.b; +>x : c.b +>c : any + diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt new file mode 100644 index 0000000000..33c67eae2a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.errors.txt @@ -0,0 +1,42 @@ +internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(1,1): error TS1185: Merge conflict marker encountered. +internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(4,1): error TS1185: Merge conflict marker encountered. +internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(7,1): error TS1185: Merge conflict marker encountered. +internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(10,1): error TS1185: Merge conflict marker encountered. +internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts(24,17): error TS2694: Namespace '"internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. + + +==== internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts (5 errors) ==== + <<<<<<< HEAD + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export module a { + export module b { + ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export namespace a { + export namespace b { + ======= + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export namespace a { + export namespace b { + >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export interface I { + foo(); + } + } + } + + export module c { + import b = a.b; + export var x: b.I; + x.foo(); + } + + + export var z: c.b.I; + ~ +!!! error TS2694: Namespace '"internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError".c' has no exported member 'b'. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js new file mode 100644 index 0000000000..ead7ebc3ca --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js @@ -0,0 +1,37 @@ +//// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// + +//// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] +<<<<<<< HEAD +export module a { + export module b { +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace a { + export namespace b { +======= +export namespace a { + export namespace b { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface I { + foo(); + } + } +} + +export module c { + import b = a.b; + export var x: b.I; + x.foo(); +} + + +export var z: c.b.I; + +//// [internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.z = exports.c = void 0; +var c; +(function (c) { + var b = a.b; + c.x.foo(); +})(c || (exports.c = c = {})); diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js.diff b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js.diff new file mode 100644 index 0000000000..562b363ac5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js.diff @@ -0,0 +1,9 @@ +--- old.internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js ++++ new.internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.js +@@= skipped -31, +31 lines =@@ + exports.z = exports.c = void 0; + var c; + (function (c) { ++ var b = a.b; + c.x.foo(); + })(c || (exports.c = c = {})); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols new file mode 100644 index 0000000000..2deb9f3148 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.symbols @@ -0,0 +1,52 @@ +//// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// + +=== internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts === +<<<<<<< HEAD +export module a { +>a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) + + export module b { +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 17)) + +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace a { + export namespace b { +======= +export namespace a { + export namespace b { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface I { +>I : Symbol(I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 21)) + + foo(); +>foo : Symbol(I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 28)) + } + } +} + +export module c { +>c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 14, 1)) + + import b = a.b; +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 16, 17)) +>a : Symbol(a, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 0, 0)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 1, 17)) + + export var x: b.I; +>x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 18, 14)) +>b : Symbol(b, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 16, 17)) +>I : Symbol(b.I, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 2, 21)) + + x.foo(); +>x.foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 28)) +>x : Symbol(x, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 18, 14)) +>foo : Symbol(b.I.foo, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 10, 28)) +} + + +export var z: c.b.I; +>z : Symbol(z, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 23, 10)) +>c : Symbol(c, Decl(internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts, 14, 1)) +>b : Symbol(c.b) +>I : Symbol(c.b.I) + diff --git a/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types new file mode 100644 index 0000000000..f9a4162f19 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.types @@ -0,0 +1,45 @@ +//// [tests/cases/compiler/internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts] //// + +=== internalAliasUninitializedModuleInsideLocalModuleWithoutExportAccessError.ts === +<<<<<<< HEAD +export module a { + export module b { +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace a { + export namespace b { +======= +export namespace a { + export namespace b { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export interface I { + foo(); +>foo : () => any + } + } +} + +export module c { +>c : typeof c + + import b = a.b; +>b : any +>a : any +>b : any + + export var x: b.I; +>x : b.I +>b : any + + x.foo(); +>x.foo() : any +>x.foo : () => any +>x : b.I +>foo : () => any +} + + +export var z: c.b.I; +>z : c.b.I +>c : any +>b : any + diff --git a/testdata/baselines/reference/submodule/compiler/isolatedModulesExportDeclarationType.js b/testdata/baselines/reference/submodule/compiler/isolatedModulesExportDeclarationType.js index 5f68db0689..6b72a0a1e6 100644 --- a/testdata/baselines/reference/submodule/compiler/isolatedModulesExportDeclarationType.js +++ b/testdata/baselines/reference/submodule/compiler/isolatedModulesExportDeclarationType.js @@ -39,7 +39,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true }); //// [test4.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); // @ts-expect-error -const doesntexist_1 = require("./doesntexist"); +const doesntexist_1 = __importDefault(require("./doesntexist")); exports.default = doesntexist_1.default; diff --git a/testdata/baselines/reference/submodule/compiler/isolatedModulesExportDeclarationType.js.diff b/testdata/baselines/reference/submodule/compiler/isolatedModulesExportDeclarationType.js.diff index 1e89e725c7..9d7c080d06 100644 --- a/testdata/baselines/reference/submodule/compiler/isolatedModulesExportDeclarationType.js.diff +++ b/testdata/baselines/reference/submodule/compiler/isolatedModulesExportDeclarationType.js.diff @@ -1,9 +1,9 @@ --- old.isolatedModulesExportDeclarationType.js +++ new.isolatedModulesExportDeclarationType.js -@@= skipped -40, +40 lines =@@ - "use strict"; +@@= skipped -43, +43 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); // @ts-expect-error --var doesntexist_1 = require("./doesntexist"); -+const doesntexist_1 = require("./doesntexist"); +-var doesntexist_1 = __importDefault(require("./doesntexist")); ++const doesntexist_1 = __importDefault(require("./doesntexist")); exports.default = doesntexist_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/isolatedModulesImportExportElision.js b/testdata/baselines/reference/submodule/compiler/isolatedModulesImportExportElision.js index 43aa3ce8e0..e14f77fb88 100644 --- a/testdata/baselines/reference/submodule/compiler/isolatedModulesImportExportElision.js +++ b/testdata/baselines/reference/submodule/compiler/isolatedModulesImportExportElision.js @@ -16,11 +16,44 @@ export var z = x; //// [file1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.z = exports.c1 = void 0; const module_1 = require("module"); const module_2 = require("module"); -const ns = require("module"); +const ns = __importStar(require("module")); class C extends module_2.c2.C { } let x = new module_1.c(); diff --git a/testdata/baselines/reference/submodule/compiler/isolatedModulesImportExportElision.js.diff b/testdata/baselines/reference/submodule/compiler/isolatedModulesImportExportElision.js.diff index dc33b712bd..23c828b364 100644 --- a/testdata/baselines/reference/submodule/compiler/isolatedModulesImportExportElision.js.diff +++ b/testdata/baselines/reference/submodule/compiler/isolatedModulesImportExportElision.js.diff @@ -1,15 +1,15 @@ --- old.isolatedModulesImportExportElision.js +++ new.isolatedModulesImportExportElision.js -@@= skipped -17, +17 lines =@@ - "use strict"; +@@= skipped -50, +50 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.z = exports.c1 = void 0; -var module_1 = require("module"); -var module_2 = require("module"); --var ns = require("module"); +-var ns = __importStar(require("module")); +const module_1 = require("module"); +const module_2 = require("module"); -+const ns = require("module"); ++const ns = __importStar(require("module")); class C extends module_2.c2.C { } let x = new module_1.c(); diff --git a/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.js b/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.js index 896c355db4..eb2df0c95f 100644 --- a/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.js +++ b/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.js @@ -70,11 +70,44 @@ exports.C = C; Object.defineProperty(exports, "__esModule", { value: true }); //// [user.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.NS = exports.C = void 0; // OK, has a value side const exportValue_1 = require("./exportValue"); Object.defineProperty(exports, "C", { enumerable: true, get: function () { return exportValue_1.C; } }); // OK, even though the namespace it exports is only types. -const NS = require("./exportT"); +const NS = __importStar(require("./exportT")); exports.NS = NS; diff --git a/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.js.diff b/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.js.diff index 0b525d20bd..2aeca4fb61 100644 --- a/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.js.diff +++ b/testdata/baselines/reference/submodule/compiler/isolatedModulesReExportType.js.diff @@ -1,6 +1,6 @@ --- old.isolatedModulesReExportType.js +++ new.isolatedModulesReExportType.js -@@= skipped -72, +72 lines =@@ +@@= skipped -105, +105 lines =@@ Object.defineProperty(exports, "__esModule", { value: true }); exports.NS = exports.C = void 0; // OK, has a value side @@ -8,6 +8,6 @@ +const exportValue_1 = require("./exportValue"); Object.defineProperty(exports, "C", { enumerable: true, get: function () { return exportValue_1.C; } }); // OK, even though the namespace it exports is only types. --var NS = require("./exportT"); -+const NS = require("./exportT"); +-var NS = __importStar(require("./exportT")); ++const NS = __importStar(require("./exportT")); exports.NS = NS; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.errors.txt deleted file mode 100644 index db630a3221..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -error TS5055: Cannot write file 'a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.js (0 errors) ==== - class c { - method(a) { - let x = a => this.method(a); - } - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.symbols deleted file mode 100644 index d79e0966e5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.symbols +++ /dev/null @@ -1,20 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts] //// - -=== a.js === -class c { ->c : Symbol(c, Decl(a.js, 0, 0)) - - method(a) { ->method : Symbol(c.method, Decl(a.js, 0, 9)) ->a : Symbol(a, Decl(a.js, 1, 11)) - - let x = a => this.method(a); ->x : Symbol(x, Decl(a.js, 2, 11)) ->a : Symbol(a, Decl(a.js, 2, 15)) ->this.method : Symbol(c.method, Decl(a.js, 0, 9)) ->this : Symbol(c, Decl(a.js, 0, 0)) ->method : Symbol(c.method, Decl(a.js, 0, 9)) ->a : Symbol(a, Decl(a.js, 2, 15)) - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.types deleted file mode 100644 index 9e38800cb6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationClassMethodContainingArrowFunction.types +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationClassMethodContainingArrowFunction.ts] //// - -=== a.js === -class c { ->c : c - - method(a) { ->method : (a: any) => void ->a : any - - let x = a => this.method(a); ->x : (a: any) => void ->a => this.method(a) : (a: any) => void ->a : any ->this.method(a) : void ->this.method : (a: any) => void ->this : this ->method : (a: any) => void ->a : any - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.errors.txt deleted file mode 100644 index e246e2ba5d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -a.ts(1,10): error TS2393: Duplicate function implementation. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== b.js (0 errors) ==== - function foo() { - return 10; - } -==== a.ts (1 errors) ==== - function foo() { - ~~~ -!!! error TS2393: Duplicate function implementation. - return 30; - } - - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.symbols deleted file mode 100644 index 95e1a34d96..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.symbols +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts] //// - -=== b.js === -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0), Decl(a.ts, 0, 0)) - - return 10; -} -=== a.ts === -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0), Decl(a.ts, 0, 0)) - - return 30; -} - - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.types deleted file mode 100644 index a12a4b908e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementation.types +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementation.ts] //// - -=== b.js === -function foo() { ->foo : { (): number; (): number; } - - return 10; ->10 : 10 -} -=== a.ts === -function foo() { ->foo : { (): number; (): number; } - - return 30; ->30 : 30 -} - - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt deleted file mode 100644 index 2171b2715c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -a.ts(1,10): error TS2393: Duplicate function implementation. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (1 errors) ==== - function foo() { - ~~~ -!!! error TS2393: Duplicate function implementation. - return 30; - } - -==== b.js (0 errors) ==== - function foo() { - return 10; - } - - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.symbols deleted file mode 100644 index 56a11f9287..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts] //// - -=== a.ts === -function foo() { ->foo : Symbol(foo, Decl(a.ts, 0, 0), Decl(b.js, 0, 0)) - - return 30; -} - -=== b.js === -function foo() { ->foo : Symbol(foo, Decl(a.ts, 0, 0), Decl(b.js, 0, 0)) - - return 10; -} - - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.types deleted file mode 100644 index 8cf49d3bd1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.types +++ /dev/null @@ -1,19 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.ts] //// - -=== a.ts === -function foo() { ->foo : { (): number; (): number; } - - return 30; ->30 : 30 -} - -=== b.js === -function foo() { ->foo : { (): number; (): number; } - - return 10; ->10 : 10 -} - - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.errors.txt deleted file mode 100644 index 17fcb9ecac..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - var x = 10; - -==== b.js (0 errors) ==== - var x = "hello"; // Error is recorded here, but suppressed because the js file isn't checked - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.symbols deleted file mode 100644 index 6966b38384..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationDuplicateVariable.ts] //// - -=== a.ts === -var x = 10; ->x : Symbol(x, Decl(a.ts, 0, 3), Decl(b.js, 0, 3)) - -=== b.js === -var x = "hello"; // Error is recorded here, but suppressed because the js file isn't checked ->x : Symbol(x, Decl(a.ts, 0, 3), Decl(b.js, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.types deleted file mode 100644 index 0485264641..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariable.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationDuplicateVariable.ts] //// - -=== a.ts === -var x = 10; ->x : number ->10 : 10 - -=== b.js === -var x = "hello"; // Error is recorded here, but suppressed because the js file isn't checked ->x : number ->"hello" : "hello" - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.errors.txt deleted file mode 100644 index 9501bfbd57..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -a.ts(1,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'string', but here has type 'number'. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== b.js (0 errors) ==== - var x = "hello"; - -==== a.ts (1 errors) ==== - var x = 10; // Error reported - ~ -!!! error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'string', but here has type 'number'. -!!! related TS6203 b.js:1:5: 'x' was also declared here. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.symbols deleted file mode 100644 index d122fd9ec3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts] //// - -=== b.js === -var x = "hello"; ->x : Symbol(x, Decl(b.js, 0, 3), Decl(a.ts, 0, 3)) - -=== a.ts === -var x = 10; // Error reported ->x : Symbol(x, Decl(b.js, 0, 3), Decl(a.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.types deleted file mode 100644 index cabb99161d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationDuplicateVariableErrorReported.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationDuplicateVariableErrorReported.ts] //// - -=== b.js === -var x = "hello"; ->x : string ->"hello" : "hello" - -=== a.ts === -var x = 10; // Error reported ->x : string ->10 : 10 - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.errors.txt deleted file mode 100644 index e54b4b5efe..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class c { - } - -==== b.js (0 errors) ==== - function foo() { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.symbols deleted file mode 100644 index 427342522f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.symbols +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationEmitDeclarations.ts] //// - -=== a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== b.js === -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.types deleted file mode 100644 index 6a130e285c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitDeclarations.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationEmitDeclarations.ts] //// - -=== a.ts === -class c { ->c : c -} - -=== b.js === -function foo() { ->foo : () => void -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.errors.txt deleted file mode 100644 index 31f187a95a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.errors.txt +++ /dev/null @@ -1,25 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5055: Cannot write file 'c.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5055: Cannot write file 'c.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class c { - } - -==== b.js (0 errors) ==== - /// - function foo() { - } - -==== c.js (0 errors) ==== - function bar() { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.symbols deleted file mode 100644 index 587047e774..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.symbols +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts] //// - -=== a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== b.js === -/// -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0)) -} - -=== c.js === -function bar() { ->bar : Symbol(bar, Decl(c.js, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.types deleted file mode 100644 index 4c97cbff39..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationEmitTrippleSlashReference.types +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationEmitTrippleSlashReference.ts] //// - -=== a.ts === -class c { ->c : c -} - -=== b.js === -/// -function foo() { ->foo : () => void -} - -=== c.js === -function bar() { ->bar : () => void -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt deleted file mode 100644 index 2d0b682034..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -error TS5055: Cannot write file 'c.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'c.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class c { - } - -==== b.ts (0 errors) ==== - /// - function foo() { - } - -==== c.js (0 errors) ==== - function bar() { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols deleted file mode 100644 index 5f713588b9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.symbols +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts] //// - -=== a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== b.ts === -/// -function foo() { ->foo : Symbol(foo, Decl(b.ts, 0, 0)) -} - -=== c.js === -function bar() { ->bar : Symbol(bar, Decl(c.js, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types deleted file mode 100644 index 7d380f8968..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.types +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.ts] //// - -=== a.ts === -class c { ->c : c -} - -=== b.ts === -/// -function foo() { ->foo : () => void -} - -=== c.js === -function bar() { ->bar : () => void -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.errors.txt deleted file mode 100644 index 71d995fb16..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -error TS5055: Cannot write file 'a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.js (0 errors) ==== - function foo(a) { - for (let a = 0; a < 10; a++) { - // do something - } - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.symbols deleted file mode 100644 index 18994a6597..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.symbols +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts] //// - -=== a.js === -function foo(a) { ->foo : Symbol(foo, Decl(a.js, 0, 0)) ->a : Symbol(a, Decl(a.js, 0, 13)) - - for (let a = 0; a < 10; a++) { ->a : Symbol(a, Decl(a.js, 1, 12)) ->a : Symbol(a, Decl(a.js, 1, 12)) ->a : Symbol(a, Decl(a.js, 1, 12)) - - // do something - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.types deleted file mode 100644 index 0b5c583561..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetBeingRenamed.types +++ /dev/null @@ -1,20 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationLetBeingRenamed.ts] //// - -=== a.js === -function foo(a) { ->foo : (a: any) => void ->a : any - - for (let a = 0; a < 10; a++) { ->a : number ->0 : 0 ->a < 10 : boolean ->a : number ->10 : 10 ->a++ : number ->a : number - - // do something - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.errors.txt deleted file mode 100644 index b04087814f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== b.js (0 errors) ==== - let a = 10; - b = 30; - -==== a.ts (0 errors) ==== - let b = 30; - a = 10; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.symbols deleted file mode 100644 index e7327adb55..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.symbols +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts] //// - -=== b.js === -let a = 10; ->a : Symbol(a, Decl(b.js, 0, 3)) - -b = 30; ->b : Symbol(b, Decl(a.ts, 0, 3)) - -=== a.ts === -let b = 30; ->b : Symbol(b, Decl(a.ts, 0, 3)) - -a = 10; ->a : Symbol(a, Decl(b.js, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.types deleted file mode 100644 index e8596b8b46..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder.types +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationLetDeclarationOrder.ts] //// - -=== b.js === -let a = 10; ->a : number ->10 : 10 - -b = 30; ->b = 30 : 30 ->b : number ->30 : 30 - -=== a.ts === -let b = 30; ->b : number ->30 : 30 - -a = 10; ->a = 10 : 10 ->a : number ->10 : 10 - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.errors.txt deleted file mode 100644 index 6fcc471480..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.errors.txt +++ /dev/null @@ -1,15 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - let b = 30; - a = 10; -==== b.js (0 errors) ==== - let a = 10; - b = 30; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.symbols deleted file mode 100644 index 5f8fb8408f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.symbols +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts] //// - -=== a.ts === -let b = 30; ->b : Symbol(b, Decl(a.ts, 0, 3)) - -a = 10; ->a : Symbol(a, Decl(b.js, 0, 3)) - -=== b.js === -let a = 10; ->a : Symbol(a, Decl(b.js, 0, 3)) - -b = 30; ->b : Symbol(b, Decl(a.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.types deleted file mode 100644 index 77b87151ee..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationLetDeclarationOrder2.types +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationLetDeclarationOrder2.ts] //// - -=== a.ts === -let b = 30; ->b : number ->30 : 30 - -a = 10; ->a = 10 : 10 ->a : number ->10 : 10 - -=== b.js === -let a = 10; ->a : number ->10 : 10 - -b = 30; ->b = 30 : 30 ->b : number ->30 : 30 - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt deleted file mode 100644 index 0bc8b29be8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -error TS5055: Cannot write file 'c.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'c.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class c { - } - -==== b.ts (0 errors) ==== - /// - //no error on above reference since not emitting declarations - function foo() { - } - -==== c.js (0 errors) ==== - function bar() { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols deleted file mode 100644 index f9a7be2474..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.symbols +++ /dev/null @@ -1,19 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts] //// - -=== a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== b.ts === -/// -//no error on above reference since not emitting declarations -function foo() { ->foo : Symbol(foo, Decl(b.ts, 0, 0)) -} - -=== c.js === -function bar() { ->bar : Symbol(bar, Decl(c.js, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types deleted file mode 100644 index 6347d6b89b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.types +++ /dev/null @@ -1,19 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.ts] //// - -=== a.ts === -class c { ->c : c -} - -=== b.ts === -/// -//no error on above reference since not emitting declarations -function foo() { ->foo : () => void -} - -=== c.js === -function bar() { ->bar : () => void -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.errors.txt deleted file mode 100644 index 32c9cb870e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -/src/a.js(1,1): error TS8013: Non-null assertions can only be used in TypeScript files. - - -!!! error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /src/a.js (1 errors) ==== - 0! - ~~ -!!! error TS8013: Non-null assertions can only be used in TypeScript files. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.symbols deleted file mode 100644 index 1804a9bac8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationNonNullAssertion.ts] //// - -=== /src/a.js === - -0! - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.types deleted file mode 100644 index 8d2f97d97b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationNonNullAssertion.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationNonNullAssertion.ts] //// - -=== /src/a.js === -0! ->0! : 0 ->0 : 0 - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.errors.txt deleted file mode 100644 index 0a4d382583..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -error TS5055: Cannot write file 'a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.js (0 errors) ==== - function foo(...a) { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.symbols deleted file mode 100644 index 77e06465c1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.symbols +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationRestParameter.ts] //// - -=== a.js === -function foo(...a) { } ->foo : Symbol(foo, Decl(a.js, 0, 0)) ->a : Symbol(a, Decl(a.js, 0, 13)) - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.types deleted file mode 100644 index ace365e6e6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationRestParameter.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationRestParameter.ts] //// - -=== a.js === -function foo(...a) { } ->foo : (...a: any[]) => void ->a : any[] - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.errors.txt deleted file mode 100644 index d3d29142c5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -error TS5055: Cannot write file 'a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.js (0 errors) ==== - function foo() { - var a = 10; - var b = "Hello"; - return { - a, - b - }; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.symbols deleted file mode 100644 index 4cde6bb927..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.symbols +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationShortHandProperty.ts] //// - -=== a.js === -function foo() { ->foo : Symbol(foo, Decl(a.js, 0, 0)) - - var a = 10; ->a : Symbol(a, Decl(a.js, 1, 7)) - - var b = "Hello"; ->b : Symbol(b, Decl(a.js, 2, 7)) - - return { - a, ->a : Symbol(a, Decl(a.js, 3, 12)) - - b ->b : Symbol(b, Decl(a.js, 4, 10)) - - }; -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types deleted file mode 100644 index 163af24a00..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationShortHandProperty.types +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationShortHandProperty.ts] //// - -=== a.js === -function foo() { ->foo : () => { a: number; b: string; } - - var a = 10; ->a : number ->10 : 10 - - var b = "Hello"; ->b : string ->"Hello" : "Hello" - - return { ->{ a, b } : { a: number; b: string; } - - a, ->a : number - - b ->b : string - - }; -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationTypeAssertions.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationTypeAssertions.errors.txt deleted file mode 100644 index 852f133911..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationTypeAssertions.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -/src/a.js(1,6): error TS8016: Type assertion expressions can only be used in TypeScript files. -/src/a.js(2,10): error TS17008: JSX element 'string' has no corresponding closing tag. -/src/a.js(3,1): error TS1005: 'undefined; - ~~~~~~ -!!! error TS17008: JSX element 'string' has no corresponding closing tag. - - -!!! error TS1005: 'undefined; ->v : Symbol(v, Decl(a.js, 1, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationTypeAssertions.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationTypeAssertions.types deleted file mode 100644 index 161d671433..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationTypeAssertions.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationTypeAssertions.ts] //// - -=== /src/a.js === -0 as number; ->0 as number : number ->0 : 0 - -var v = undefined; ->v : any ->undefined; : any ->string : any - -> : any - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.errors.txt deleted file mode 100644 index e54b4b5efe..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class c { - } - -==== b.js (0 errors) ==== - function foo() { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.symbols deleted file mode 100644 index 047a93e777..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.symbols +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts] //// - -=== a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== b.js === -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.types deleted file mode 100644 index 1d05fbf535..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithEnabledCompositeOption.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationWithEnabledCompositeOption.ts] //// - -=== a.ts === -class c { ->c : c -} - -=== b.js === -function foo() { ->foo : () => void -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.errors.txt deleted file mode 100644 index e54b4b5efe..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class c { - } - -==== b.js (0 errors) ==== - function foo() { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.symbols deleted file mode 100644 index b0a7e0781e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.symbols +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationWithOut.ts] //// - -=== a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== b.js === -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.types deleted file mode 100644 index 14a06c2efd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOut.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationWithOut.ts] //// - -=== a.ts === -class c { ->c : c -} - -=== b.js === -function foo() { ->foo : () => void -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt deleted file mode 100644 index d18c2df691..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /a.ts (0 errors) ==== - class c { - } - -==== /b.d.ts (0 errors) ==== - declare function foo(): boolean; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.symbols deleted file mode 100644 index 83307d0418..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.symbols +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts] //// - -=== /a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== /b.d.ts === -declare function foo(): boolean; ->foo : Symbol(foo, Decl(b.d.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.types deleted file mode 100644 index 981206ee1f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.ts] //// - -=== /a.ts === -class c { ->c : c -} - -=== /b.d.ts === -declare function foo(): boolean; ->foo : () => boolean - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt deleted file mode 100644 index 863ab21fdb..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -error TS5055: Cannot write file '/b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file '/b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /a.ts (0 errors) ==== - class c { - } - -==== /b.js (0 errors) ==== - function foo() { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.symbols b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.symbols deleted file mode 100644 index aa24bde9fe..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.symbols +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts] //// - -=== /a.ts === -class c { ->c : Symbol(c, Decl(a.ts, 0, 0)) -} - -=== /b.js === -function foo() { ->foo : Symbol(foo, Decl(b.js, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.types b/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.types deleted file mode 100644 index 6003007983..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.ts] //// - -=== /a.ts === -class c { ->c : c -} - -=== /b.js === -function foo() { ->foo : () => void -} - diff --git a/testdata/baselines/reference/submodule/compiler/jsFileFunctionParametersAsOptional.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileFunctionParametersAsOptional.errors.txt new file mode 100644 index 0000000000..8e0c4dc746 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/jsFileFunctionParametersAsOptional.errors.txt @@ -0,0 +1,24 @@ +bar.ts(1,1): error TS2554: Expected 3 arguments, but got 0. +bar.ts(2,1): error TS2554: Expected 3 arguments, but got 1. +bar.ts(3,1): error TS2554: Expected 3 arguments, but got 2. + + +==== foo.js (0 errors) ==== + function f(a, b, c) { } + + +==== bar.ts (3 errors) ==== + f(); + ~ +!!! error TS2554: Expected 3 arguments, but got 0. +!!! related TS6210 foo.js:1:12: An argument for 'a' was not provided. + f(1); + ~ +!!! error TS2554: Expected 3 arguments, but got 1. +!!! related TS6210 foo.js:1:15: An argument for 'b' was not provided. + f(1, 2); + ~ +!!! error TS2554: Expected 3 arguments, but got 2. +!!! related TS6210 foo.js:1:18: An argument for 'c' was not provided. + f(1, 2, 3); + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsFileFunctionParametersAsOptional2.errors.txt b/testdata/baselines/reference/submodule/compiler/jsFileFunctionParametersAsOptional2.errors.txt new file mode 100644 index 0000000000..83cde6079b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/jsFileFunctionParametersAsOptional2.errors.txt @@ -0,0 +1,30 @@ +bar.ts(1,1): error TS2554: Expected 3 arguments, but got 0. +bar.ts(2,1): error TS2554: Expected 3 arguments, but got 1. +bar.ts(3,1): error TS2554: Expected 3 arguments, but got 2. + + +==== foo.js (0 errors) ==== + /** + * @param a + * @param b + * @param c + */ + function f(a, b, c) { } + + +==== bar.ts (3 errors) ==== + f(); // Error + ~ +!!! error TS2554: Expected 3 arguments, but got 0. +!!! related TS6210 foo.js:6:12: An argument for 'a' was not provided. + f(1); // Error + ~ +!!! error TS2554: Expected 3 arguments, but got 1. +!!! related TS6210 foo.js:6:15: An argument for 'b' was not provided. + f(1, 2); // Error + ~ +!!! error TS2554: Expected 3 arguments, but got 2. +!!! related TS6210 foo.js:6:18: An argument for 'c' was not provided. + + f(1, 2, 3); // OK + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsdocInTypeScript.js b/testdata/baselines/reference/submodule/compiler/jsdocInTypeScript.js index 917d6ddac3..b4585c5b55 100644 --- a/testdata/baselines/reference/submodule/compiler/jsdocInTypeScript.js +++ b/testdata/baselines/reference/submodule/compiler/jsdocInTypeScript.js @@ -60,6 +60,39 @@ var v = import(String()); //// [jsdocInTypeScript.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); class T { prop; } @@ -90,4 +123,4 @@ var E = {}; E[""]; // make sure import types in JSDoc are not resolved /** @type {import("should-not-be-resolved").Type} */ -var v = Promise.resolve(`${String()}`).then(s => require(s)); +var v = Promise.resolve(`${String()}`).then(s => __importStar(require(s))); diff --git a/testdata/baselines/reference/submodule/compiler/jsdocInTypeScript.js.diff b/testdata/baselines/reference/submodule/compiler/jsdocInTypeScript.js.diff index afcfd4e612..103c5aba5e 100644 --- a/testdata/baselines/reference/submodule/compiler/jsdocInTypeScript.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsdocInTypeScript.js.diff @@ -1,8 +1,8 @@ --- old.jsdocInTypeScript.js +++ new.jsdocInTypeScript.js -@@= skipped -60, +60 lines =@@ - - //// [jsdocInTypeScript.js] +@@= skipped -93, +93 lines =@@ + }; + })(); class T { + prop; } @@ -21,5 +21,5 @@ E[""]; // make sure import types in JSDoc are not resolved /** @type {import("should-not-be-resolved").Type} */ --var v = Promise.resolve("".concat(String())).then(function (s) { return require(s); }); -+var v = Promise.resolve(`${String()}`).then(s => require(s)); \ No newline at end of file +-var v = Promise.resolve("".concat(String())).then(function (s) { return __importStar(require(s)); }); ++var v = Promise.resolve(`${String()}`).then(s => __importStar(require(s))); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxCallElaborationCheckNoCrash1.js b/testdata/baselines/reference/submodule/compiler/jsxCallElaborationCheckNoCrash1.js index 4f197298a1..f727bbc481 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxCallElaborationCheckNoCrash1.js +++ b/testdata/baselines/reference/submodule/compiler/jsxCallElaborationCheckNoCrash1.js @@ -18,9 +18,42 @@ export const Hoc = ( //// [jsxCallElaborationCheckNoCrash1.js] "use strict"; /// +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Hoc = void 0; -const React = require("react"); +const React = __importStar(require("react")); const Hoc = (TagElement) => { const Component = () => React.createElement(TagElement, null); return Component; diff --git a/testdata/baselines/reference/submodule/compiler/jsxCallElaborationCheckNoCrash1.js.diff b/testdata/baselines/reference/submodule/compiler/jsxCallElaborationCheckNoCrash1.js.diff index 8e4a0e5e02..7cedd68599 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxCallElaborationCheckNoCrash1.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxCallElaborationCheckNoCrash1.js.diff @@ -1,11 +1,11 @@ --- old.jsxCallElaborationCheckNoCrash1.js +++ new.jsxCallElaborationCheckNoCrash1.js -@@= skipped -19, +19 lines =@@ - /// +@@= skipped -52, +52 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Hoc = void 0; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const Hoc = (TagElement) => { const Component = () => React.createElement(TagElement, null); return Component; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js b/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js index 9d0abff513..521c173d4f 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js +++ b/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js @@ -80,12 +80,45 @@ var a = //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Blah = Blah; exports.Blah2 = Blah2; exports.Blah3 = Blah3; /// -const React = require("react"); +const React = __importStar(require("react")); function Blah(props) { return React.createElement(React.Fragment, null); } diff --git a/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff b/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff index cb4108a499..8e5f62f059 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxChildrenIndividualErrorElaborations.js.diff @@ -1,11 +1,11 @@ --- old.jsxChildrenIndividualErrorElaborations.js +++ new.jsxChildrenIndividualErrorElaborations.js -@@= skipped -84, +84 lines =@@ +@@= skipped -117, +117 lines =@@ exports.Blah2 = Blah2; exports.Blah3 = Blah3; /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function Blah(props) { return React.createElement(React.Fragment, null); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js b/testdata/baselines/reference/submodule/compiler/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js index 0730e084b9..bbec75351d 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js +++ b/testdata/baselines/reference/submodule/compiler/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js @@ -29,9 +29,42 @@ export class App extends React.Component<{}> { //// [jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js] "use strict"; /// +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.App = void 0; -const React = require("react"); +const React = __importStar(require("react")); function TabLayout(props) { return React.createElement("div", null); } diff --git a/testdata/baselines/reference/submodule/compiler/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js.diff b/testdata/baselines/reference/submodule/compiler/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js.diff index 9a6bac24b2..8eedc69562 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js.diff @@ -1,11 +1,11 @@ --- old.jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js +++ new.jsxChildrenSingleChildConfusableWithMultipleChildrenNoError.js -@@= skipped -30, +30 lines =@@ - /// +@@= skipped -63, +63 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.App = void 0; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function TabLayout(props) { return React.createElement("div", null); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxComplexSignatureHasApplicabilityError.js b/testdata/baselines/reference/submodule/compiler/jsxComplexSignatureHasApplicabilityError.js index b425a88ebd..f45854f7fc 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxComplexSignatureHasApplicabilityError.js +++ b/testdata/baselines/reference/submodule/compiler/jsxComplexSignatureHasApplicabilityError.js @@ -624,9 +624,42 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.createReactSingleSelect = createReactSingleSelect; -const React = require("react"); +const React = __importStar(require("react")); function createReactSingleSelect(WrappedComponent) { return (props) => { return (React.createElement(ReactSelectClass, __assign({}, props, { multi: false, autosize: false, value: props.value, onChange: (value) => { diff --git a/testdata/baselines/reference/submodule/compiler/jsxComplexSignatureHasApplicabilityError.js.diff b/testdata/baselines/reference/submodule/compiler/jsxComplexSignatureHasApplicabilityError.js.diff index 0cd38d4a45..2af1147c64 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxComplexSignatureHasApplicabilityError.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxComplexSignatureHasApplicabilityError.js.diff @@ -1,11 +1,11 @@ --- old.jsxComplexSignatureHasApplicabilityError.js +++ new.jsxComplexSignatureHasApplicabilityError.js -@@= skipped -625, +625 lines =@@ - }; +@@= skipped -658, +658 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.createReactSingleSelect = createReactSingleSelect; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function createReactSingleSelect(WrappedComponent) { return (props) => { return (React.createElement(ReactSelectClass, __assign({}, props, { multi: false, autosize: false, value: props.value, onChange: (value) => { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxElementType.js b/testdata/baselines/reference/submodule/compiler/jsxElementType.js index f1fc1a1f37..06f1f898b7 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxElementType.js +++ b/testdata/baselines/reference/submodule/compiler/jsxElementType.js @@ -116,9 +116,42 @@ declare global { //// [jsxElementType.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); let Component; const RenderElement = ({ title }) => React.createElement("div", null, title); Component = RenderElement; diff --git a/testdata/baselines/reference/submodule/compiler/jsxElementType.js.diff b/testdata/baselines/reference/submodule/compiler/jsxElementType.js.diff index a68ad5ac7d..6e2c151d8f 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxElementType.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxElementType.js.diff @@ -1,9 +1,9 @@ --- old.jsxElementType.js +++ new.jsxElementType.js -@@= skipped -115, +115 lines =@@ - - //// [jsxElementType.js] - "use strict"; +@@= skipped -148, +148 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -15,8 +15,8 @@ -}; Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); let Component; const RenderElement = ({ title }) => React.createElement("div", null, title); Component = RenderElement; diff --git a/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteral.js b/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteral.js index 8db5f67eed..b4970f18ba 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteral.js +++ b/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteral.js @@ -25,9 +25,42 @@ let c = ; //// [jsxElementTypeLiteral.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); // should be fine - `ElementType` accepts `div` let a = React.createElement("div", null); // should be an error - `ElementType` does not accept `span` diff --git a/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteral.js.diff b/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteral.js.diff index 3e5c4e37d0..0f06438602 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteral.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteral.js.diff @@ -1,11 +1,11 @@ --- old.jsxElementTypeLiteral.js +++ new.jsxElementTypeLiteral.js -@@= skipped -26, +26 lines =@@ - "use strict"; +@@= skipped -59, +59 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); // should be fine - `ElementType` accepts `div` let a = React.createElement("div", null); // should be an error - `ElementType` does not accept `span` \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteralWithGeneric.js b/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteralWithGeneric.js index 4ac375ed69..ff8e83ea53 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteralWithGeneric.js +++ b/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteralWithGeneric.js @@ -26,9 +26,42 @@ let c = ; //// [jsxElementTypeLiteralWithGeneric.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); // should be fine - `ElementType` accepts `div` let a = React.createElement("div", null); // Should be an error. diff --git a/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteralWithGeneric.js.diff b/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteralWithGeneric.js.diff index e24b0f3772..11d529ddee 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteralWithGeneric.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxElementTypeLiteralWithGeneric.js.diff @@ -1,11 +1,11 @@ --- old.jsxElementTypeLiteralWithGeneric.js +++ new.jsxElementTypeLiteralWithGeneric.js -@@= skipped -27, +27 lines =@@ - "use strict"; +@@= skipped -60, +60 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); // should be fine - `ElementType` accepts `div` let a = React.createElement("div", null); // Should be an error. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxEmptyExpressionNotCountedAsChild(jsx=react).js b/testdata/baselines/reference/submodule/compiler/jsxEmptyExpressionNotCountedAsChild(jsx=react).js index 6272ca29c6..182c16e9cc 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxEmptyExpressionNotCountedAsChild(jsx=react).js +++ b/testdata/baselines/reference/submodule/compiler/jsxEmptyExpressionNotCountedAsChild(jsx=react).js @@ -21,9 +21,42 @@ const element = ( //// [jsxEmptyExpressionNotCountedAsChild.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); function Wrapper(props) { return React.createElement("div", null, props.children); } diff --git a/testdata/baselines/reference/submodule/compiler/jsxEmptyExpressionNotCountedAsChild(jsx=react).js.diff b/testdata/baselines/reference/submodule/compiler/jsxEmptyExpressionNotCountedAsChild(jsx=react).js.diff index f92e43abf4..44160b830f 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxEmptyExpressionNotCountedAsChild(jsx=react).js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxEmptyExpressionNotCountedAsChild(jsx=react).js.diff @@ -1,11 +1,11 @@ --- old.jsxEmptyExpressionNotCountedAsChild(jsx=react).js +++ new.jsxEmptyExpressionNotCountedAsChild(jsx=react).js -@@= skipped -22, +22 lines =@@ - "use strict"; +@@= skipped -55, +55 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function Wrapper(props) { return React.createElement("div", null, props.children); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxExcessPropsAndAssignability.js b/testdata/baselines/reference/submodule/compiler/jsxExcessPropsAndAssignability.js index 37a0f7edfd..57e4ea348d 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxExcessPropsAndAssignability.js +++ b/testdata/baselines/reference/submodule/compiler/jsxExcessPropsAndAssignability.js @@ -32,8 +32,41 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const React = require("react"); +const React = __importStar(require("react")); const myHoc = (ComposedComponent) => { const WrapperComponent = null; const props = null; diff --git a/testdata/baselines/reference/submodule/compiler/jsxExcessPropsAndAssignability.js.diff b/testdata/baselines/reference/submodule/compiler/jsxExcessPropsAndAssignability.js.diff index ab464f6bd5..a25369ea1c 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxExcessPropsAndAssignability.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxExcessPropsAndAssignability.js.diff @@ -1,11 +1,11 @@ --- old.jsxExcessPropsAndAssignability.js +++ new.jsxExcessPropsAndAssignability.js -@@= skipped -32, +32 lines =@@ - return __assign.apply(this, arguments); - }; +@@= skipped -65, +65 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const myHoc = (ComposedComponent) => { const WrapperComponent = null; const props = null; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt.diff deleted file mode 100644 index c2e0779654..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsxFragmentFactoryReference(jsx=react-jsx).errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.jsxFragmentFactoryReference(jsx=react-jsx).errors.txt -+++ new.jsxFragmentFactoryReference(jsx=react-jsx).errors.txt -@@= skipped -0, +0 lines =@@ --jsxFragmentFactoryReference.tsx(3,9): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+jsxFragmentFactoryReference.tsx(3,9): error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - - - ==== jsxFragmentFactoryReference.tsx (1 errors) ==== -@@= skipped -5, +5 lines =@@ - content = () => ( - <> - ~~ --!!! error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - ) - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt.diff b/testdata/baselines/reference/submodule/compiler/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt.diff deleted file mode 100644 index cd429f045a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt -+++ new.jsxFragmentFactoryReference(jsx=react-jsxdev).errors.txt -@@= skipped -0, +0 lines =@@ --jsxFragmentFactoryReference.tsx(3,9): error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+jsxFragmentFactoryReference.tsx(3,9): error TS2875: This JSX tag requires the module path 'react/jsx-dev-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - - - ==== jsxFragmentFactoryReference.tsx (1 errors) ==== -@@= skipped -5, +5 lines =@@ - content = () => ( - <> - ~~ --!!! error TS2792: Cannot find module 'react/jsx-dev-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2875: This JSX tag requires the module path 'react/jsx-dev-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - ) - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxHasLiteralType.js b/testdata/baselines/reference/submodule/compiler/jsxHasLiteralType.js index 3671dbff27..bc5ece570a 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxHasLiteralType.js +++ b/testdata/baselines/reference/submodule/compiler/jsxHasLiteralType.js @@ -12,8 +12,41 @@ const m = //// [jsxHasLiteralType.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const React = require("react"); +const React = __importStar(require("react")); class MyComponent extends React.Component { } const m = React.createElement(MyComponent, { x: "a" }); diff --git a/testdata/baselines/reference/submodule/compiler/jsxHasLiteralType.js.diff b/testdata/baselines/reference/submodule/compiler/jsxHasLiteralType.js.diff index 7be5e063dd..6f12c1b34d 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxHasLiteralType.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxHasLiteralType.js.diff @@ -1,11 +1,11 @@ --- old.jsxHasLiteralType.js +++ new.jsxHasLiteralType.js -@@= skipped -12, +12 lines =@@ - //// [jsxHasLiteralType.js] - "use strict"; +@@= skipped -45, +45 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); class MyComponent extends React.Component { } const m = React.createElement(MyComponent, { x: "a" }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxImportForSideEffectsNonExtantNoError.js b/testdata/baselines/reference/submodule/compiler/jsxImportForSideEffectsNonExtantNoError.js index 4b509a3ec5..73e2571bb5 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxImportForSideEffectsNonExtantNoError.js +++ b/testdata/baselines/reference/submodule/compiler/jsxImportForSideEffectsNonExtantNoError.js @@ -11,8 +11,41 @@ const tag =
; //// [jsxImportForSideEffectsNonExtantNoError.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); require("./App.css"); // doesn't actually exist const tag = React.createElement("div", null); diff --git a/testdata/baselines/reference/submodule/compiler/jsxImportForSideEffectsNonExtantNoError.js.diff b/testdata/baselines/reference/submodule/compiler/jsxImportForSideEffectsNonExtantNoError.js.diff index 0cacd6ca78..ed3bb5eda2 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxImportForSideEffectsNonExtantNoError.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxImportForSideEffectsNonExtantNoError.js.diff @@ -1,10 +1,10 @@ --- old.jsxImportForSideEffectsNonExtantNoError.js +++ new.jsxImportForSideEffectsNonExtantNoError.js -@@= skipped -12, +12 lines =@@ - "use strict"; +@@= skipped -45, +45 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); require("./App.css"); // doesn't actually exist const tag = React.createElement("div", null); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxImportInAttribute.js b/testdata/baselines/reference/submodule/compiler/jsxImportInAttribute.js index 98c6fac2ea..94e701f39b 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxImportInAttribute.js +++ b/testdata/baselines/reference/submodule/compiler/jsxImportInAttribute.js @@ -15,8 +15,11 @@ let x = Test; // emit test_1.default //// [consumer.jsx] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); /// -const Test_1 = require("Test"); +const Test_1 = __importDefault(require("Test")); let x = Test_1.default; // emit test_1.default ; // ? diff --git a/testdata/baselines/reference/submodule/compiler/jsxImportInAttribute.js.diff b/testdata/baselines/reference/submodule/compiler/jsxImportInAttribute.js.diff index 2ff8ed15ca..977942d0f5 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxImportInAttribute.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxImportInAttribute.js.diff @@ -1,10 +1,10 @@ --- old.jsxImportInAttribute.js +++ new.jsxImportInAttribute.js -@@= skipped -16, +16 lines =@@ - "use strict"; +@@= skipped -19, +19 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); /// --var Test_1 = require("Test"); -+const Test_1 = require("Test"); +-var Test_1 = __importDefault(require("Test")); ++const Test_1 = __importDefault(require("Test")); let x = Test_1.default; // emit test_1.default ; // ? \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsCompatability.js b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsCompatability.js index 3d7a2b3284..0b02ace26d 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsCompatability.js +++ b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsCompatability.js @@ -14,9 +14,42 @@ function Test(el: T) { //// [jsxIntrinsicElementsCompatability.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); function SomeComponent(props) { // Just so the return value is RectElement, the rendered element doesnt matter return React.createElement("div", null); diff --git a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsCompatability.js.diff b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsCompatability.js.diff index f7b3bea966..c1f63a535c 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsCompatability.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsCompatability.js.diff @@ -1,11 +1,11 @@ --- old.jsxIntrinsicElementsCompatability.js +++ new.jsxIntrinsicElementsCompatability.js -@@= skipped -15, +15 lines =@@ - "use strict"; +@@= skipped -48, +48 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function SomeComponent(props) { // Just so the return value is RectElement, the rendered element doesnt matter return React.createElement("div", null); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsTypeArgumentErrors.js b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsTypeArgumentErrors.js index 6b3db37414..b54a60b262 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsTypeArgumentErrors.js +++ b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsTypeArgumentErrors.js @@ -33,9 +33,42 @@ const l = />; // existing type argument with no internal issues //// [jsxIntrinsicElementsTypeArgumentErrors.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); // opening + closing const a = React.createElement("div", null); // empty type args const b = React.createElement("div", null); // trailing comma type args diff --git a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsTypeArgumentErrors.js.diff b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsTypeArgumentErrors.js.diff index c67464a392..68d8307b5c 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsTypeArgumentErrors.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicElementsTypeArgumentErrors.js.diff @@ -1,11 +1,11 @@ --- old.jsxIntrinsicElementsTypeArgumentErrors.js +++ new.jsxIntrinsicElementsTypeArgumentErrors.js -@@= skipped -34, +34 lines =@@ - "use strict"; +@@= skipped -67, +67 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); // opening + closing const a = React.createElement("div", null); // empty type args const b = React.createElement("div", null); // trailing comma type args \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicUnions.js b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicUnions.js index 95beb17270..3ce4928120 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicUnions.js +++ b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicUnions.js @@ -13,7 +13,40 @@ const tag = {"Title"}; //// [jsxIntrinsicUnions.js] "use strict"; /// +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const React = require("react"); +const React = __importStar(require("react")); const El = Math.random() ? 'h1' : 'h2'; const tag = React.createElement(El, { className: "ok", key: "key" }, "Title"); diff --git a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicUnions.js.diff b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicUnions.js.diff index b0b95f3946..c54225d8e3 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxIntrinsicUnions.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxIntrinsicUnions.js.diff @@ -1,10 +1,10 @@ --- old.jsxIntrinsicUnions.js +++ new.jsxIntrinsicUnions.js -@@= skipped -13, +13 lines =@@ - "use strict"; - /// +@@= skipped -46, +46 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const El = Math.random() ? 'h1' : 'h2'; const tag = React.createElement(El, { className: "ok", key: "key" }, "Title"); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxIssuesErrorWhenTagExpectsTooManyArguments.js b/testdata/baselines/reference/submodule/compiler/jsxIssuesErrorWhenTagExpectsTooManyArguments.js index d6cfb6507f..899453a487 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxIssuesErrorWhenTagExpectsTooManyArguments.js +++ b/testdata/baselines/reference/submodule/compiler/jsxIssuesErrorWhenTagExpectsTooManyArguments.js @@ -29,8 +29,41 @@ const d = ; // Technically OK, but probably //// [jsxIssuesErrorWhenTagExpectsTooManyArguments.js] "use strict"; /// +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const React = require("react"); +const React = __importStar(require("react")); function MyComp4(props, context, bad, verybad) { return React.createElement("div", null); } diff --git a/testdata/baselines/reference/submodule/compiler/jsxIssuesErrorWhenTagExpectsTooManyArguments.js.diff b/testdata/baselines/reference/submodule/compiler/jsxIssuesErrorWhenTagExpectsTooManyArguments.js.diff index 6b15ca0dec..e022900882 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxIssuesErrorWhenTagExpectsTooManyArguments.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxIssuesErrorWhenTagExpectsTooManyArguments.js.diff @@ -1,11 +1,11 @@ --- old.jsxIssuesErrorWhenTagExpectsTooManyArguments.js +++ new.jsxIssuesErrorWhenTagExpectsTooManyArguments.js -@@= skipped -29, +29 lines =@@ - "use strict"; - /// +@@= skipped -62, +62 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function MyComp4(props, context, bad, verybad) { return React.createElement("div", null); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceReexports.js b/testdata/baselines/reference/submodule/compiler/jsxNamespaceReexports.js index 0cb4cdfcf2..cb3ef17685 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceReexports.js +++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceReexports.js @@ -22,6 +22,39 @@ exports.createElement = createElement; function createElement(element, props, ...children) { } //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const MyLib = require("./library"); +const MyLib = __importStar(require("./library")); const content = MyLib.createElement("my-element", null); diff --git a/testdata/baselines/reference/submodule/compiler/jsxNamespaceReexports.js.diff b/testdata/baselines/reference/submodule/compiler/jsxNamespaceReexports.js.diff index 2847d547d3..805e5e0081 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxNamespaceReexports.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxNamespaceReexports.js.diff @@ -1,9 +1,9 @@ --- old.jsxNamespaceReexports.js +++ new.jsxNamespaceReexports.js -@@= skipped -22, +22 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -55, +55 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var MyLib = require("./library"); -+const MyLib = require("./library"); +-var MyLib = __importStar(require("./library")); ++const MyLib = __importStar(require("./library")); const content = MyLib.createElement("my-element", null); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).js b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).js index 2d81787afb..77aaffecca 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).js +++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).js @@ -36,11 +36,44 @@ export * as four from "./four.js"; //// [one.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime classic */ -const React = require("react"); +const React = __importStar(require("react")); const HelloWorld = () =>

Hello world

; exports.HelloWorld = HelloWorld; exports.frag = <>
; @@ -68,21 +101,87 @@ exports.frag = <>
; exports.selfClosing = ; //// [four.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime automatic */ /* @jsxRuntime classic */ -const React = require("react"); +const React = __importStar(require("react")); const HelloWorld = () =>

Hello world

; exports.HelloWorld = HelloWorld; exports.frag = <>
; exports.selfClosing = ; //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.four = exports.three = exports.two = exports.one = void 0; -exports.one = require("./one.js"); -exports.two = require("./two.js"); -exports.three = require("./three.js"); -exports.four = require("./four.js"); +exports.one = __importStar(require("./one.js")); +exports.two = __importStar(require("./two.js")); +exports.three = __importStar(require("./three.js")); +exports.four = __importStar(require("./four.js")); diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).js.diff b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).js.diff index 7e17dd584b..73a6ad4758 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=preserve).js.diff @@ -1,20 +1,20 @@ --- old.jsxRuntimePragma(jsx=preserve).js +++ new.jsxRuntimePragma(jsx=preserve).js -@@= skipped -39, +39 lines =@@ +@@= skipped -72, +72 lines =@@ exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime classic */ --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const HelloWorld = () =>

Hello world

; exports.HelloWorld = HelloWorld; exports.frag = <>
; -@@= skipped -33, +33 lines =@@ +@@= skipped -66, +66 lines =@@ /// /* @jsxRuntime automatic */ /* @jsxRuntime classic */ --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const HelloWorld = () =>

Hello world

; exports.HelloWorld = HelloWorld; exports.frag = <>
; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).js b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).js index 4caa67cbbc..c79fbe1bb0 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).js +++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).js @@ -36,11 +36,44 @@ export * as four from "./four.js"; //// [one.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime classic */ -const React = require("react"); +const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -71,12 +104,45 @@ exports.frag = jsx_runtime_1.jsx(jsx_runtime_1.Fragment, { children: jsx_runtime exports.selfClosing = jsx_runtime_1.jsx("img", { src: "./image.png" }); //// [four.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime automatic */ /* @jsxRuntime classic */ -const React = require("react"); +const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -84,9 +150,42 @@ exports.frag = React.createElement(React.Fragment, null, exports.selfClosing = React.createElement("img", { src: "./image.png" }); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.four = exports.three = exports.two = exports.one = void 0; -exports.one = require("./one.js"); -exports.two = require("./two.js"); -exports.three = require("./three.js"); -exports.four = require("./four.js"); +exports.one = __importStar(require("./one.js")); +exports.two = __importStar(require("./two.js")); +exports.three = __importStar(require("./three.js")); +exports.four = __importStar(require("./four.js")); diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).js.diff b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).js.diff index 69d7992f5e..7430a35ab0 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react).js.diff @@ -1,11 +1,11 @@ --- old.jsxRuntimePragma(jsx=react).js +++ new.jsxRuntimePragma(jsx=react).js -@@= skipped -39, +39 lines =@@ +@@= skipped -72, +72 lines =@@ exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime classic */ --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -42,13 +42,13 @@ +exports.selfClosing = jsx_runtime_1.jsx("img", { src: "./image.png" }); //// [four.js] "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); -@@= skipped -26, +26 lines =@@ + var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { +@@= skipped -59, +59 lines =@@ /// /* @jsxRuntime automatic */ /* @jsxRuntime classic */ --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).js b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).js index 4caa67cbbc..c79fbe1bb0 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).js +++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).js @@ -36,11 +36,44 @@ export * as four from "./four.js"; //// [one.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime classic */ -const React = require("react"); +const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -71,12 +104,45 @@ exports.frag = jsx_runtime_1.jsx(jsx_runtime_1.Fragment, { children: jsx_runtime exports.selfClosing = jsx_runtime_1.jsx("img", { src: "./image.png" }); //// [four.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime automatic */ /* @jsxRuntime classic */ -const React = require("react"); +const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -84,9 +150,42 @@ exports.frag = React.createElement(React.Fragment, null, exports.selfClosing = React.createElement("img", { src: "./image.png" }); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.four = exports.three = exports.two = exports.one = void 0; -exports.one = require("./one.js"); -exports.two = require("./two.js"); -exports.three = require("./three.js"); -exports.four = require("./four.js"); +exports.one = __importStar(require("./one.js")); +exports.two = __importStar(require("./two.js")); +exports.three = __importStar(require("./three.js")); +exports.four = __importStar(require("./four.js")); diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).js.diff b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).js.diff index d267f42d42..00892e88c1 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsx).js.diff @@ -1,11 +1,11 @@ --- old.jsxRuntimePragma(jsx=react-jsx).js +++ new.jsxRuntimePragma(jsx=react-jsx).js -@@= skipped -39, +39 lines =@@ +@@= skipped -72, +72 lines =@@ exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime classic */ --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -42,13 +42,13 @@ +exports.selfClosing = jsx_runtime_1.jsx("img", { src: "./image.png" }); //// [four.js] "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); -@@= skipped -26, +26 lines =@@ + var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { +@@= skipped -59, +59 lines =@@ /// /* @jsxRuntime automatic */ /* @jsxRuntime classic */ --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).js b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).js index a7b5fb849c..4484e0e4a4 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).js +++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).js @@ -36,11 +36,44 @@ export * as four from "./four.js"; //// [one.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime classic */ -const React = require("react"); +const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -71,12 +104,45 @@ exports.frag = jsx_dev_runtime_1.jsxDEV(jsx_dev_runtime_1.Fragment, { children: exports.selfClosing = jsx_dev_runtime_1.jsxDEV("img", { src: "./image.png" }); //// [four.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime automatic */ /* @jsxRuntime classic */ -const React = require("react"); +const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -84,9 +150,42 @@ exports.frag = React.createElement(React.Fragment, null, exports.selfClosing = React.createElement("img", { src: "./image.png" }); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.four = exports.three = exports.two = exports.one = void 0; -exports.one = require("./one.js"); -exports.two = require("./two.js"); -exports.three = require("./three.js"); -exports.four = require("./four.js"); +exports.one = __importStar(require("./one.js")); +exports.two = __importStar(require("./two.js")); +exports.three = __importStar(require("./three.js")); +exports.four = __importStar(require("./four.js")); diff --git a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).js.diff b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).js.diff index 20bf9be5a4..f62aa3a987 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxRuntimePragma(jsx=react-jsxdev).js.diff @@ -1,11 +1,11 @@ --- old.jsxRuntimePragma(jsx=react-jsxdev).js +++ new.jsxRuntimePragma(jsx=react-jsxdev).js -@@= skipped -39, +39 lines =@@ +@@= skipped -72, +72 lines =@@ exports.selfClosing = exports.frag = exports.HelloWorld = void 0; /// /* @jsxRuntime classic */ --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, @@ -44,13 +44,13 @@ +exports.selfClosing = jsx_dev_runtime_1.jsxDEV("img", { src: "./image.png" }); //// [four.js] "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); -@@= skipped -28, +26 lines =@@ + var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { +@@= skipped -61, +59 lines =@@ /// /* @jsxRuntime automatic */ /* @jsxRuntime classic */ --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const HelloWorld = () => React.createElement("h1", null, "Hello world"); exports.HelloWorld = HelloWorld; exports.frag = React.createElement(React.Fragment, null, \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxSpreadFirstUnionNoErrors.js b/testdata/baselines/reference/submodule/compiler/jsxSpreadFirstUnionNoErrors.js index 9097b52c01..50a01c92a4 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxSpreadFirstUnionNoErrors.js +++ b/testdata/baselines/reference/submodule/compiler/jsxSpreadFirstUnionNoErrors.js @@ -31,8 +31,11 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const react_1 = require("react"); +const react_1 = __importDefault(require("react")); const Info = (props) => props.status === "hidden" ? react_1.default.createElement("noscript", null) : react_1.default.createElement("div", null, props.content); diff --git a/testdata/baselines/reference/submodule/compiler/jsxSpreadFirstUnionNoErrors.js.diff b/testdata/baselines/reference/submodule/compiler/jsxSpreadFirstUnionNoErrors.js.diff index 09cde7c4ea..a80038ef32 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxSpreadFirstUnionNoErrors.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxSpreadFirstUnionNoErrors.js.diff @@ -1,11 +1,11 @@ --- old.jsxSpreadFirstUnionNoErrors.js +++ new.jsxSpreadFirstUnionNoErrors.js -@@= skipped -31, +31 lines =@@ - return __assign.apply(this, arguments); +@@= skipped -34, +34 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); --var react_1 = require("react"); -+const react_1 = require("react"); +-var react_1 = __importDefault(require("react")); ++const react_1 = __importDefault(require("react")); const Info = (props) => props.status === "hidden" ? react_1.default.createElement("noscript", null) : react_1.default.createElement("div", null, props.content); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/jsxViaImport.2.js b/testdata/baselines/reference/submodule/compiler/jsxViaImport.2.js index 9f21de5897..a79cbaf14b 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxViaImport.2.js +++ b/testdata/baselines/reference/submodule/compiler/jsxViaImport.2.js @@ -24,9 +24,12 @@ class TestComponent extends React.Component { //// [consumer.jsx] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); /// -const BaseComponent_1 = require("BaseComponent"); +const BaseComponent_1 = __importDefault(require("BaseComponent")); class TestComponent extends React.Component { render() { return ; diff --git a/testdata/baselines/reference/submodule/compiler/jsxViaImport.2.js.diff b/testdata/baselines/reference/submodule/compiler/jsxViaImport.2.js.diff index d0bf458454..787ea6cfc7 100644 --- a/testdata/baselines/reference/submodule/compiler/jsxViaImport.2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/jsxViaImport.2.js.diff @@ -1,11 +1,11 @@ --- old.jsxViaImport.2.js +++ new.jsxViaImport.2.js -@@= skipped -25, +25 lines =@@ - "use strict"; +@@= skipped -28, +28 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); /// --var BaseComponent_1 = require("BaseComponent"); -+const BaseComponent_1 = require("BaseComponent"); +-var BaseComponent_1 = __importDefault(require("BaseComponent")); ++const BaseComponent_1 = __importDefault(require("BaseComponent")); class TestComponent extends React.Component { render() { return ; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/keyofModuleObjectHasCorrectKeys.js b/testdata/baselines/reference/submodule/compiler/keyofModuleObjectHasCorrectKeys.js index 072752e014..45c8f428c8 100644 --- a/testdata/baselines/reference/submodule/compiler/keyofModuleObjectHasCorrectKeys.js +++ b/testdata/baselines/reference/submodule/compiler/keyofModuleObjectHasCorrectKeys.js @@ -22,6 +22,39 @@ function add(a, b) { } //// [test.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const example = require("./example"); +const example = __importStar(require("./example")); test(example, "default"); diff --git a/testdata/baselines/reference/submodule/compiler/keyofModuleObjectHasCorrectKeys.js.diff b/testdata/baselines/reference/submodule/compiler/keyofModuleObjectHasCorrectKeys.js.diff index 7119f81b44..826f822331 100644 --- a/testdata/baselines/reference/submodule/compiler/keyofModuleObjectHasCorrectKeys.js.diff +++ b/testdata/baselines/reference/submodule/compiler/keyofModuleObjectHasCorrectKeys.js.diff @@ -1,9 +1,9 @@ --- old.keyofModuleObjectHasCorrectKeys.js +++ new.keyofModuleObjectHasCorrectKeys.js -@@= skipped -22, +22 lines =@@ - //// [test.js] - "use strict"; +@@= skipped -55, +55 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var example = require("./example"); -+const example = require("./example"); +-var example = __importStar(require("./example")); ++const example = __importStar(require("./example")); test(example, "default"); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.errors.txt b/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.errors.txt deleted file mode 100644 index e44935216b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== file1.ts (0 errors) ==== - l; - -==== file2.ts (0 errors) ==== - const l = 0; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.symbols b/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.symbols deleted file mode 100644 index c2a27479c6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/letDeclarations-useBeforeDefinition2.ts] //// - -=== file1.ts === -l; ->l : Symbol(l, Decl(file2.ts, 0, 5)) - -=== file2.ts === -const l = 0; ->l : Symbol(l, Decl(file2.ts, 0, 5)) - diff --git a/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.types b/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.types deleted file mode 100644 index ce7d51dafa..0000000000 --- a/testdata/baselines/reference/submodule/compiler/letDeclarations-useBeforeDefinition2.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/letDeclarations-useBeforeDefinition2.ts] //// - -=== file1.ts === -l; ->l : 0 - -=== file2.ts === -const l = 0; ->l : 0 ->0 : 0 - diff --git a/testdata/baselines/reference/submodule/compiler/mergedDeclarations7.js b/testdata/baselines/reference/submodule/compiler/mergedDeclarations7.js index 2b63cdbb81..54a46cd204 100644 --- a/testdata/baselines/reference/submodule/compiler/mergedDeclarations7.js +++ b/testdata/baselines/reference/submodule/compiler/mergedDeclarations7.js @@ -24,6 +24,39 @@ let p: Passport = passport.use(); //// [test.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const passport = require("passport"); +const passport = __importStar(require("passport")); let p = passport.use(); diff --git a/testdata/baselines/reference/submodule/compiler/mergedDeclarations7.js.diff b/testdata/baselines/reference/submodule/compiler/mergedDeclarations7.js.diff index 92d4340508..b05e537355 100644 --- a/testdata/baselines/reference/submodule/compiler/mergedDeclarations7.js.diff +++ b/testdata/baselines/reference/submodule/compiler/mergedDeclarations7.js.diff @@ -1,9 +1,9 @@ --- old.mergedDeclarations7.js +++ new.mergedDeclarations7.js -@@= skipped -24, +24 lines =@@ - //// [test.js] - "use strict"; +@@= skipped -57, +57 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var passport = require("passport"); -+const passport = require("passport"); +-var passport = __importStar(require("passport")); ++const passport = __importStar(require("passport")); let p = passport.use(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js index 4dfe5b883b..57ed1afddb 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js @@ -50,7 +50,40 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("./file"), exports); //// [augment.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ns = require("./reexport"); +const ns = __importStar(require("./reexport")); const g = ns.Root.A; f.x; diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js.diff b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js.diff index 82f4b126e0..b06f8ba152 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js.diff +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationDoesNamespaceEnumMergeOfReexport.js.diff @@ -1,10 +1,10 @@ --- old.moduleAugmentationDoesNamespaceEnumMergeOfReexport.js +++ new.moduleAugmentationDoesNamespaceEnumMergeOfReexport.js -@@= skipped -50, +50 lines =@@ - //// [augment.js] - "use strict"; +@@= skipped -83, +83 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ns = require("./reexport"); -+const ns = require("./reexport"); +-var ns = __importStar(require("./reexport")); ++const ns = __importStar(require("./reexport")); const g = ns.Root.A; f.x; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.errors.txt new file mode 100644 index 0000000000..5baaa2e211 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.errors.txt @@ -0,0 +1,13 @@ +moduleAugmentationGlobal8.ts(2,13): error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations. + + +==== moduleAugmentationGlobal8.ts (1 errors) ==== + namespace A { + declare global { + ~~~~~~ +!!! error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations. + interface Array { x } + } + } + export {} + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.js b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.js new file mode 100644 index 0000000000..6b4db1bd3f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.js @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/moduleAugmentationGlobal8.ts] //// + +//// [moduleAugmentationGlobal8.ts] +namespace A { + declare global { + interface Array { x } + } +} +export {} + + +//// [moduleAugmentationGlobal8.js] +export {}; diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.symbols new file mode 100644 index 0000000000..5d142e7237 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.symbols @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/moduleAugmentationGlobal8.ts] //// + +=== moduleAugmentationGlobal8.ts === +namespace A { +>A : Symbol(A, Decl(moduleAugmentationGlobal8.ts, 0, 0)) + + declare global { +>global : Symbol(global, Decl(moduleAugmentationGlobal8.ts, 0, 13)) + + interface Array { x } +>Array : Symbol(Array, Decl(moduleAugmentationGlobal8.ts, 1, 20)) +>T : Symbol(T, Decl(moduleAugmentationGlobal8.ts, 2, 24)) +>x : Symbol(Array.x, Decl(moduleAugmentationGlobal8.ts, 2, 28)) + } +} +export {} + diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.types new file mode 100644 index 0000000000..317fdc0790 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8.types @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/moduleAugmentationGlobal8.ts] //// + +=== moduleAugmentationGlobal8.ts === +namespace A { + declare global { +>global : typeof global + + interface Array { x } +>x : any + } +} +export {} + diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.errors.txt new file mode 100644 index 0000000000..603a7a8196 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.errors.txt @@ -0,0 +1,16 @@ +moduleAugmentationGlobal8_1.ts(2,5): error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations. +moduleAugmentationGlobal8_1.ts(2,5): error TS2670: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context. + + +==== moduleAugmentationGlobal8_1.ts (2 errors) ==== + namespace A { + global { + ~~~~~~ +!!! error TS2669: Augmentations for the global scope can only be directly nested in external modules or ambient module declarations. + ~~~~~~ +!!! error TS2670: Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context. + interface Array { x } + } + } + export {} + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.js b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.js new file mode 100644 index 0000000000..66a7d16991 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.js @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/moduleAugmentationGlobal8_1.ts] //// + +//// [moduleAugmentationGlobal8_1.ts] +namespace A { + global { + interface Array { x } + } +} +export {} + + +//// [moduleAugmentationGlobal8_1.js] +export {}; diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.symbols b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.symbols new file mode 100644 index 0000000000..3d0e3d3b78 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.symbols @@ -0,0 +1,17 @@ +//// [tests/cases/compiler/moduleAugmentationGlobal8_1.ts] //// + +=== moduleAugmentationGlobal8_1.ts === +namespace A { +>A : Symbol(A, Decl(moduleAugmentationGlobal8_1.ts, 0, 0)) + + global { +>global : Symbol(global, Decl(moduleAugmentationGlobal8_1.ts, 0, 13)) + + interface Array { x } +>Array : Symbol(Array, Decl(moduleAugmentationGlobal8_1.ts, 1, 12)) +>T : Symbol(T, Decl(moduleAugmentationGlobal8_1.ts, 2, 24)) +>x : Symbol(Array.x, Decl(moduleAugmentationGlobal8_1.ts, 2, 28)) + } +} +export {} + diff --git a/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.types b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.types new file mode 100644 index 0000000000..d9a98ae928 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleAugmentationGlobal8_1.types @@ -0,0 +1,13 @@ +//// [tests/cases/compiler/moduleAugmentationGlobal8_1.ts] //// + +=== moduleAugmentationGlobal8_1.ts === +namespace A { + global { +>global : typeof global + + interface Array { x } +>x : any + } +} +export {} + diff --git a/testdata/baselines/reference/submodule/compiler/moduleExports1.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleExports1.errors.txt new file mode 100644 index 0000000000..94e406a313 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleExports1.errors.txt @@ -0,0 +1,40 @@ +moduleExports1.ts(1,1): error TS1185: Merge conflict marker encountered. +moduleExports1.ts(3,1): error TS1185: Merge conflict marker encountered. +moduleExports1.ts(5,1): error TS1185: Merge conflict marker encountered. +moduleExports1.ts(7,1): error TS1185: Merge conflict marker encountered. +moduleExports1.ts(19,6): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. +moduleExports1.ts(19,22): error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. + + +==== moduleExports1.ts (6 errors) ==== + <<<<<<< HEAD + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export module TypeScript.Strasse.Street { + ||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export namespace TypeScript.Strasse.Street { + ======= + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export namespace TypeScript.Strasse.Street { + >>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + ~~~~~~~ +!!! error TS1185: Merge conflict marker encountered. + export class Rue { + public address:string; + } + } + + var rue = new TypeScript.Strasse.Street.Rue(); + + rue.address = "1 Main Street"; + + void 0; + + if (!module.exports) module.exports = ""; + ~~~~~~ +!!! error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. + ~~~~~~ +!!! error TS2580: Cannot find name 'module'. Do you need to install type definitions for node? Try `npm i --save-dev @types/node`. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleExports1.js b/testdata/baselines/reference/submodule/compiler/moduleExports1.js new file mode 100644 index 0000000000..555986d106 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleExports1.js @@ -0,0 +1,45 @@ +//// [tests/cases/compiler/moduleExports1.ts] //// + +//// [moduleExports1.ts] +<<<<<<< HEAD +export module TypeScript.Strasse.Street { +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace TypeScript.Strasse.Street { +======= +export namespace TypeScript.Strasse.Street { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export class Rue { + public address:string; + } +} + +var rue = new TypeScript.Strasse.Street.Rue(); + +rue.address = "1 Main Street"; + +void 0; + +if (!module.exports) module.exports = ""; + +//// [moduleExports1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.TypeScript = void 0; +var TypeScript; +(function (TypeScript) { + let Strasse; + (function (Strasse) { + let Street; + (function (Street) { + class Rue { + address; + } + Street.Rue = Rue; + })(Street = Strasse.Street || (Strasse.Street = {})); + })(Strasse = TypeScript.Strasse || (TypeScript.Strasse = {})); +})(TypeScript || (exports.TypeScript = TypeScript = {})); +var rue = new TypeScript.Strasse.Street.Rue(); +rue.address = "1 Main Street"; +void 0; +if (!module.exports) + module.exports = ""; diff --git a/testdata/baselines/reference/submodule/compiler/moduleExports1.js.diff b/testdata/baselines/reference/submodule/compiler/moduleExports1.js.diff new file mode 100644 index 0000000000..d4529c088c --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleExports1.js.diff @@ -0,0 +1,17 @@ +--- old.moduleExports1.js ++++ new.moduleExports1.js +@@= skipped -26, +26 lines =@@ + exports.TypeScript = void 0; + var TypeScript; + (function (TypeScript) { +- var Strasse; ++ let Strasse; + (function (Strasse) { +- var Street; ++ let Street; + (function (Street) { + class Rue { ++ address; + } + Street.Rue = Rue; + })(Street = Strasse.Street || (Strasse.Street = {})); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleExports1.symbols b/testdata/baselines/reference/submodule/compiler/moduleExports1.symbols new file mode 100644 index 0000000000..7a861a27b1 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleExports1.symbols @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/moduleExports1.ts] //// + +=== moduleExports1.ts === +<<<<<<< HEAD +export module TypeScript.Strasse.Street { +>TypeScript : Symbol(TypeScript, Decl(moduleExports1.ts, 0, 0)) +>Strasse : Symbol(Strasse, Decl(moduleExports1.ts, 1, 25)) +>Street : Symbol(Street, Decl(moduleExports1.ts, 1, 33)) + +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace TypeScript.Strasse.Street { +======= +export namespace TypeScript.Strasse.Street { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export class Rue { +>Rue : Symbol(Rue, Decl(moduleExports1.ts, 1, 41)) + + public address:string; +>address : Symbol(Rue.address, Decl(moduleExports1.ts, 7, 19)) + } +} + +var rue = new TypeScript.Strasse.Street.Rue(); +>rue : Symbol(rue, Decl(moduleExports1.ts, 12, 3)) +>TypeScript.Strasse.Street.Rue : Symbol(TypeScript.Strasse.Street.Rue, Decl(moduleExports1.ts, 1, 41)) +>TypeScript.Strasse.Street : Symbol(TypeScript.Strasse.Street, Decl(moduleExports1.ts, 1, 33)) +>TypeScript.Strasse : Symbol(TypeScript.Strasse, Decl(moduleExports1.ts, 1, 25)) +>TypeScript : Symbol(TypeScript, Decl(moduleExports1.ts, 0, 0)) +>Strasse : Symbol(TypeScript.Strasse, Decl(moduleExports1.ts, 1, 25)) +>Street : Symbol(TypeScript.Strasse.Street, Decl(moduleExports1.ts, 1, 33)) +>Rue : Symbol(TypeScript.Strasse.Street.Rue, Decl(moduleExports1.ts, 1, 41)) + +rue.address = "1 Main Street"; +>rue.address : Symbol(TypeScript.Strasse.Street.Rue.address, Decl(moduleExports1.ts, 7, 19)) +>rue : Symbol(rue, Decl(moduleExports1.ts, 12, 3)) +>address : Symbol(TypeScript.Strasse.Street.Rue.address, Decl(moduleExports1.ts, 7, 19)) + +void 0; + +if (!module.exports) module.exports = ""; diff --git a/testdata/baselines/reference/submodule/compiler/moduleExports1.types b/testdata/baselines/reference/submodule/compiler/moduleExports1.types new file mode 100644 index 0000000000..61eade72b3 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/moduleExports1.types @@ -0,0 +1,55 @@ +//// [tests/cases/compiler/moduleExports1.ts] //// + +=== moduleExports1.ts === +<<<<<<< HEAD +export module TypeScript.Strasse.Street { +>TypeScript : typeof TypeScript +>Strasse : typeof Strasse +>Street : typeof Street + +||||||| parent of 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) +export namespace TypeScript.Strasse.Street { +======= +export namespace TypeScript.Strasse.Street { +>>>>>>> 42f6576e83 (Deprecate `--module amd`, `umd`, `system`, `none`; `--moduleResolution classic`; change defaults (#62669)) + export class Rue { +>Rue : Rue + + public address:string; +>address : string + } +} + +var rue = new TypeScript.Strasse.Street.Rue(); +>rue : TypeScript.Strasse.Street.Rue +>new TypeScript.Strasse.Street.Rue() : TypeScript.Strasse.Street.Rue +>TypeScript.Strasse.Street.Rue : typeof TypeScript.Strasse.Street.Rue +>TypeScript.Strasse.Street : typeof TypeScript.Strasse.Street +>TypeScript.Strasse : typeof TypeScript.Strasse +>TypeScript : typeof TypeScript +>Strasse : typeof TypeScript.Strasse +>Street : typeof TypeScript.Strasse.Street +>Rue : typeof TypeScript.Strasse.Street.Rue + +rue.address = "1 Main Street"; +>rue.address = "1 Main Street" : "1 Main Street" +>rue.address : string +>rue : TypeScript.Strasse.Street.Rue +>address : string +>"1 Main Street" : "1 Main Street" + +void 0; +>void 0 : undefined +>0 : 0 + +if (!module.exports) module.exports = ""; +>!module.exports : boolean +>module.exports : any +>module : any +>exports : any +>module.exports = "" : "" +>module.exports : any +>module : any +>exports : any +>"" : "" + diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).errors.txt b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).errors.txt deleted file mode 100644 index 5cddc66587..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -error TS5055: Cannot write file '/b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -/a.ts(1,13): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'. - - -!!! error TS5055: Cannot write file '/b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /a.ts (1 errors) ==== - const foo = import("./b"); - ~~~~~~~~~~~~~ -!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'. - -==== /b.js (0 errors) ==== - export default 1; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols deleted file mode 100644 index 2231926bdd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).symbols +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/moduleNoneDynamicImport.ts] //// - -=== /a.ts === -const foo = import("./b"); ->foo : Symbol(foo, Decl(a.ts, 0, 5)) ->"./b" : Symbol("/b", Decl(b.js, 0, 0)) - -=== /b.js === - -export default 1; - diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).types b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).types deleted file mode 100644 index defc0029a8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2015).types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/moduleNoneDynamicImport.ts] //// - -=== /a.ts === -const foo = import("./b"); ->foo : Promise ->import("./b") : Promise ->"./b" : "./b" - -=== /b.js === - -export default 1; - diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).errors.txt b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).errors.txt deleted file mode 100644 index 5cddc66587..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -error TS5055: Cannot write file '/b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -/a.ts(1,13): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'. - - -!!! error TS5055: Cannot write file '/b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /a.ts (1 errors) ==== - const foo = import("./b"); - ~~~~~~~~~~~~~ -!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'. - -==== /b.js (0 errors) ==== - export default 1; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols deleted file mode 100644 index 2231926bdd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).symbols +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/moduleNoneDynamicImport.ts] //// - -=== /a.ts === -const foo = import("./b"); ->foo : Symbol(foo, Decl(a.ts, 0, 5)) ->"./b" : Symbol("/b", Decl(b.js, 0, 0)) - -=== /b.js === - -export default 1; - diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).types b/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).types deleted file mode 100644 index defc0029a8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneDynamicImport(target=es2020).types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/moduleNoneDynamicImport.ts] //// - -=== /a.ts === -const foo = import("./b"); ->foo : Promise ->import("./b") : Promise ->"./b" : "./b" - -=== /b.js === - -export default 1; - diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneErrors.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleNoneErrors.errors.txt.diff index a7fbd3e07e..8ae217c0e2 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneErrors.errors.txt.diff +++ b/testdata/baselines/reference/submodule/compiler/moduleNoneErrors.errors.txt.diff @@ -1,9 +1,11 @@ --- old.moduleNoneErrors.errors.txt +++ new.moduleNoneErrors.errors.txt @@= skipped -0, +0 lines =@@ +-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -a.ts(1,14): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'. - - +-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -==== a.ts (1 errors) ==== - export class Foo { - ~~~ diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.errors.txt deleted file mode 100644 index 97b0cf2349..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.errors.txt +++ /dev/null @@ -1,8 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== first.ts (0 errors) ==== - class Foo {} -==== second.ts (0 errors) ==== - class Bar extends Foo {} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.symbols b/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.symbols deleted file mode 100644 index e2819b57e4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.symbols +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/moduleNoneOutFile.ts] //// - -=== first.ts === -class Foo {} ->Foo : Symbol(Foo, Decl(first.ts, 0, 0)) - -=== second.ts === -class Bar extends Foo {} ->Bar : Symbol(Bar, Decl(second.ts, 0, 0)) ->Foo : Symbol(Foo, Decl(first.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.types b/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.types deleted file mode 100644 index 865820d1b9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleNoneOutFile.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/moduleNoneOutFile.ts] //// - -=== first.ts === -class Foo {} ->Foo : Foo - -=== second.ts === -class Bar extends Foo {} ->Bar : Bar ->Foo : Foo - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt deleted file mode 100644 index 250f704712..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt +++ /dev/null @@ -1,55 +0,0 @@ -/project/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== /project/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "@shared/*": ["../shared/*"] - } - }, - //"files": ["src/app.ts"] - } -==== /project/src/app.ts (0 errors) ==== - import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory - import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder - -==== /shared/node_modules/troublesome-lib/package.json (0 errors) ==== - { - "name": "troublesome-lib", - "version": "1.17.1" - } -==== /shared/node_modules/troublesome-lib/lib/Compactable.d.ts (0 errors) ==== - import { Option } from './Option'; - export class Compactable { - option: Option; - } -==== /shared/node_modules/troublesome-lib/lib/Option.d.ts (0 errors) ==== - export class Option { - someProperty: string; - } -==== /shared/lib/app.d.ts (0 errors) ==== - import { Option } from "troublesome-lib/lib/Option"; - export class SharedOption extends Option { } - export const makeSharedOption: () => SharedOption; -==== /project/node_modules/anotherLib/index.d.ts (0 errors) ==== - import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable -==== /project/node_modules/troublesome-lib/package.json (0 errors) ==== - { - "name": "troublesome-lib", - "version": "1.17.1" - } -==== /project/node_modules/troublesome-lib/lib/Compactable.d.ts (0 errors) ==== - import { Option } from './Option'; - export class Compactable { - option: Option; - } -==== /project/node_modules/troublesome-lib/lib/Option.d.ts (0 errors) ==== - export class Option { - someProperty: string; - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.js deleted file mode 100644 index 4c03127615..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.js +++ /dev/null @@ -1,44 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.ts] //// - -//// [package.json] -{ - "name": "troublesome-lib", - "version": "1.17.1" -} -//// [Compactable.d.ts] -import { Option } from './Option'; -export class Compactable { - option: Option; -} -//// [Option.d.ts] -export class Option { - someProperty: string; -} -//// [app.d.ts] -import { Option } from "troublesome-lib/lib/Option"; -export class SharedOption extends Option { } -export const makeSharedOption: () => SharedOption; -//// [index.d.ts] -import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable -//// [package.json] -{ - "name": "troublesome-lib", - "version": "1.17.1" -} -//// [Compactable.d.ts] -import { Option } from './Option'; -export class Compactable { - option: Option; -} -//// [Option.d.ts] -export class Option { - someProperty: string; -} -//// [app.ts] -import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory -import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder - - -//// [/project/src/app.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.symbols deleted file mode 100644 index 691420388e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.symbols +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.ts] //// - -=== /project/src/app.ts === -import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory ->t : Symbol(t, Decl(app.ts, 0, 6)) - -import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder ->makeSharedOption : Symbol(makeSharedOption, Decl(app.ts, 1, 8)) - -=== /shared/node_modules/troublesome-lib/lib/Option.d.ts === -export class Option { ->Option : Symbol(Option, Decl(Option.d.ts, 0, 0)) - - someProperty: string; ->someProperty : Symbol(Option.someProperty, Decl(Option.d.ts, 0, 21)) -} -=== /shared/lib/app.d.ts === -import { Option } from "troublesome-lib/lib/Option"; ->Option : Symbol(Option, Decl(app.d.ts, 0, 8)) - -export class SharedOption extends Option { } ->SharedOption : Symbol(SharedOption, Decl(app.d.ts, 0, 52)) ->Option : Symbol(Option, Decl(app.d.ts, 0, 8)) - -export const makeSharedOption: () => SharedOption; ->makeSharedOption : Symbol(makeSharedOption, Decl(app.d.ts, 2, 12)) ->SharedOption : Symbol(SharedOption, Decl(app.d.ts, 0, 52)) - -=== /project/node_modules/anotherLib/index.d.ts === -import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable ->Compactable : Symbol(Compactable, Decl(index.d.ts, 0, 8)) - -=== /project/node_modules/troublesome-lib/lib/Compactable.d.ts === -import { Option } from './Option'; ->Option : Symbol(Option, Decl(Compactable.d.ts, 0, 8)) - -export class Compactable { ->Compactable : Symbol(Compactable, Decl(Compactable.d.ts, 0, 34)) - - option: Option; ->option : Symbol(Compactable.option, Decl(Compactable.d.ts, 1, 26)) ->Option : Symbol(Option, Decl(Compactable.d.ts, 0, 8)) -} -=== /project/node_modules/troublesome-lib/lib/Option.d.ts === -export class Option { ->Option : Symbol(Option, Decl(Option.d.ts, 0, 0)) - - someProperty: string; ->someProperty : Symbol(Option.someProperty, Decl(Option.d.ts, 0, 21)) -} diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json deleted file mode 100644 index 86fe2a3b9f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.trace.json +++ /dev/null @@ -1,80 +0,0 @@ -======== Resolving module 'anotherLib' from '/project/src/app.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'anotherLib'. -File '/project/src/package.json' does not exist. -File '/project/package.json' does not exist. -File '/package.json' does not exist. -Loading module 'anotherLib' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/project/src/node_modules' does not exist, skipping all lookups in it. -Directory '/project/src/node_modules/@types' does not exist, skipping all lookups in it. -File '/project/node_modules/anotherLib/package.json' does not exist. -File '/project/node_modules/anotherLib.ts' does not exist. -File '/project/node_modules/anotherLib.tsx' does not exist. -File '/project/node_modules/anotherLib.d.ts' does not exist. -File '/project/node_modules/anotherLib/index.ts' does not exist. -File '/project/node_modules/anotherLib/index.tsx' does not exist. -File '/project/node_modules/anotherLib/index.d.ts' exists - use it as a name resolution result. -Resolving real path for '/project/node_modules/anotherLib/index.d.ts', result '/project/node_modules/anotherLib/index.d.ts'. -======== Module name 'anotherLib' was successfully resolved to '/project/node_modules/anotherLib/index.d.ts'. ======== -======== Resolving module '@shared/lib/app' from '/project/src/app.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '@shared/lib/app'. -Module name '@shared/lib/app', matched pattern '@shared/*'. -Trying substitution '../shared/*', candidate module location: '../shared/lib/app'. -Loading module as file / folder, candidate module location '/shared/lib/app', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/shared/lib/app.ts' does not exist. -File '/shared/lib/app.tsx' does not exist. -File '/shared/lib/app.d.ts' exists - use it as a name resolution result. -======== Module name '@shared/lib/app' was successfully resolved to '/shared/lib/app.d.ts'. ======== -======== Resolving module 'troublesome-lib/lib/Compactable' from '/project/node_modules/anotherLib/index.d.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'troublesome-lib/lib/Compactable'. -File '/project/node_modules/anotherLib/package.json' does not exist according to earlier cached lookups. -File '/project/node_modules/package.json' does not exist. -File '/project/package.json' does not exist according to earlier cached lookups. -File '/package.json' does not exist according to earlier cached lookups. -Loading module 'troublesome-lib/lib/Compactable' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/project/node_modules/anotherLib/node_modules' does not exist, skipping all lookups in it. -Directory '/project/node_modules/anotherLib/node_modules/@types' does not exist, skipping all lookups in it. -Found 'package.json' at '/project/node_modules/troublesome-lib/package.json'. -'package.json' does not have a 'typesVersions' field. -File '/project/node_modules/troublesome-lib/lib/Compactable.ts' does not exist. -File '/project/node_modules/troublesome-lib/lib/Compactable.tsx' does not exist. -File '/project/node_modules/troublesome-lib/lib/Compactable.d.ts' exists - use it as a name resolution result. -'package.json' does not have a 'peerDependencies' field. -Resolving real path for '/project/node_modules/troublesome-lib/lib/Compactable.d.ts', result '/project/node_modules/troublesome-lib/lib/Compactable.d.ts'. -======== Module name 'troublesome-lib/lib/Compactable' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Compactable.d.ts' with Package ID 'troublesome-lib@1.17.1'. ======== -======== Resolving module './Option' from '/project/node_modules/troublesome-lib/lib/Compactable.d.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/project/node_modules/troublesome-lib/lib/Option', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/project/node_modules/troublesome-lib/lib/Option.ts' does not exist. -File '/project/node_modules/troublesome-lib/lib/Option.tsx' does not exist. -File '/project/node_modules/troublesome-lib/lib/Option.d.ts' exists - use it as a name resolution result. -File '/project/node_modules/troublesome-lib/package.json' exists according to earlier cached lookups. -'package.json' does not have a 'peerDependencies' field. -======== Module name './Option' was successfully resolved to '/project/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID 'troublesome-lib/lib/Option.d.ts@1.17.1'. ======== -======== Resolving module 'troublesome-lib/lib/Option' from '/shared/lib/app.d.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'troublesome-lib/lib/Option'. -File '/shared/lib/package.json' does not exist. -File '/shared/package.json' does not exist. -File '/package.json' does not exist according to earlier cached lookups. -Loading module 'troublesome-lib/lib/Option' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/shared/lib/node_modules' does not exist, skipping all lookups in it. -Directory '/shared/lib/node_modules/@types' does not exist, skipping all lookups in it. -Found 'package.json' at '/shared/node_modules/troublesome-lib/package.json'. -'package.json' does not have a 'typesVersions' field. -File '/shared/node_modules/troublesome-lib/lib/Option.ts' does not exist. -File '/shared/node_modules/troublesome-lib/lib/Option.tsx' does not exist. -File '/shared/node_modules/troublesome-lib/lib/Option.d.ts' exists - use it as a name resolution result. -'package.json' does not have a 'peerDependencies' field. -Resolving real path for '/shared/node_modules/troublesome-lib/lib/Option.d.ts', result '/shared/node_modules/troublesome-lib/lib/Option.d.ts'. -======== Module name 'troublesome-lib/lib/Option' was successfully resolved to '/shared/node_modules/troublesome-lib/lib/Option.d.ts' with Package ID 'troublesome-lib@1.17.1'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types deleted file mode 100644 index af8a45085d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.types +++ /dev/null @@ -1,48 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.ts] //// - -=== /project/src/app.ts === -import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory ->t : typeof t - -import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder ->makeSharedOption : () => import("/shared/lib/app").SharedOption - -=== /shared/node_modules/troublesome-lib/lib/Option.d.ts === -export class Option { ->Option : Option - - someProperty: string; ->someProperty : string -} -=== /shared/lib/app.d.ts === -import { Option } from "troublesome-lib/lib/Option"; ->Option : typeof Option - -export class SharedOption extends Option { } ->SharedOption : SharedOption ->Option : Option - -export const makeSharedOption: () => SharedOption; ->makeSharedOption : () => SharedOption - -=== /project/node_modules/anotherLib/index.d.ts === -import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable ->Compactable : typeof Compactable - -=== /project/node_modules/troublesome-lib/lib/Compactable.d.ts === -import { Option } from './Option'; ->Option : typeof Option - -export class Compactable { ->Compactable : Compactable - - option: Option; ->option : Option -} -=== /project/node_modules/troublesome-lib/lib/Option.d.ts === -export class Option { ->Option : Option - - someProperty: string; ->someProperty : string -} diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.errors.txt deleted file mode 100644 index cba7d17cba..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.errors.txt +++ /dev/null @@ -1,51 +0,0 @@ -/tsconfig.json(6,3): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -/tsconfig.json(11,14): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== /tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "outDir": "lib", - "target": "ES6", - "module": "ES6", - "baseUrl": "/", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "moduleResolution": "Node", - "noImplicitAny": true, - "traceResolution": true, - "paths": { - "foo/*": ["node_modules/foo/lib/*"] - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } - -==== /relative.d.ts (0 errors) ==== - export declare function relative(): void; - - -==== /test.ts (0 errors) ==== - import { test } from "foo/test.js"; - import { test as test2 } from "foo/test"; - import { relative } from "./relative.js"; - import { relative as relative2 } from "./relative"; - - - -==== /node_modules/foo/lib/test.js (0 errors) ==== - export function test() { - console.log("test"); - } - -==== /node_modules/foo/lib/test.d.ts (0 errors) ==== - export declare function test(): void; - -==== /relative.js (0 errors) ==== - export function relative() { - console.log("test"); - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.js deleted file mode 100644 index 58d7c51bba..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.js +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithExtensions_withPaths.ts] //// - -//// [test.js] -export function test() { - console.log("test"); -} - -//// [test.d.ts] -export declare function test(): void; - -//// [relative.js] -export function relative() { - console.log("test"); -} - -//// [relative.d.ts] -export declare function relative(): void; - - -//// [test.ts] -import { test } from "foo/test.js"; -import { test as test2 } from "foo/test"; -import { relative } from "./relative.js"; -import { relative as relative2 } from "./relative"; - - - - -//// [test.js] -export {}; diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.symbols deleted file mode 100644 index 3589237093..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.symbols +++ /dev/null @@ -1,28 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithExtensions_withPaths.ts] //// - -=== /relative.d.ts === -export declare function relative(): void; ->relative : Symbol(relative, Decl(relative.d.ts, 0, 0)) - - -=== /test.ts === -import { test } from "foo/test.js"; ->test : Symbol(test, Decl(test.ts, 0, 8)) - -import { test as test2 } from "foo/test"; ->test : Symbol(test, Decl(test.d.ts, 0, 0)) ->test2 : Symbol(test2, Decl(test.ts, 1, 8)) - -import { relative } from "./relative.js"; ->relative : Symbol(relative, Decl(test.ts, 2, 8)) - -import { relative as relative2 } from "./relative"; ->relative : Symbol(relative, Decl(relative.d.ts, 0, 0)) ->relative2 : Symbol(relative2, Decl(test.ts, 3, 8)) - - - -=== /node_modules/foo/lib/test.d.ts === -export declare function test(): void; ->test : Symbol(test, Decl(test.d.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.trace.json deleted file mode 100644 index 435b434945..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.trace.json +++ /dev/null @@ -1,44 +0,0 @@ -======== Resolving module 'foo/test.js' from '/test.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'import', 'types'. -'paths' option is specified, looking for a pattern to match module name 'foo/test.js'. -Module name 'foo/test.js', matched pattern 'foo/*'. -Trying substitution 'node_modules/foo/lib/*', candidate module location: 'node_modules/foo/lib/test.js'. -Loading module as file / folder, candidate module location '/node_modules/foo/lib/test.js', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/node_modules/foo/lib/test.js' has a '.js' extension - stripping it. -File '/node_modules/foo/lib/test.ts' does not exist. -File '/node_modules/foo/lib/test.tsx' does not exist. -File '/node_modules/foo/lib/test.d.ts' exists - use it as a name resolution result. -File '/node_modules/foo/package.json' does not exist. -Resolving real path for '/node_modules/foo/lib/test.d.ts', result '/node_modules/foo/lib/test.d.ts'. -======== Module name 'foo/test.js' was successfully resolved to '/node_modules/foo/lib/test.d.ts'. ======== -======== Resolving module 'foo/test' from '/test.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'import', 'types'. -'paths' option is specified, looking for a pattern to match module name 'foo/test'. -Module name 'foo/test', matched pattern 'foo/*'. -Trying substitution 'node_modules/foo/lib/*', candidate module location: 'node_modules/foo/lib/test'. -Loading module as file / folder, candidate module location '/node_modules/foo/lib/test', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/node_modules/foo/lib/test.ts' does not exist according to earlier cached lookups. -File '/node_modules/foo/lib/test.tsx' does not exist according to earlier cached lookups. -File '/node_modules/foo/lib/test.d.ts' exists - use it as a name resolution result. -File '/node_modules/foo/package.json' does not exist according to earlier cached lookups. -Resolving real path for '/node_modules/foo/lib/test.d.ts', result '/node_modules/foo/lib/test.d.ts'. -======== Module name 'foo/test' was successfully resolved to '/node_modules/foo/lib/test.d.ts'. ======== -======== Resolving module './relative.js' from '/test.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'import', 'types'. -Loading module as file / folder, candidate module location '/relative.js', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/relative.js' has a '.js' extension - stripping it. -File '/relative.ts' does not exist. -File '/relative.tsx' does not exist. -File '/relative.d.ts' exists - use it as a name resolution result. -======== Module name './relative.js' was successfully resolved to '/relative.d.ts'. ======== -======== Resolving module './relative' from '/test.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'import', 'types'. -Loading module as file / folder, candidate module location '/relative', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/relative.ts' does not exist according to earlier cached lookups. -File '/relative.tsx' does not exist according to earlier cached lookups. -File '/relative.d.ts' exists - use it as a name resolution result. -======== Module name './relative' was successfully resolved to '/relative.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.types deleted file mode 100644 index d3f3b60fec..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithExtensions_withPaths.types +++ /dev/null @@ -1,28 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithExtensions_withPaths.ts] //// - -=== /relative.d.ts === -export declare function relative(): void; ->relative : () => void - - -=== /test.ts === -import { test } from "foo/test.js"; ->test : () => void - -import { test as test2 } from "foo/test"; ->test : () => void ->test2 : () => void - -import { relative } from "./relative.js"; ->relative : () => void - -import { relative as relative2 } from "./relative"; ->relative : () => void ->relative2 : () => void - - - -=== /node_modules/foo/lib/test.d.ts === -export declare function test(): void; ->test : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js index 92b7e88696..2d0c7b4607 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js +++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js @@ -14,6 +14,39 @@ p.thing(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const p = require("pkg"); +const p = __importStar(require("pkg")); p.thing(); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js.diff index 2b6445c6b9..6f55d28d96 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js.diff +++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js.diff @@ -1,9 +1,9 @@ --- old.moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js +++ new.moduleResolutionWithModule(module=commonjs,moduleresolution=node16).js -@@= skipped -14, +14 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -47, +47 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var p = require("pkg"); -+const p = require("pkg"); +-var p = __importStar(require("pkg")); ++const p = __importStar(require("pkg")); p.thing(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js index 92b7e88696..2d0c7b4607 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js +++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js @@ -14,6 +14,39 @@ p.thing(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const p = require("pkg"); +const p = __importStar(require("pkg")); p.thing(); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js.diff index 08e045bf15..46069cbb45 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js.diff +++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js.diff @@ -1,9 +1,9 @@ --- old.moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js +++ new.moduleResolutionWithModule(module=commonjs,moduleresolution=nodenext).js -@@= skipped -14, +14 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -47, +47 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var p = require("pkg"); -+const p = require("pkg"); +-var p = __importStar(require("pkg")); ++const p = __importStar(require("pkg")); p.thing(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.errors.txt.diff deleted file mode 100644 index 2f2399daf6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.errors.txt.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- old.moduleResolutionWithSuffixes_empty.errors.txt -+++ new.moduleResolutionWithSuffixes_empty.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [] -- } -- } --==== /index.ts (0 errors) ==== -- import { base } from "./foo"; --==== /foo.ts (0 errors) ==== -- export function base() {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.js deleted file mode 100644 index fe0c228e0a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.js +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_empty.ts] //// - -//// [index.ts] -import { base } from "./foo"; -//// [foo.ts] -export function base() {} - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.symbols deleted file mode 100644 index dfa3119003..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_empty.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : Symbol(base, Decl(index.ts, 0, 8)) - -=== /foo.ts === -export function base() {} ->base : Symbol(base, Decl(foo.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.trace.json deleted file mode 100644 index 12c67c71be..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.trace.json +++ /dev/null @@ -1,6 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo.ts' exists - use it as a name resolution result. -======== Module name './foo' was successfully resolved to '/foo.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.types deleted file mode 100644 index f210f8649f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_empty.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_empty.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : () => void - -=== /foo.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.errors.txt.diff deleted file mode 100644 index 2f26d2d13f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.moduleResolutionWithSuffixes_notSpecified.errors.txt -+++ new.moduleResolutionWithSuffixes_notSpecified.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- } -- } --==== /index.ts (0 errors) ==== -- import { base } from "./foo"; --==== /foo.ts (0 errors) ==== -- export function base() {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.js deleted file mode 100644 index 8e860a1ce8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.js +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_notSpecified.ts] //// - -//// [index.ts] -import { base } from "./foo"; -//// [foo.ts] -export function base() {} - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.symbols deleted file mode 100644 index 80f67af597..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_notSpecified.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : Symbol(base, Decl(index.ts, 0, 8)) - -=== /foo.ts === -export function base() {} ->base : Symbol(base, Decl(foo.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.trace.json deleted file mode 100644 index 12c67c71be..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.trace.json +++ /dev/null @@ -1,6 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo.ts' exists - use it as a name resolution result. -======== Module name './foo' was successfully resolved to '/foo.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.types deleted file mode 100644 index a4a74f5246..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_notSpecified.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_notSpecified.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : () => void - -=== /foo.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.errors.txt.diff deleted file mode 100644 index 7965155fa6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one.errors.txt -+++ new.moduleResolutionWithSuffixes_one.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [".ios"] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { ios } from "./foo"; --==== /foo.ios.ts (0 errors) ==== -- export function ios() {} --==== /foo.ts (0 errors) ==== -- export function base() {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.js deleted file mode 100644 index ee45cc67bd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.js +++ /dev/null @@ -1,23 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one.ts] //// - -//// [index.ts] -import { ios } from "./foo"; -//// [foo.ios.ts] -export function ios() {} -//// [foo.ts] -export function base() {} - - -//// [foo.ios.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ios = ios; -function ios() { } -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.symbols deleted file mode 100644 index 72edd0513e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one.ts] //// - -=== /index.ts === -import { ios } from "./foo"; ->ios : Symbol(ios, Decl(index.ts, 0, 8)) - -=== /foo.ios.ts === -export function ios() {} ->ios : Symbol(ios, Decl(foo.ios.ts, 0, 0)) - -=== /foo.ts === -export function base() {} ->base : Symbol(base, Decl(foo.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.trace.json deleted file mode 100644 index bbef3f7e73..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.trace.json +++ /dev/null @@ -1,6 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo.ios.ts' exists - use it as a name resolution result. -======== Module name './foo' was successfully resolved to '/foo.ios.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.types deleted file mode 100644 index 090f888b93..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one.ts] //// - -=== /index.ts === -import { ios } from "./foo"; ->ios : () => void - -=== /foo.ios.ts === -export function ios() {} ->ios : () => void - -=== /foo.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.errors.txt.diff deleted file mode 100644 index b4268cd42f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.errors.txt.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.moduleResolutionWithSuffixes_oneBlank.errors.txt -+++ new.moduleResolutionWithSuffixes_oneBlank.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [""] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { base } from "./foo"; --==== /foo.ts (0 errors) ==== -- export function base() {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.js deleted file mode 100644 index e8fb849aa9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.js +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_oneBlank.ts] //// - -//// [index.ts] -import { base } from "./foo"; -//// [foo.ts] -export function base() {} - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.symbols deleted file mode 100644 index cfbb8914ee..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_oneBlank.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : Symbol(base, Decl(index.ts, 0, 8)) - -=== /foo.ts === -export function base() {} ->base : Symbol(base, Decl(foo.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.trace.json deleted file mode 100644 index 12c67c71be..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.trace.json +++ /dev/null @@ -1,6 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo.ts' exists - use it as a name resolution result. -======== Module name './foo' was successfully resolved to '/foo.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.types deleted file mode 100644 index 21c3433b19..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneBlank.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_oneBlank.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : () => void - -=== /foo.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.errors.txt deleted file mode 100644 index 92a8d1f8ac..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.errors.txt +++ /dev/null @@ -1,19 +0,0 @@ -/index.ts(1,21): error TS2307: Cannot find module './foo' or its corresponding type declarations. - - -==== /tsconfig.json (0 errors) ==== - { - "compilerOptions": { - "moduleResolution": "node", - "traceResolution": true, - "moduleSuffixes": [".ios"] - } - } - -==== /index.ts (1 errors) ==== - import { ios } from "./foo"; - ~~~~~~~ -!!! error TS2307: Cannot find module './foo' or its corresponding type declarations. -==== /foo.ts (0 errors) ==== - export function base() {} - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.errors.txt.diff deleted file mode 100644 index 779eeea7dd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.moduleResolutionWithSuffixes_oneNotFound.errors.txt -+++ new.moduleResolutionWithSuffixes_oneNotFound.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - /index.ts(1,21): error TS2307: Cannot find module './foo' or its corresponding type declarations. - - --==== /tsconfig.json (1 errors) ==== -+==== /tsconfig.json (0 errors) ==== - { - "compilerOptions": { - "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - "traceResolution": true, - "moduleSuffixes": [".ios"] - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.js deleted file mode 100644 index 26b76060fe..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.js +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_oneNotFound.ts] //// - -//// [index.ts] -import { ios } from "./foo"; -//// [foo.ts] -export function base() {} - - -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.symbols deleted file mode 100644 index fa260c509d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_oneNotFound.ts] //// - -=== /index.ts === -import { ios } from "./foo"; ->ios : Symbol(ios, Decl(index.ts, 0, 8)) - -=== /foo.ts === -export function base() {} ->base : Symbol(base, Decl(foo.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.trace.json deleted file mode 100644 index 7c6529e6a9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.trace.json +++ /dev/null @@ -1,11 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo.ios.ts' does not exist. -File '/foo.ios.tsx' does not exist. -File '/foo.ios.d.ts' does not exist. -File '/foo.ios.js' does not exist. -File '/foo.ios.jsx' does not exist. -Directory '/foo' does not exist, skipping all lookups in it. -======== Module name './foo' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.types deleted file mode 100644 index 017e6098e0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_oneNotFound.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_oneNotFound.ts] //// - -=== /index.ts === -import { ios } from "./foo"; ->ios : any - -=== /foo.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt.diff deleted file mode 100644 index 69ab38bf7a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt -+++ new.moduleResolutionWithSuffixes_one_dirModuleWithIndex.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [".ios"] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { ios } from "./foo"; --==== /foo/index.ios.ts (0 errors) ==== -- export function ios() {} --==== /foo/index.ts (0 errors) ==== -- export function base() {} -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.js deleted file mode 100644 index c23ebd5087..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.js +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.ts] //// - -//// [index.ts] -import { ios } from "./foo"; -//// [index.ios.ts] -export function ios() {} -//// [index.ts] -export function base() {} - -//// [index.ios.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ios = ios; -function ios() { } -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.symbols deleted file mode 100644 index 986c9710b2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.ts] //// - -=== /index.ts === -import { ios } from "./foo"; ->ios : Symbol(ios, Decl(index.ts, 0, 8)) - -=== /foo/index.ios.ts === -export function ios() {} ->ios : Symbol(ios, Decl(index.ios.ts, 0, 0)) - -=== /foo/index.ts === -export function base() {} ->base : Symbol(base, Decl(index.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.trace.json deleted file mode 100644 index f8e9732928..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.trace.json +++ /dev/null @@ -1,12 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo.ios.ts' does not exist. -File '/foo.ios.tsx' does not exist. -File '/foo.ios.d.ts' does not exist. -File '/foo.ios.js' does not exist. -File '/foo.ios.jsx' does not exist. -File '/foo/package.json' does not exist. -File '/foo/index.ios.ts' exists - use it as a name resolution result. -======== Module name './foo' was successfully resolved to '/foo/index.ios.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.types deleted file mode 100644 index 18e251079c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_dirModuleWithIndex.ts] //// - -=== /index.ts === -import { ios } from "./foo"; ->ios : () => void - -=== /foo/index.ios.ts === -export function ios() {} ->ios : () => void - -=== /foo/index.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.errors.txt.diff deleted file mode 100644 index e85122c087..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.errors.txt.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_externalModule.errors.txt -+++ new.moduleResolutionWithSuffixes_one_externalModule.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(6,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "allowJs": true, -- "checkJs": false, -- "outDir": "bin", -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [".ios"] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { ios } from "some-library"; -- --==== /node_modules/some-library/index.ios.js (0 errors) ==== -- "use strict"; -- exports.__esModule = true; -- function ios() {} -- exports.ios = ios; --==== /node_modules/some-library/index.ios.d.ts (0 errors) ==== -- export declare function ios(): void; --==== /node_modules/some-library/index.js (0 errors) ==== -- "use strict"; -- exports.__esModule = true; -- function base() {} -- exports.base = base; --==== /node_modules/some-library/index.d.ts (0 errors) ==== -- export declare function base(): void; -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.js deleted file mode 100644 index 941ca24626..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModule.ts] //// - -//// [index.ios.js] -"use strict"; -exports.__esModule = true; -function ios() {} -exports.ios = ios; -//// [index.ios.d.ts] -export declare function ios(): void; -//// [index.js] -"use strict"; -exports.__esModule = true; -function base() {} -exports.base = base; -//// [index.d.ts] -export declare function base(): void; - -//// [index.ts] -import { ios } from "some-library"; - - -//// [/bin/index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.symbols deleted file mode 100644 index b4238f8b64..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModule.ts] //// - -=== /index.ts === -import { ios } from "some-library"; ->ios : Symbol(ios, Decl(index.ts, 0, 8)) - -=== /node_modules/some-library/index.ios.d.ts === -export declare function ios(): void; ->ios : Symbol(ios, Decl(index.ios.d.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.trace.json deleted file mode 100644 index fc40eb09fd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.trace.json +++ /dev/null @@ -1,15 +0,0 @@ -======== Resolving module 'some-library' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/package.json' does not exist. -Loading module 'some-library' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -File '/node_modules/some-library/package.json' does not exist. -File '/node_modules/some-library.ios.ts' does not exist. -File '/node_modules/some-library.ios.tsx' does not exist. -File '/node_modules/some-library.ios.d.ts' does not exist. -File '/node_modules/some-library/index.ios.ts' does not exist. -File '/node_modules/some-library/index.ios.tsx' does not exist. -File '/node_modules/some-library/index.ios.d.ts' exists - use it as a name resolution result. -Resolving real path for '/node_modules/some-library/index.ios.d.ts', result '/node_modules/some-library/index.ios.d.ts'. -======== Module name 'some-library' was successfully resolved to '/node_modules/some-library/index.ios.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.types deleted file mode 100644 index 3638314748..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModule.ts] //// - -=== /index.ts === -import { ios } from "some-library"; ->ios : () => void - -=== /node_modules/some-library/index.ios.d.ts === -export declare function ios(): void; ->ios : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.errors.txt.diff deleted file mode 100644 index c3459b508b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.errors.txt.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_externalModulePath.errors.txt -+++ new.moduleResolutionWithSuffixes_one_externalModulePath.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(6,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "allowJs": true, -- "checkJs": false, -- "outDir": "bin", -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [".ios"] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { iosfoo } from "some-library/foo"; -- --==== /node_modules/some-library/foo.ios.js (0 errors) ==== -- "use strict"; -- exports.__esModule = true; -- function iosfoo() {} -- exports.iosfoo = iosfoo; --==== /node_modules/some-library/foo.ios.d.ts (0 errors) ==== -- export declare function iosfoo(): void; --==== /node_modules/some-library/foo.js (0 errors) ==== -- "use strict"; -- exports.__esModule = true; -- function basefoo() {} -- exports.basefoo = basefoo; --==== /node_modules/some-library/foo.d.ts (0 errors) ==== -- export declare function basefoo(): void; -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.js deleted file mode 100644 index d3f78b40b3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModulePath.ts] //// - -//// [foo.ios.js] -"use strict"; -exports.__esModule = true; -function iosfoo() {} -exports.iosfoo = iosfoo; -//// [foo.ios.d.ts] -export declare function iosfoo(): void; -//// [foo.js] -"use strict"; -exports.__esModule = true; -function basefoo() {} -exports.basefoo = basefoo; -//// [foo.d.ts] -export declare function basefoo(): void; - -//// [index.ts] -import { iosfoo } from "some-library/foo"; - - -//// [/bin/index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.symbols deleted file mode 100644 index bdfe1a8196..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModulePath.ts] //// - -=== /index.ts === -import { iosfoo } from "some-library/foo"; ->iosfoo : Symbol(iosfoo, Decl(index.ts, 0, 8)) - -=== /node_modules/some-library/foo.ios.d.ts === -export declare function iosfoo(): void; ->iosfoo : Symbol(iosfoo, Decl(foo.ios.d.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.trace.json deleted file mode 100644 index ea9a1c0669..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.trace.json +++ /dev/null @@ -1,12 +0,0 @@ -======== Resolving module 'some-library/foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/package.json' does not exist. -Loading module 'some-library/foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -File '/node_modules/some-library/package.json' does not exist. -File '/node_modules/some-library/foo.ios.ts' does not exist. -File '/node_modules/some-library/foo.ios.tsx' does not exist. -File '/node_modules/some-library/foo.ios.d.ts' exists - use it as a name resolution result. -Resolving real path for '/node_modules/some-library/foo.ios.d.ts', result '/node_modules/some-library/foo.ios.d.ts'. -======== Module name 'some-library/foo' was successfully resolved to '/node_modules/some-library/foo.ios.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.types deleted file mode 100644 index 2bbf292c49..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModulePath.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModulePath.ts] //// - -=== /index.ts === -import { iosfoo } from "some-library/foo"; ->iosfoo : () => void - -=== /node_modules/some-library/foo.ios.d.ts === -export declare function iosfoo(): void; ->iosfoo : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt deleted file mode 100644 index 8772601eba..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt +++ /dev/null @@ -1,50 +0,0 @@ -/tsconfig.json(9,3): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -/tsconfig.json(11,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -/tsconfig.json(12,23): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== /tsconfig.json (3 errors) ==== - { - "compilerOptions": { - "allowJs": true, - "checkJs": false, - "outDir": "bin", - "moduleResolution": "node", - "traceResolution": true, - "moduleSuffixes": [".ios"], - "baseUrl": "/", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "some-library": ["node_modules/some-library/lib"], - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - "some-library/*": ["node_modules/some-library/lib/*"] - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } - -==== /test.ts (0 errors) ==== - import { ios } from "some-library"; - import { ios as ios2 } from "some-library/index"; - import { ios as ios3 } from "some-library/index.js"; - -==== /node_modules/some-library/lib/index.ios.js (0 errors) ==== - "use strict"; - exports.__esModule = true; - function ios() {} - exports.ios = ios; -==== /node_modules/some-library/lib/index.ios.d.ts (0 errors) ==== - export declare function ios(): void; -==== /node_modules/some-library/lib/index.js (0 errors) ==== - "use strict"; - exports.__esModule = true; - function base() {} - exports.base = base; -==== /node_modules/some-library/lib/index.d.ts (0 errors) ==== - export declare function base(): void; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.js deleted file mode 100644 index afa58b8bd3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.ts] //// - -//// [index.ios.js] -"use strict"; -exports.__esModule = true; -function ios() {} -exports.ios = ios; -//// [index.ios.d.ts] -export declare function ios(): void; -//// [index.js] -"use strict"; -exports.__esModule = true; -function base() {} -exports.base = base; -//// [index.d.ts] -export declare function base(): void; - -//// [test.ts] -import { ios } from "some-library"; -import { ios as ios2 } from "some-library/index"; -import { ios as ios3 } from "some-library/index.js"; - - -//// [/bin/test.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.symbols deleted file mode 100644 index 9f119e9b43..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.symbols +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.ts] //// - -=== /test.ts === -import { ios } from "some-library"; ->ios : Symbol(ios, Decl(test.ts, 0, 8)) - -import { ios as ios2 } from "some-library/index"; ->ios : Symbol(ios, Decl(index.ios.d.ts, 0, 0)) ->ios2 : Symbol(ios2, Decl(test.ts, 1, 8)) - -import { ios as ios3 } from "some-library/index.js"; ->ios : Symbol(ios, Decl(index.ios.d.ts, 0, 0)) ->ios3 : Symbol(ios3, Decl(test.ts, 2, 8)) - -=== /node_modules/some-library/lib/index.ios.d.ts === -export declare function ios(): void; ->ios : Symbol(ios, Decl(index.ios.d.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.trace.json deleted file mode 100644 index 5163c0b99c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.trace.json +++ /dev/null @@ -1,45 +0,0 @@ -======== Resolving module 'some-library' from '/test.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'some-library'. -Module name 'some-library', matched pattern 'some-library'. -Trying substitution 'node_modules/some-library/lib', candidate module location: 'node_modules/some-library/lib'. -Loading module as file / folder, candidate module location '/node_modules/some-library/lib', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/node_modules/some-library/lib.ios.ts' does not exist. -File '/node_modules/some-library/lib.ios.tsx' does not exist. -File '/node_modules/some-library/lib.ios.d.ts' does not exist. -File '/node_modules/some-library/lib.ios.js' does not exist. -File '/node_modules/some-library/lib.ios.jsx' does not exist. -File '/node_modules/some-library/lib/package.json' does not exist. -File '/node_modules/some-library/lib/index.ios.ts' does not exist. -File '/node_modules/some-library/lib/index.ios.tsx' does not exist. -File '/node_modules/some-library/lib/index.ios.d.ts' exists - use it as a name resolution result. -Resolving real path for '/node_modules/some-library/lib/index.ios.d.ts', result '/node_modules/some-library/lib/index.ios.d.ts'. -======== Module name 'some-library' was successfully resolved to '/node_modules/some-library/lib/index.ios.d.ts'. ======== -======== Resolving module 'some-library/index' from '/test.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'some-library/index'. -Module name 'some-library/index', matched pattern 'some-library/*'. -Trying substitution 'node_modules/some-library/lib/*', candidate module location: 'node_modules/some-library/lib/index'. -Loading module as file / folder, candidate module location '/node_modules/some-library/lib/index', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/node_modules/some-library/lib/index.ios.ts' does not exist according to earlier cached lookups. -File '/node_modules/some-library/lib/index.ios.tsx' does not exist according to earlier cached lookups. -File '/node_modules/some-library/lib/index.ios.d.ts' exists - use it as a name resolution result. -File '/node_modules/some-library/package.json' does not exist. -Resolving real path for '/node_modules/some-library/lib/index.ios.d.ts', result '/node_modules/some-library/lib/index.ios.d.ts'. -======== Module name 'some-library/index' was successfully resolved to '/node_modules/some-library/lib/index.ios.d.ts'. ======== -======== Resolving module 'some-library/index.js' from '/test.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'some-library/index.js'. -Module name 'some-library/index.js', matched pattern 'some-library/*'. -Trying substitution 'node_modules/some-library/lib/*', candidate module location: 'node_modules/some-library/lib/index.js'. -Loading module as file / folder, candidate module location '/node_modules/some-library/lib/index.js', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/node_modules/some-library/lib/index.js' has a '.js' extension - stripping it. -File '/node_modules/some-library/lib/index.ios.ts' does not exist according to earlier cached lookups. -File '/node_modules/some-library/lib/index.ios.tsx' does not exist according to earlier cached lookups. -File '/node_modules/some-library/lib/index.ios.d.ts' exists - use it as a name resolution result. -File '/node_modules/some-library/package.json' does not exist according to earlier cached lookups. -Resolving real path for '/node_modules/some-library/lib/index.ios.d.ts', result '/node_modules/some-library/lib/index.ios.d.ts'. -======== Module name 'some-library/index.js' was successfully resolved to '/node_modules/some-library/lib/index.ios.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.types deleted file mode 100644 index f88a6fa909..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.types +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.ts] //// - -=== /test.ts === -import { ios } from "some-library"; ->ios : () => void - -import { ios as ios2 } from "some-library/index"; ->ios : () => void ->ios2 : () => void - -import { ios as ios3 } from "some-library/index.js"; ->ios : () => void ->ios3 : () => void - -=== /node_modules/some-library/lib/index.ios.d.ts === -export declare function ios(): void; ->ios : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.errors.txt.diff deleted file mode 100644 index 156fb025fd..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.errors.txt.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_externalTSModule.errors.txt -+++ new.moduleResolutionWithSuffixes_one_externalTSModule.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(4,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "outDir": "bin", -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [".ios"] -- } -- } -- --==== /test.ts (0 errors) ==== -- import { ios } from "some-library"; -- --==== /node_modules/some-library/index.ios.ts (0 errors) ==== -- export function ios() {} --==== /node_modules/some-library/index.ts (0 errors) ==== -- export function base() {} -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.js deleted file mode 100644 index 2214eef0d9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.js +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalTSModule.ts] //// - -//// [index.ios.ts] -export function ios() {} -//// [index.ts] -export function base() {} -//// [test.ts] -import { ios } from "some-library"; - - -//// [/bin/test.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.symbols deleted file mode 100644 index 7c33346870..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalTSModule.ts] //// - -=== /test.ts === -import { ios } from "some-library"; ->ios : Symbol(ios, Decl(test.ts, 0, 8)) - -=== /node_modules/some-library/index.ios.ts === -export function ios() {} ->ios : Symbol(ios, Decl(index.ios.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.trace.json deleted file mode 100644 index a468e7dde0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.trace.json +++ /dev/null @@ -1,13 +0,0 @@ -======== Resolving module 'some-library' from '/test.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/package.json' does not exist. -Loading module 'some-library' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -File '/node_modules/some-library/package.json' does not exist. -File '/node_modules/some-library.ios.ts' does not exist. -File '/node_modules/some-library.ios.tsx' does not exist. -File '/node_modules/some-library.ios.d.ts' does not exist. -File '/node_modules/some-library/index.ios.ts' exists - use it as a name resolution result. -Resolving real path for '/node_modules/some-library/index.ios.ts', result '/node_modules/some-library/index.ios.ts'. -======== Module name 'some-library' was successfully resolved to '/node_modules/some-library/index.ios.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.types deleted file mode 100644 index a61668c71e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_externalTSModule.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_externalTSModule.ts] //// - -=== /test.ts === -import { ios } from "some-library"; ->ios : () => void - -=== /node_modules/some-library/index.ios.ts === -export function ios() {} ->ios : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.js deleted file mode 100644 index 654acf2465..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.js +++ /dev/null @@ -1,35 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_jsModule.ts] //// - -//// [index.ts] -import { ios } from "./foo.js"; -//// [foo.ios.js] -"use strict"; -exports.__esModule = true; -function ios() {} -exports.ios = ios; -//// [foo.js] -"use strict"; -exports.__esModule = true; -function base() {} -exports.base = base; - - -//// [/bin/foo.ios.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -export var __esModule = true; -exports.__esModule = true; -function ios() { } -export var ios = ios; -exports.ios = ios; -//// [/bin/index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [/bin/foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -export var __esModule = true; -exports.__esModule = true; -function base() { } -export var base = base; -exports.base = base; diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.js.diff deleted file mode 100644 index 3a918de7c9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.js.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_jsModule.js -+++ new.moduleResolutionWithSuffixes_one_jsModule.js -@@= skipped -15, +15 lines =@@ - - //// [/bin/foo.ios.js] - "use strict"; -+Object.defineProperty(exports, "__esModule", { value: true }); -+export var __esModule = true; - exports.__esModule = true; - function ios() { } -+export var ios = ios; - exports.ios = ios; - //// [/bin/index.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - //// [/bin/foo.js] - "use strict"; -+Object.defineProperty(exports, "__esModule", { value: true }); -+export var __esModule = true; - exports.__esModule = true; - function base() { } -+export var base = base; - exports.base = base; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols deleted file mode 100644 index 983b83441e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols +++ /dev/null @@ -1,38 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_jsModule.ts] //// - -=== /index.ts === -import { ios } from "./foo.js"; ->ios : Symbol(ios, Decl(index.ts, 0, 8)) - -=== /foo.ios.js === -"use strict"; -exports.__esModule = true; ->exports.__esModule : Symbol(__esModule, Decl(foo.ios.js, 0, 13)) ->exports : Symbol("/foo.ios", Decl(foo.ios.js, 0, 0)) ->__esModule : Symbol(__esModule, Decl(foo.ios.js, 0, 13)) - -function ios() {} ->ios : Symbol(ios, Decl(foo.ios.js, 1, 26)) - -exports.ios = ios; ->exports.ios : Symbol(ios, Decl(foo.ios.js, 2, 17)) ->exports : Symbol("/foo.ios", Decl(foo.ios.js, 0, 0)) ->ios : Symbol(ios, Decl(foo.ios.js, 2, 17)) ->ios : Symbol(ios, Decl(foo.ios.js, 1, 26)) - -=== /foo.js === -"use strict"; -exports.__esModule = true; ->exports.__esModule : Symbol(__esModule, Decl(foo.js, 0, 13)) ->exports : Symbol("/foo", Decl(foo.js, 0, 0)) ->__esModule : Symbol(__esModule, Decl(foo.js, 0, 13)) - -function base() {} ->base : Symbol(base, Decl(foo.js, 1, 26)) - -exports.base = base; ->exports.base : Symbol(base, Decl(foo.js, 2, 18)) ->exports : Symbol("/foo", Decl(foo.js, 0, 0)) ->base : Symbol(base, Decl(foo.js, 2, 18)) ->base : Symbol(base, Decl(foo.js, 1, 26)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols.diff deleted file mode 100644 index f16dc8a3fe..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.symbols.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_jsModule.symbols -+++ new.moduleResolutionWithSuffixes_one_jsModule.symbols -@@= skipped -7, +7 lines =@@ - "use strict"; - exports.__esModule = true; - >exports.__esModule : Symbol(__esModule, Decl(foo.ios.js, 0, 13)) -->exports : Symbol(__esModule, Decl(foo.ios.js, 0, 13)) -+>exports : Symbol("/foo.ios", Decl(foo.ios.js, 0, 0)) - >__esModule : Symbol(__esModule, Decl(foo.ios.js, 0, 13)) - - function ios() {} -@@= skipped -8, +8 lines =@@ - - exports.ios = ios; - >exports.ios : Symbol(ios, Decl(foo.ios.js, 2, 17)) -->exports : Symbol(ios, Decl(foo.ios.js, 2, 17)) -+>exports : Symbol("/foo.ios", Decl(foo.ios.js, 0, 0)) - >ios : Symbol(ios, Decl(foo.ios.js, 2, 17)) - >ios : Symbol(ios, Decl(foo.ios.js, 1, 26)) - -@@= skipped -8, +8 lines =@@ - "use strict"; - exports.__esModule = true; - >exports.__esModule : Symbol(__esModule, Decl(foo.js, 0, 13)) -->exports : Symbol(__esModule, Decl(foo.js, 0, 13)) -+>exports : Symbol("/foo", Decl(foo.js, 0, 0)) - >__esModule : Symbol(__esModule, Decl(foo.js, 0, 13)) - - function base() {} -@@= skipped -8, +8 lines =@@ - - exports.base = base; - >exports.base : Symbol(base, Decl(foo.js, 2, 18)) -->exports : Symbol(base, Decl(foo.js, 2, 18)) -+>exports : Symbol("/foo", Decl(foo.js, 0, 0)) - >base : Symbol(base, Decl(foo.js, 2, 18)) - >base : Symbol(base, Decl(foo.js, 1, 26)) diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.trace.json deleted file mode 100644 index 60619ae53c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.trace.json +++ /dev/null @@ -1,10 +0,0 @@ -======== Resolving module './foo.js' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo.js', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/foo.js' has a '.js' extension - stripping it. -File '/foo.ios.ts' does not exist. -File '/foo.ios.tsx' does not exist. -File '/foo.ios.d.ts' does not exist. -File '/foo.ios.js' exists - use it as a name resolution result. -======== Module name './foo.js' was successfully resolved to '/foo.ios.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.types deleted file mode 100644 index 8638ec5dbb..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsModule.types +++ /dev/null @@ -1,48 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_jsModule.ts] //// - -=== /index.ts === -import { ios } from "./foo.js"; ->ios : () => void - -=== /foo.ios.js === -"use strict"; ->"use strict" : "use strict" - -exports.__esModule = true; ->exports.__esModule = true : true ->exports.__esModule : true ->exports : typeof import("/foo.ios") ->__esModule : true ->true : true - -function ios() {} ->ios : () => void - -exports.ios = ios; ->exports.ios = ios : () => void ->exports.ios : () => void ->exports : typeof import("/foo.ios") ->ios : () => void ->ios : () => void - -=== /foo.js === -"use strict"; ->"use strict" : "use strict" - -exports.__esModule = true; ->exports.__esModule = true : true ->exports.__esModule : true ->exports : typeof import("/foo") ->__esModule : true ->true : true - -function base() {} ->base : () => void - -exports.base = base; ->exports.base = base : () => void ->exports.base : () => void ->exports : typeof import("/foo") ->base : () => void ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.errors.txt.diff deleted file mode 100644 index cada164092..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.errors.txt.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_jsonModule.errors.txt -+++ new.moduleResolutionWithSuffixes_one_jsonModule.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(6,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "esModuleInterop": true, -- "resolveJsonModule": true, -- "outDir": "bin", -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [".ios"] -- } -- } -- --==== /index.ts (0 errors) ==== -- import foo from "./foo.json"; -- console.log(foo.ios); --==== /foo.ios.json (0 errors) ==== -- { -- "ios": "platform ios" -- } --==== /foo.json (0 errors) ==== -- { -- "base": "platform base" -- } -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.js deleted file mode 100644 index a22779d268..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.js +++ /dev/null @@ -1,27 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_jsonModule.ts] //// - -//// [foo.ios.json] -{ - "ios": "platform ios" -} -//// [foo.json] -{ - "base": "platform base" -} - -//// [index.ts] -import foo from "./foo.json"; -console.log(foo.ios); - -//// [/bin/foo.ios.json] -{ - "ios": "platform ios" -} -//// [/bin/index.js] -"use strict"; -var __importDefault = (this && this.__importDefault) || function (mod) { - return (mod && mod.__esModule) ? mod : { "default": mod }; -}; -Object.defineProperty(exports, "__esModule", { value: true }); -const foo_json_1 = __importDefault(require("./foo.json")); -console.log(foo_json_1.default.ios); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.js.diff deleted file mode 100644 index a468c3ba06..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.js.diff +++ /dev/null @@ -1,9 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_jsonModule.js -+++ new.moduleResolutionWithSuffixes_one_jsonModule.js -@@= skipped -22, +22 lines =@@ - return (mod && mod.__esModule) ? mod : { "default": mod }; - }; - Object.defineProperty(exports, "__esModule", { value: true }); --var foo_json_1 = __importDefault(require("./foo.json")); -+const foo_json_1 = __importDefault(require("./foo.json")); - console.log(foo_json_1.default.ios); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.symbols deleted file mode 100644 index 96b841a812..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.symbols +++ /dev/null @@ -1,19 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_jsonModule.ts] //// - -=== /index.ts === -import foo from "./foo.json"; ->foo : Symbol(foo, Decl(index.ts, 0, 6)) - -console.log(foo.ios); ->console.log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->console : Symbol(console, Decl(lib.dom.d.ts, --, --)) ->log : Symbol(Console.log, Decl(lib.dom.d.ts, --, --)) ->foo.ios : Symbol("ios", Decl(foo.ios.json, 0, 1)) ->foo : Symbol(foo, Decl(index.ts, 0, 6)) ->ios : Symbol("ios", Decl(foo.ios.json, 0, 1)) - -=== /foo.ios.json === -{ - "ios": "platform ios" ->"ios" : Symbol("ios", Decl(foo.ios.json, 0, 1)) -} diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.trace.json deleted file mode 100644 index fd456e1ae6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.trace.json +++ /dev/null @@ -1,8 +0,0 @@ -======== Resolving module './foo.json' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo.json', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/foo.json' has a '.json' extension - stripping it. -File '/foo.d.json.ios.ts' does not exist. -File '/foo.ios.json' exists - use it as a name resolution result. -======== Module name './foo.json' was successfully resolved to '/foo.ios.json'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.types deleted file mode 100644 index 5e4d6ac4eb..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_one_jsonModule.types +++ /dev/null @@ -1,23 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_one_jsonModule.ts] //// - -=== /index.ts === -import foo from "./foo.json"; ->foo : { ios: string; } - -console.log(foo.ios); ->console.log(foo.ios) : void ->console.log : (...data: any[]) => void ->console : Console ->log : (...data: any[]) => void ->foo.ios : string ->foo : { ios: string; } ->ios : string - -=== /foo.ios.json === -{ ->{ "ios": "platform ios"} : { ios: string; } - - "ios": "platform ios" ->"ios" : string ->"platform ios" : "platform ios" -} diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt.diff deleted file mode 100644 index 35f61639d6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt -+++ new.moduleResolutionWithSuffixes_threeLastIsBlank1.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": ["-ios", "__native", ""] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { ios } from "./foo"; --==== /foo-ios.ts (0 errors) ==== -- export function ios() {} --==== /foo__native.ts (0 errors) ==== -- export function native() {} --==== /foo.ts (0 errors) ==== -- export function base() {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.js deleted file mode 100644 index 2edefb4458..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.js +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.ts] //// - -//// [index.ts] -import { ios } from "./foo"; -//// [foo-ios.ts] -export function ios() {} -//// [foo__native.ts] -export function native() {} -//// [foo.ts] -export function base() {} - - -//// [foo-ios.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ios = ios; -function ios() { } -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [foo__native.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.native = native; -function native() { } -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.symbols deleted file mode 100644 index 389b869f6c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.symbols +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.ts] //// - -=== /index.ts === -import { ios } from "./foo"; ->ios : Symbol(ios, Decl(index.ts, 0, 8)) - -=== /foo-ios.ts === -export function ios() {} ->ios : Symbol(ios, Decl(foo-ios.ts, 0, 0)) - -=== /foo__native.ts === -export function native() {} ->native : Symbol(native, Decl(foo__native.ts, 0, 0)) - -=== /foo.ts === -export function base() {} ->base : Symbol(base, Decl(foo.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.trace.json deleted file mode 100644 index 721a88d1e6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.trace.json +++ /dev/null @@ -1,6 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo-ios.ts' exists - use it as a name resolution result. -======== Module name './foo' was successfully resolved to '/foo-ios.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.types deleted file mode 100644 index df92c8f19d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.types +++ /dev/null @@ -1,18 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank1.ts] //// - -=== /index.ts === -import { ios } from "./foo"; ->ios : () => void - -=== /foo-ios.ts === -export function ios() {} ->ios : () => void - -=== /foo__native.ts === -export function native() {} ->native : () => void - -=== /foo.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt.diff deleted file mode 100644 index 978953794a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt -+++ new.moduleResolutionWithSuffixes_threeLastIsBlank2.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": ["-ios", "__native", ""] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { native } from "./foo"; --==== /foo__native.ts (0 errors) ==== -- export function native() {} --==== /foo.ts (0 errors) ==== -- export function base() {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.js deleted file mode 100644 index 4e6791c103..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.js +++ /dev/null @@ -1,23 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.ts] //// - -//// [index.ts] -import { native } from "./foo"; -//// [foo__native.ts] -export function native() {} -//// [foo.ts] -export function base() {} - - -//// [foo__native.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.native = native; -function native() { } -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.symbols deleted file mode 100644 index 54dd21f5e3..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.ts] //// - -=== /index.ts === -import { native } from "./foo"; ->native : Symbol(native, Decl(index.ts, 0, 8)) - -=== /foo__native.ts === -export function native() {} ->native : Symbol(native, Decl(foo__native.ts, 0, 0)) - -=== /foo.ts === -export function base() {} ->base : Symbol(base, Decl(foo.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.trace.json deleted file mode 100644 index f6e7ec2000..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.trace.json +++ /dev/null @@ -1,7 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo-ios.ts' does not exist. -File '/foo__native.ts' exists - use it as a name resolution result. -======== Module name './foo' was successfully resolved to '/foo__native.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.types deleted file mode 100644 index e9192913bb..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank2.ts] //// - -=== /index.ts === -import { native } from "./foo"; ->native : () => void - -=== /foo__native.ts === -export function native() {} ->native : () => void - -=== /foo.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt.diff deleted file mode 100644 index 1672bb7aa0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt -+++ new.moduleResolutionWithSuffixes_threeLastIsBlank3.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": ["-ios", "__native", ""] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { base } from "./foo"; --==== /foo.ts (0 errors) ==== -- export function base() {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.js deleted file mode 100644 index 7418afd333..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.js +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.ts] //// - -//// [index.ts] -import { base } from "./foo"; -//// [foo.ts] -export function base() {} - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.base = base; -function base() { } -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.symbols deleted file mode 100644 index 276000be9f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : Symbol(base, Decl(index.ts, 0, 8)) - -=== /foo.ts === -export function base() {} ->base : Symbol(base, Decl(foo.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.trace.json deleted file mode 100644 index 82b0a57168..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.trace.json +++ /dev/null @@ -1,8 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo-ios.ts' does not exist. -File '/foo__native.ts' does not exist. -File '/foo.ts' exists - use it as a name resolution result. -======== Module name './foo' was successfully resolved to '/foo.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.types deleted file mode 100644 index 5a35c481f5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank3.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : () => void - -=== /foo.ts === -export function base() {} ->base : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt deleted file mode 100644 index 0a329aac3f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -/index.ts(1,22): error TS2307: Cannot find module './foo' or its corresponding type declarations. - - -==== /tsconfig.json (0 errors) ==== - { - "compilerOptions": { - "moduleResolution": "node", - "traceResolution": true, - "moduleSuffixes": ["-ios", "__native", ""] - } - } - -==== /index.ts (1 errors) ==== - import { base } from "./foo"; - ~~~~~~~ -!!! error TS2307: Cannot find module './foo' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt.diff deleted file mode 100644 index 79da8b925c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt -+++ new.moduleResolutionWithSuffixes_threeLastIsBlank4.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(3,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - /index.ts(1,22): error TS2307: Cannot find module './foo' or its corresponding type declarations. - - --==== /tsconfig.json (1 errors) ==== -+==== /tsconfig.json (0 errors) ==== - { - "compilerOptions": { - "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - "traceResolution": true, - "moduleSuffixes": ["-ios", "__native", ""] - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.js deleted file mode 100644 index 40de3b226d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.js +++ /dev/null @@ -1,9 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.ts] //// - -//// [index.ts] -import { base } from "./foo"; - - -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.symbols deleted file mode 100644 index 5b76b5b678..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : Symbol(base, Decl(index.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.trace.json b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.trace.json deleted file mode 100644 index 3239f2986b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.trace.json +++ /dev/null @@ -1,21 +0,0 @@ -======== Resolving module './foo' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo-ios.ts' does not exist. -File '/foo__native.ts' does not exist. -File '/foo.ts' does not exist. -File '/foo-ios.tsx' does not exist. -File '/foo__native.tsx' does not exist. -File '/foo.tsx' does not exist. -File '/foo-ios.d.ts' does not exist. -File '/foo__native.d.ts' does not exist. -File '/foo.d.ts' does not exist. -File '/foo-ios.js' does not exist. -File '/foo__native.js' does not exist. -File '/foo.js' does not exist. -File '/foo-ios.jsx' does not exist. -File '/foo__native.jsx' does not exist. -File '/foo.jsx' does not exist. -Directory '/foo' does not exist, skipping all lookups in it. -======== Module name './foo' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.types b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.types deleted file mode 100644 index 270ef7ce1a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.types +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/moduleResolutionWithSuffixes_threeLastIsBlank4.ts] //// - -=== /index.ts === -import { base } from "./foo"; ->base : any - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.errors.txt b/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.errors.txt deleted file mode 100644 index 1db2d6ee03..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -/dir1/dir2/dir3/index.ts(1,15): error TS2307: Cannot find module 'a' or its corresponding type declarations. - - -==== /dir1/dir2/dir3/a.js (0 errors) ==== - export default "dir1/dir2/dir3/a.js"; - -==== /dir1/dir2/a.ts (0 errors) ==== - export default "dir1/dir2/a.ts"; - -==== /dir1/dir2/dir3/index.ts (1 errors) ==== - import a from "a"; - ~~~ -!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.symbols b/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.symbols deleted file mode 100644 index 49d831f4ec..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/moduleResolution_classicPrefersTs.ts] //// - -=== /dir1/dir2/dir3/a.js === - -export default "dir1/dir2/dir3/a.js"; - -=== /dir1/dir2/a.ts === - -export default "dir1/dir2/a.ts"; - -=== /dir1/dir2/dir3/index.ts === -import a from "a"; ->a : Symbol(a, Decl(index.ts, 0, 6)) - diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.types b/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.types deleted file mode 100644 index 3b33adc544..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolution_classicPrefersTs.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/moduleResolution_classicPrefersTs.ts] //// - -=== /dir1/dir2/dir3/a.js === - -export default "dir1/dir2/dir3/a.js"; - -=== /dir1/dir2/a.ts === - -export default "dir1/dir2/a.ts"; - -=== /dir1/dir2/dir3/index.ts === -import a from "a"; ->a : any - diff --git a/testdata/baselines/reference/submodule/compiler/narrowedImports.js b/testdata/baselines/reference/submodule/compiler/narrowedImports.js index 32fd2f9202..c92a35a11b 100644 --- a/testdata/baselines/reference/submodule/compiler/narrowedImports.js +++ b/testdata/baselines/reference/submodule/compiler/narrowedImports.js @@ -26,9 +26,42 @@ if (b1) x = b1; //// [x.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); -const b0 = require("./b"); +const a_1 = __importStar(require("./a")); +const b0 = __importStar(require("./b")); const b1 = require("./b"); let x; if (a_1.default) diff --git a/testdata/baselines/reference/submodule/compiler/narrowedImports.js.diff b/testdata/baselines/reference/submodule/compiler/narrowedImports.js.diff index 3f7754832c..445cfaaaad 100644 --- a/testdata/baselines/reference/submodule/compiler/narrowedImports.js.diff +++ b/testdata/baselines/reference/submodule/compiler/narrowedImports.js.diff @@ -1,14 +1,14 @@ --- old.narrowedImports.js +++ new.narrowedImports.js -@@= skipped -26, +26 lines =@@ - //// [x.js] - "use strict"; +@@= skipped -59, +59 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); --var b0 = require("./b"); +-var a_1 = __importStar(require("./a")); +-var b0 = __importStar(require("./b")); -var b1 = require("./b"); -+const a_1 = require("./a"); -+const b0 = require("./b"); ++const a_1 = __importStar(require("./a")); ++const b0 = __importStar(require("./b")); +const b1 = require("./b"); let x; if (a_1.default) diff --git a/testdata/baselines/reference/submodule/compiler/newAbstractInstance2.js b/testdata/baselines/reference/submodule/compiler/newAbstractInstance2.js index a875045757..68b3191ea4 100644 --- a/testdata/baselines/reference/submodule/compiler/newAbstractInstance2.js +++ b/testdata/baselines/reference/submodule/compiler/newAbstractInstance2.js @@ -16,6 +16,9 @@ class default_1 { exports.default = default_1; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); new a_1.default(); diff --git a/testdata/baselines/reference/submodule/compiler/newAbstractInstance2.js.diff b/testdata/baselines/reference/submodule/compiler/newAbstractInstance2.js.diff index 5aab015da1..3b6a5222a9 100644 --- a/testdata/baselines/reference/submodule/compiler/newAbstractInstance2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/newAbstractInstance2.js.diff @@ -1,9 +1,9 @@ --- old.newAbstractInstance2.js +++ new.newAbstractInstance2.js -@@= skipped -16, +16 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -19, +19 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); new a_1.default(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/noCrashOnImportShadowing.js b/testdata/baselines/reference/submodule/compiler/noCrashOnImportShadowing.js index 52185d40e2..2ef0e9f65b 100644 --- a/testdata/baselines/reference/submodule/compiler/noCrashOnImportShadowing.js +++ b/testdata/baselines/reference/submodule/compiler/noCrashOnImportShadowing.js @@ -33,18 +33,84 @@ exports.zzz = void 0; exports.zzz = 123; //// [a.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.B = void 0; -const B = require("./b"); +const B = __importStar(require("./b")); exports.B = B; const x = { x: "" }; B.zzz; //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); const a_1 = require("./a"); const x = { x: "" }; a_1.B.zzz; -const OriginalB = require("./b"); +const OriginalB = __importStar(require("./b")); OriginalB.zzz; const y = x; diff --git a/testdata/baselines/reference/submodule/compiler/noCrashOnImportShadowing.js.diff b/testdata/baselines/reference/submodule/compiler/noCrashOnImportShadowing.js.diff index a6b80d575c..6e713867a7 100644 --- a/testdata/baselines/reference/submodule/compiler/noCrashOnImportShadowing.js.diff +++ b/testdata/baselines/reference/submodule/compiler/noCrashOnImportShadowing.js.diff @@ -1,22 +1,23 @@ --- old.noCrashOnImportShadowing.js +++ new.noCrashOnImportShadowing.js -@@= skipped -34, +34 lines =@@ - "use strict"; +@@= skipped -67, +67 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.B = void 0; --var B = require("./b"); -+const B = require("./b"); +-var B = __importStar(require("./b")); ++const B = __importStar(require("./b")); exports.B = B; const x = { x: "" }; B.zzz; - //// [index.js] - "use strict"; +@@= skipped -40, +40 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); -var a_1 = require("./a"); +const a_1 = require("./a"); const x = { x: "" }; a_1.B.zzz; --var OriginalB = require("./b"); -+const OriginalB = require("./b"); +-var OriginalB = __importStar(require("./b")); ++const OriginalB = __importStar(require("./b")); OriginalB.zzz; const y = x; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt.diff new file mode 100644 index 0000000000..0229a14ee6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt.diff @@ -0,0 +1,11 @@ +--- old.noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt ++++ new.noErrorUsingImportExportModuleAugmentationInDeclarationFile1.errors.txt +@@= skipped -0, +0 lines =@@ +-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. +- +- +-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. +-==== 0.d.ts (0 errors) ==== +- export = a; +- declare var a: number; ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt.diff index 0bd989fdba..23c18fa4be 100644 --- a/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt.diff +++ b/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt.diff @@ -1,9 +1,11 @@ --- old.noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt +++ new.noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt @@= skipped -0, +0 lines =@@ +-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'. - - +-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -==== 1.ts (1 errors) ==== - export var j = "hello"; // error - ~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt.diff index 5c1fdb1f38..ec48d57425 100644 --- a/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt.diff +++ b/testdata/baselines/reference/submodule/compiler/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt.diff @@ -1,9 +1,11 @@ --- old.noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt +++ new.noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt @@= skipped -0, +0 lines =@@ +-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'. - - +-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -==== 0.d.ts (0 errors) ==== - export = a; - declare var a: number; diff --git a/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution.js b/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution.js index 33efcbc498..36fc6525f6 100644 --- a/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution.js +++ b/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution.js @@ -26,6 +26,39 @@ console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE) //// [main.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ph = require("node:ph"); +const ph = __importStar(require("node:ph")); console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE); diff --git a/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution.js.diff b/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution.js.diff index a585c3e46c..f3b5ad4a12 100644 --- a/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution.js.diff +++ b/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution.js.diff @@ -1,9 +1,9 @@ --- old.nodeColonModuleResolution.js +++ new.nodeColonModuleResolution.js -@@= skipped -26, +26 lines =@@ - //// [main.js] - "use strict"; +@@= skipped -59, +59 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ph = require("node:ph"); -+const ph = require("node:ph"); +-var ph = __importStar(require("node:ph")); ++const ph = __importStar(require("node:ph")); console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution2.js b/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution2.js index 84f8e17559..83baae6aaf 100644 --- a/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution2.js +++ b/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution2.js @@ -21,6 +21,39 @@ console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE) //// [main.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ph = require("fake:thing"); +const ph = __importStar(require("fake:thing")); console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE); diff --git a/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution2.js.diff b/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution2.js.diff index dc2ee6585d..de0f484079 100644 --- a/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/nodeColonModuleResolution2.js.diff @@ -1,9 +1,9 @@ --- old.nodeColonModuleResolution2.js +++ new.nodeColonModuleResolution2.js -@@= skipped -21, +21 lines =@@ - //// [main.js] - "use strict"; +@@= skipped -54, +54 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ph = require("fake:thing"); -+const ph = require("fake:thing"); +-var ph = __importStar(require("fake:thing")); ++const ph = __importStar(require("fake:thing")); console.log(ph.constants.NODE_PERFORMANCE_GC_FLAGS_ALL_AVAILABLE_GARBAGE); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.errors.txt b/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.errors.txt deleted file mode 100644 index 1b6c912420..0000000000 --- a/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.errors.txt +++ /dev/null @@ -1,7 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== optionsOutAndNoModuleGen.ts (0 errors) ==== - export var x = 10; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.symbols b/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.symbols deleted file mode 100644 index 1bd751e79e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/optionsOutAndNoModuleGen.ts] //// - -=== optionsOutAndNoModuleGen.ts === -export var x = 10; ->x : Symbol(x, Decl(optionsOutAndNoModuleGen.ts, 0, 10)) - diff --git a/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.types b/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.types deleted file mode 100644 index 2bfbe2dac2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/optionsOutAndNoModuleGen.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/optionsOutAndNoModuleGen.ts] //// - -=== optionsOutAndNoModuleGen.ts === -export var x = 10; ->x : number ->10 : 10 - diff --git a/testdata/baselines/reference/submodule/compiler/out-flag2.errors.txt b/testdata/baselines/reference/submodule/compiler/out-flag2.errors.txt deleted file mode 100644 index 56912a9b11..0000000000 --- a/testdata/baselines/reference/submodule/compiler/out-flag2.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class A { } - -==== b.ts (0 errors) ==== - class B { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/out-flag2.symbols b/testdata/baselines/reference/submodule/compiler/out-flag2.symbols deleted file mode 100644 index 705820e3b4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/out-flag2.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/out-flag2.ts] //// - -=== a.ts === -class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -class B { } ->B : Symbol(B, Decl(b.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/out-flag2.types b/testdata/baselines/reference/submodule/compiler/out-flag2.types deleted file mode 100644 index 9377348a5a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/out-flag2.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/out-flag2.ts] //// - -=== a.ts === -class A { } ->A : A - -=== b.ts === -class B { } ->B : B - diff --git a/testdata/baselines/reference/submodule/compiler/out-flag3.errors.txt b/testdata/baselines/reference/submodule/compiler/out-flag3.errors.txt deleted file mode 100644 index 56912a9b11..0000000000 --- a/testdata/baselines/reference/submodule/compiler/out-flag3.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - class A { } - -==== b.ts (0 errors) ==== - class B { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/out-flag3.symbols b/testdata/baselines/reference/submodule/compiler/out-flag3.symbols deleted file mode 100644 index 4a70037a37..0000000000 --- a/testdata/baselines/reference/submodule/compiler/out-flag3.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/out-flag3.ts] //// - -=== a.ts === -class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -class B { } ->B : Symbol(B, Decl(b.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/out-flag3.types b/testdata/baselines/reference/submodule/compiler/out-flag3.types deleted file mode 100644 index 83cc4a4e88..0000000000 --- a/testdata/baselines/reference/submodule/compiler/out-flag3.types +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/out-flag3.ts] //// - -=== a.ts === -class A { } ->A : A - -=== b.ts === -class B { } ->B : B - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.errors.txt b/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.errors.txt deleted file mode 100644 index 59d09f8ab4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== ref/a.ts (0 errors) ==== - export class A { } - -==== b.ts (0 errors) ==== - import {A} from "./ref/a"; - export class B extends A { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.symbols b/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.symbols deleted file mode 100644 index a79dd18231..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatCommonjs.ts] //// - -=== ref/a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -import {A} from "./ref/a"; ->A : Symbol(A, Decl(b.ts, 0, 8)) - -export class B extends A { } ->B : Symbol(B, Decl(b.ts, 0, 26)) ->A : Symbol(A, Decl(b.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.types b/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.types deleted file mode 100644 index 449c2327c0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjs.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatCommonjs.ts] //// - -=== ref/a.ts === -export class A { } ->A : A - -=== b.ts === -import {A} from "./ref/a"; ->A : typeof A - -export class B extends A { } ->B : B ->A : A - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.errors.txt b/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.errors.txt deleted file mode 100644 index 59d09f8ab4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.errors.txt +++ /dev/null @@ -1,11 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== ref/a.ts (0 errors) ==== - export class A { } - -==== b.ts (0 errors) ==== - import {A} from "./ref/a"; - export class B extends A { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.symbols b/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.symbols deleted file mode 100644 index e352a0e06a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatCommonjsDeclarationOnly.ts] //// - -=== ref/a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -import {A} from "./ref/a"; ->A : Symbol(A, Decl(b.ts, 0, 8)) - -export class B extends A { } ->B : Symbol(B, Decl(b.ts, 0, 26)) ->A : Symbol(A, Decl(b.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.types b/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.types deleted file mode 100644 index 3fda6678c1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatCommonjsDeclarationOnly.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatCommonjsDeclarationOnly.ts] //// - -=== ref/a.ts === -export class A { } ->A : A - -=== b.ts === -import {A} from "./ref/a"; ->A : typeof A - -export class B extends A { } ->B : B ->A : A - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.errors.txt b/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.errors.txt deleted file mode 100644 index 080343cb99..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== ref/a.ts (0 errors) ==== - export class A { } - -==== b.ts (0 errors) ==== - import {A} from "./ref/a"; - export class B extends A { } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.symbols b/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.symbols deleted file mode 100644 index af62807ad9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatES6.ts] //// - -=== ref/a.ts === -export class A { } ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -import {A} from "./ref/a"; ->A : Symbol(A, Decl(b.ts, 0, 8)) - -export class B extends A { } ->B : Symbol(B, Decl(b.ts, 0, 26)) ->A : Symbol(A, Decl(b.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.types b/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.types deleted file mode 100644 index d3eb03be1d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatES6.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatES6.ts] //// - -=== ref/a.ts === -export class A { } ->A : A - -=== b.ts === -import {A} from "./ref/a"; ->A : typeof A - -export class B extends A { } ->B : B ->A : A - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.errors.txt b/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.errors.txt deleted file mode 100644 index cff51678ba..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.errors.txt +++ /dev/null @@ -1,9 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - export class A { } // module - -==== b.ts (0 errors) ==== - var x = 0; // global \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.symbols b/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.symbols deleted file mode 100644 index 857c186146..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatUnspecifiedModuleKind.ts] //// - -=== a.ts === -export class A { } // module ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -var x = 0; // global ->x : Symbol(x, Decl(b.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.types b/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.types deleted file mode 100644 index fa04fc4a1b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKind.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatUnspecifiedModuleKind.ts] //// - -=== a.ts === -export class A { } // module ->A : A - -=== b.ts === -var x = 0; // global ->x : number ->0 : 0 - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt b/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt deleted file mode 100644 index 6993b8737b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - export class A { } // module - -==== b.ts (0 errors) ==== - var x = 0; // global - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.symbols b/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.symbols deleted file mode 100644 index 8e8ce431bc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.ts] //// - -=== a.ts === -export class A { } // module ->A : Symbol(A, Decl(a.ts, 0, 0)) - -=== b.ts === -var x = 0; // global ->x : Symbol(x, Decl(b.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.types b/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.types deleted file mode 100644 index 8530681d6a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.ts] //// - -=== a.ts === -export class A { } // module ->A : A - -=== b.ts === -var x = 0; // global ->x : number ->0 : 0 - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.errors.txt deleted file mode 100644 index bfa464e63f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.errors.txt +++ /dev/null @@ -1,28 +0,0 @@ -root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./src/*"]}' instead. -root/tsconfig.json(5,13): error TS5061: Pattern '*1*' can have at most one '*' character. -root/tsconfig.json(5,22): error TS5062: Substitution '*2*' in pattern '*1*' can have at most one '*' character. -root/tsconfig.json(5,22): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== root/tsconfig.json (4 errors) ==== - { - "compilerOptions": { - "baseUrl": "./src", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./src/*"]}' instead. - "paths": { - "*1*": [ "*2*" ] - ~~~~~ -!!! error TS5061: Pattern '*1*' can have at most one '*' character. - ~~~~~ -!!! error TS5062: Substitution '*2*' in pattern '*1*' can have at most one '*' character. - ~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } - -==== root/src/folder1/file1.ts (0 errors) ==== - export var x = 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.js deleted file mode 100644 index 977ce98f6a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.js +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts] //// - -//// [file1.ts] -export var x = 1; - -//// [file1.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -exports.x = 1; diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.symbols deleted file mode 100644 index 088a7afbd6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts] //// - -=== root/src/folder1/file1.ts === -export var x = 1; ->x : Symbol(x, Decl(file1.ts, 0, 10)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.types deleted file mode 100644 index 86e6008d9e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution2_node.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution2_node.ts] //// - -=== root/src/folder1/file1.ts === -export var x = 1; ->x : number ->1 : 1 - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.errors.txt deleted file mode 100644 index e0aae7ab26..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -c:/root/folder1/file1.ts(1,17): error TS2307: Cannot find module 'folder2/file2' or its corresponding type declarations. - - -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -==== c:/root/folder1/file1.ts (1 errors) ==== - import {x} from "folder2/file2" - ~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'folder2/file2' or its corresponding type declarations. - declare function use(a: any): void; - use(x.toExponential()); - -==== c:/root/folder2/file2.ts (0 errors) ==== - import {x as a} from "./file3" // found with baseurl - import {y as b} from "file4" // found with fallback - export var x = a + b; - -==== c:/root/folder2/file3.ts (0 errors) ==== - export var x = 1; - -==== c:/node_modules/file4/index.d.ts (0 errors) ==== - export var y: number; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.js deleted file mode 100644 index f35b765898..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.js +++ /dev/null @@ -1,35 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts] //// - -//// [file1.ts] -import {x} from "folder2/file2" -declare function use(a: any): void; -use(x.toExponential()); - -//// [file2.ts] -import {x as a} from "./file3" // found with baseurl -import {y as b} from "file4" // found with fallback -export var x = a + b; - -//// [file3.ts] -export var x = 1; - -//// [index.d.ts] -export var y: number; - -//// [file1.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const file2_1 = require("folder2/file2"); -use(file2_1.x.toExponential()); -//// [file3.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -exports.x = 1; -//// [file2.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -const file3_1 = require("./file3"); // found with baseurl -const file4_1 = require("file4"); // found with fallback -exports.x = file3_1.x + file4_1.y; diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.js.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.js.diff deleted file mode 100644 index 84ef9de58b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.js.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.pathMappingBasedModuleResolution3_node.js -+++ new.pathMappingBasedModuleResolution3_node.js -@@= skipped -15, +15 lines =@@ - //// [index.d.ts] - export var y: number; - -+//// [file1.js] -+"use strict"; -+Object.defineProperty(exports, "__esModule", { value: true }); -+const file2_1 = require("folder2/file2"); -+use(file2_1.x.toExponential()); - //// [file3.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); -@@= skipped -9, +14 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.x = void 0; --var file3_1 = require("./file3"); // found with baseurl --var file4_1 = require("file4"); // found with fallback -+const file3_1 = require("./file3"); // found with baseurl -+const file4_1 = require("file4"); // found with fallback - exports.x = file3_1.x + file4_1.y; --//// [file1.js] --"use strict"; --Object.defineProperty(exports, "__esModule", { value: true }); --var file2_1 = require("folder2/file2"); --use(file2_1.x.toExponential()); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.symbols deleted file mode 100644 index 76c1e12b4e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.symbols +++ /dev/null @@ -1,36 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts] //// - -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->a : Symbol(a, Decl(file1.ts, 1, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -=== c:/root/folder2/file2.ts === -import {x as a} from "./file3" // found with baseurl ->x : Symbol(a, Decl(file3.ts, 0, 10)) ->a : Symbol(a, Decl(file2.ts, 0, 8)) - -import {y as b} from "file4" // found with fallback ->y : Symbol(b, Decl(index.d.ts, 0, 10)) ->b : Symbol(b, Decl(file2.ts, 1, 8)) - -export var x = a + b; ->x : Symbol(x, Decl(file2.ts, 2, 10)) ->a : Symbol(a, Decl(file2.ts, 0, 8)) ->b : Symbol(b, Decl(file2.ts, 1, 8)) - -=== c:/root/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - -=== c:/node_modules/file4/index.d.ts === -export var y: number; ->y : Symbol(y, Decl(index.d.ts, 0, 10)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.symbols.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.symbols.diff deleted file mode 100644 index 95a0bf63bc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.symbols.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.pathMappingBasedModuleResolution3_node.symbols -+++ new.pathMappingBasedModuleResolution3_node.symbols -@@= skipped -9, +9 lines =@@ - - use(x.toExponential()); - >use : Symbol(use, Decl(file1.ts, 0, 31)) -->x.toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) - >x : Symbol(x, Decl(file1.ts, 0, 8)) -->toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) - - === c:/root/folder2/file2.ts === - import {x as a} from "./file3" // found with baseurl \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.trace.json deleted file mode 100644 index b57204c2f5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.trace.json +++ /dev/null @@ -1,44 +0,0 @@ -======== Resolving module 'folder2/file2' from 'c:/root/folder1/file1.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File 'c:/root/folder1/package.json' does not exist. -File 'c:/root/package.json' does not exist. -File 'c:/package.json' does not exist. -Loading module 'folder2/file2' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory 'c:/root/folder1/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/folder1/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory 'c:/root/folder1/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -======== Module name 'folder2/file2' was not resolved. ======== -======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location 'c:/root/folder2/file3', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/folder2/file3.ts' exists - use it as a name resolution result. -======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ======== -======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File 'c:/root/folder2/package.json' does not exist. -File 'c:/root/package.json' does not exist according to earlier cached lookups. -File 'c:/package.json' does not exist according to earlier cached lookups. -Loading module 'file4' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory 'c:/root/folder2/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/folder2/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules/@types' does not exist, skipping all lookups in it. -File 'c:/node_modules/file4/package.json' does not exist. -File 'c:/node_modules/file4.ts' does not exist. -File 'c:/node_modules/file4.tsx' does not exist. -File 'c:/node_modules/file4.d.ts' does not exist. -File 'c:/node_modules/file4/index.ts' does not exist. -File 'c:/node_modules/file4/index.tsx' does not exist. -File 'c:/node_modules/file4/index.d.ts' exists - use it as a name resolution result. -Resolving real path for 'c:/node_modules/file4/index.d.ts', result 'c:/node_modules/file4/index.d.ts'. -======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4/index.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.types deleted file mode 100644 index d887ab6acc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.types +++ /dev/null @@ -1,42 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution3_node.ts] //// - -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file2" ->x : any - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : any ->x.toExponential : any ->x : any ->toExponential : any - -=== c:/root/folder2/file2.ts === -import {x as a} from "./file3" // found with baseurl ->x : number ->a : number - -import {y as b} from "file4" // found with fallback ->y : number ->b : number - -export var x = a + b; ->x : number ->a + b : number ->a : number ->b : number - -=== c:/root/folder2/file3.ts === -export var x = 1; ->x : number ->1 : 1 - -=== c:/node_modules/file4/index.d.ts === -export var y: number; ->y : number - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.types.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.types.diff deleted file mode 100644 index 8807bc71ee..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution3_node.types.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.pathMappingBasedModuleResolution3_node.types -+++ new.pathMappingBasedModuleResolution3_node.types -@@= skipped -1, +1 lines =@@ - - === c:/root/folder1/file1.ts === - import {x} from "folder2/file2" -->x : number -+>x : any - - declare function use(a: any): void; - >use : (a: any) => void -@@= skipped -9, +9 lines =@@ - use(x.toExponential()); - >use(x.toExponential()) : void - >use : (a: any) => void -->x.toExponential() : string -->x.toExponential : (fractionDigits?: number) => string -->x : number -->toExponential : (fractionDigits?: number) => string -+>x.toExponential() : any -+>x.toExponential : any -+>x : any -+>toExponential : any - - === c:/root/folder2/file2.ts === - import {x as a} from "./file3" // found with baseurl \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.errors.txt deleted file mode 100644 index 8278d6e82b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.errors.txt +++ /dev/null @@ -1,32 +0,0 @@ -c:/root/folder1/file1.ts(1,17): error TS2307: Cannot find module 'folder2/file2' or its corresponding type declarations. -c:/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== c:/root/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "baseUrl": "." - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - } - } - -==== c:/root/folder1/file1.ts (1 errors) ==== - import {x} from "folder2/file2" - ~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'folder2/file2' or its corresponding type declarations. - declare function use(a: any): void; - use(x.toExponential()); - -==== c:/root/folder2/file2.ts (0 errors) ==== - import {x as a} from "./file3" // found with baseurl - import {y as b} from "file4" // found with fallback - export var x = a + b; - -==== c:/root/folder2/file3.ts (0 errors) ==== - export var x = 1; - -==== c:/node_modules/file4/index.d.ts (0 errors) ==== - export var y: number; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.js deleted file mode 100644 index 07bb89bf7a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.js +++ /dev/null @@ -1,35 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts] //// - -//// [index.d.ts] -export var y: number; -//// [file1.ts] -import {x} from "folder2/file2" -declare function use(a: any): void; -use(x.toExponential()); - -//// [file2.ts] -import {x as a} from "./file3" // found with baseurl -import {y as b} from "file4" // found with fallback -export var x = a + b; - -//// [file3.ts] -export var x = 1; - - -//// [file1.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const file2_1 = require("folder2/file2"); -use(file2_1.x.toExponential()); -//// [file3.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -exports.x = 1; -//// [file2.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -const file3_1 = require("./file3"); // found with baseurl -const file4_1 = require("file4"); // found with fallback -exports.x = file3_1.x + file4_1.y; diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.js.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.js.diff deleted file mode 100644 index 940f7723c7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.js.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.pathMappingBasedModuleResolution4_node.js -+++ new.pathMappingBasedModuleResolution4_node.js -@@= skipped -15, +15 lines =@@ - export var x = 1; - - -+//// [file1.js] -+"use strict"; -+Object.defineProperty(exports, "__esModule", { value: true }); -+const file2_1 = require("folder2/file2"); -+use(file2_1.x.toExponential()); - //// [file3.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); -@@= skipped -9, +14 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.x = void 0; --var file3_1 = require("./file3"); // found with baseurl --var file4_1 = require("file4"); // found with fallback -+const file3_1 = require("./file3"); // found with baseurl -+const file4_1 = require("file4"); // found with fallback - exports.x = file3_1.x + file4_1.y; --//// [file1.js] --"use strict"; --Object.defineProperty(exports, "__esModule", { value: true }); --var file2_1 = require("folder2/file2"); --use(file2_1.x.toExponential()); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.symbols deleted file mode 100644 index d4496f7688..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.symbols +++ /dev/null @@ -1,36 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts] //// - -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file2" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->a : Symbol(a, Decl(file1.ts, 1, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 0, 31)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -=== c:/root/folder2/file2.ts === -import {x as a} from "./file3" // found with baseurl ->x : Symbol(a, Decl(file3.ts, 0, 10)) ->a : Symbol(a, Decl(file2.ts, 0, 8)) - -import {y as b} from "file4" // found with fallback ->y : Symbol(b, Decl(index.d.ts, 0, 10)) ->b : Symbol(b, Decl(file2.ts, 1, 8)) - -export var x = a + b; ->x : Symbol(x, Decl(file2.ts, 2, 10)) ->a : Symbol(a, Decl(file2.ts, 0, 8)) ->b : Symbol(b, Decl(file2.ts, 1, 8)) - -=== c:/root/folder2/file3.ts === -export var x = 1; ->x : Symbol(x, Decl(file3.ts, 0, 10)) - -=== c:/node_modules/file4/index.d.ts === -export var y: number; ->y : Symbol(y, Decl(index.d.ts, 0, 10)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.symbols.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.symbols.diff deleted file mode 100644 index 198e6d00f9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.symbols.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.pathMappingBasedModuleResolution4_node.symbols -+++ new.pathMappingBasedModuleResolution4_node.symbols -@@= skipped -9, +9 lines =@@ - - use(x.toExponential()); - >use : Symbol(use, Decl(file1.ts, 0, 31)) -->x.toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) - >x : Symbol(x, Decl(file1.ts, 0, 8)) -->toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) - - === c:/root/folder2/file2.ts === - import {x as a} from "./file3" // found with baseurl \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.trace.json deleted file mode 100644 index b57204c2f5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.trace.json +++ /dev/null @@ -1,44 +0,0 @@ -======== Resolving module 'folder2/file2' from 'c:/root/folder1/file1.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File 'c:/root/folder1/package.json' does not exist. -File 'c:/root/package.json' does not exist. -File 'c:/package.json' does not exist. -Loading module 'folder2/file2' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory 'c:/root/folder1/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/folder1/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory 'c:/root/folder1/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -======== Module name 'folder2/file2' was not resolved. ======== -======== Resolving module './file3' from 'c:/root/folder2/file2.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location 'c:/root/folder2/file3', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/folder2/file3.ts' exists - use it as a name resolution result. -======== Module name './file3' was successfully resolved to 'c:/root/folder2/file3.ts'. ======== -======== Resolving module 'file4' from 'c:/root/folder2/file2.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File 'c:/root/folder2/package.json' does not exist. -File 'c:/root/package.json' does not exist according to earlier cached lookups. -File 'c:/package.json' does not exist according to earlier cached lookups. -Loading module 'file4' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory 'c:/root/folder2/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/folder2/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules/@types' does not exist, skipping all lookups in it. -File 'c:/node_modules/file4/package.json' does not exist. -File 'c:/node_modules/file4.ts' does not exist. -File 'c:/node_modules/file4.tsx' does not exist. -File 'c:/node_modules/file4.d.ts' does not exist. -File 'c:/node_modules/file4/index.ts' does not exist. -File 'c:/node_modules/file4/index.tsx' does not exist. -File 'c:/node_modules/file4/index.d.ts' exists - use it as a name resolution result. -Resolving real path for 'c:/node_modules/file4/index.d.ts', result 'c:/node_modules/file4/index.d.ts'. -======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4/index.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.types deleted file mode 100644 index 805143c14c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.types +++ /dev/null @@ -1,42 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution4_node.ts] //// - -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file2" ->x : any - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : any ->x.toExponential : any ->x : any ->toExponential : any - -=== c:/root/folder2/file2.ts === -import {x as a} from "./file3" // found with baseurl ->x : number ->a : number - -import {y as b} from "file4" // found with fallback ->y : number ->b : number - -export var x = a + b; ->x : number ->a + b : number ->a : number ->b : number - -=== c:/root/folder2/file3.ts === -export var x = 1; ->x : number ->1 : 1 - -=== c:/node_modules/file4/index.d.ts === -export var y: number; ->y : number - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.types.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.types.diff deleted file mode 100644 index d578680356..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution4_node.types.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.pathMappingBasedModuleResolution4_node.types -+++ new.pathMappingBasedModuleResolution4_node.types -@@= skipped -1, +1 lines =@@ - - === c:/root/folder1/file1.ts === - import {x} from "folder2/file2" -->x : number -+>x : any - - declare function use(a: any): void; - >use : (a: any) => void -@@= skipped -9, +9 lines =@@ - use(x.toExponential()); - >use(x.toExponential()) : void - >use : (a: any) => void -->x.toExponential() : string -->x.toExponential : (fractionDigits?: number) => string -->x : number -->toExponential : (fractionDigits?: number) => string -+>x.toExponential() : any -+>x.toExponential : any -+>x : any -+>toExponential : any - - === c:/root/folder2/file2.ts === - import {x as a} from "./file3" // found with baseurl \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.errors.txt deleted file mode 100644 index f8c7322538..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.errors.txt +++ /dev/null @@ -1,56 +0,0 @@ -c:/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -c:/root/tsconfig.json(6,17): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -c:/root/tsconfig.json(7,17): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -c:/root/tsconfig.json(10,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== c:/root/tsconfig.json (4 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": [ - "*", - ~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - "generated/*" - ~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - ], - "components/*": [ - "shared/components/*" - ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - ] - } - } - } -==== c:/root/folder1/file1.ts (0 errors) ==== - import {x} from "folder2/file1" - import {y} from "folder3/file2" - import {z} from "components/file3" - import {z1} from "file4" - - declare function use(a: any): void; - - use(x.toExponential()); - use(y.toExponential()); - use(z.toExponential()); - use(z1.toExponential()); - -==== c:/root/folder2/file1.ts (0 errors) ==== - export var x = 1; - -==== c:/root/generated/folder3/file2.ts (0 errors) ==== - export var y = 1; - -==== c:/root/shared/components/file3/index.d.ts (0 errors) ==== - export var z: number; - -==== c:/node_modules/file4.ts (0 errors) ==== - export var z1 = 1; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.js deleted file mode 100644 index c3509f8138..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.js +++ /dev/null @@ -1,49 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts] //// - -//// [file4.ts] -export var z1 = 1; - -//// [file1.ts] -import {x} from "folder2/file1" -import {y} from "folder3/file2" -import {z} from "components/file3" -import {z1} from "file4" - -declare function use(a: any): void; - -use(x.toExponential()); -use(y.toExponential()); -use(z.toExponential()); -use(z1.toExponential()); - -//// [file1.ts] -export var x = 1; - -//// [file2.ts] -export var y = 1; - -//// [index.d.ts] -export var z: number; - - -//// [file1.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -exports.x = 1; -//// [file2.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.y = void 0; -exports.y = 1; -//// [file1.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const file1_1 = require("folder2/file1"); -const file2_1 = require("folder3/file2"); -const file3_1 = require("components/file3"); -const file4_1 = require("file4"); -use(file1_1.x.toExponential()); -use(file2_1.y.toExponential()); -use(file3_1.z.toExponential()); -use(file4_1.z1.toExponential()); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.js.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.js.diff deleted file mode 100644 index cdddb9efb5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.js.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.pathMappingBasedModuleResolution5_node.js -+++ new.pathMappingBasedModuleResolution5_node.js -@@= skipped -38, +38 lines =@@ - //// [file1.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --var file1_1 = require("folder2/file1"); --var file2_1 = require("folder3/file2"); --var file3_1 = require("components/file3"); --var file4_1 = require("file4"); -+const file1_1 = require("folder2/file1"); -+const file2_1 = require("folder3/file2"); -+const file3_1 = require("components/file3"); -+const file4_1 = require("file4"); - use(file1_1.x.toExponential()); - use(file2_1.y.toExponential()); - use(file3_1.z.toExponential()); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.symbols deleted file mode 100644 index c1bf7479be..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.symbols +++ /dev/null @@ -1,59 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts] //// - -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -import {y} from "folder3/file2" ->y : Symbol(y, Decl(file1.ts, 1, 8)) - -import {z} from "components/file3" ->z : Symbol(z, Decl(file1.ts, 2, 8)) - -import {z1} from "file4" ->z1 : Symbol(z1, Decl(file1.ts, 3, 8)) - -declare function use(a: any): void; ->use : Symbol(use, Decl(file1.ts, 3, 24)) ->a : Symbol(a, Decl(file1.ts, 5, 21)) - -use(x.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 24)) ->x.toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) - -use(y.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 24)) ->y.toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) ->y : Symbol(y, Decl(file1.ts, 1, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) - -use(z.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 24)) ->z.toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) ->z : Symbol(z, Decl(file1.ts, 2, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) - -use(z1.toExponential()); ->use : Symbol(use, Decl(file1.ts, 3, 24)) ->z1.toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) ->z1 : Symbol(z1, Decl(file1.ts, 3, 8)) ->toExponential : Symbol(Number.toExponential, Decl(lib.es5.d.ts, --, --)) - -=== c:/root/folder2/file1.ts === -export var x = 1; ->x : Symbol(x, Decl(file1.ts, 0, 10)) - -=== c:/root/generated/folder3/file2.ts === -export var y = 1; ->y : Symbol(y, Decl(file2.ts, 0, 10)) - -=== c:/root/shared/components/file3/index.d.ts === -export var z: number; ->z : Symbol(z, Decl(index.d.ts, 0, 10)) - -=== c:/node_modules/file4.ts === -export var z1 = 1; ->z1 : Symbol(z1, Decl(file4.ts, 0, 10)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.trace.json deleted file mode 100644 index baa2b61635..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.trace.json +++ /dev/null @@ -1,70 +0,0 @@ -======== Resolving module 'folder2/file1' from 'c:/root/folder1/file1.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'folder2/file1'. -Module name 'folder2/file1', matched pattern '*'. -Trying substitution '*', candidate module location: 'folder2/file1'. -Loading module as file / folder, candidate module location 'c:/root/folder2/file1', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/folder2/file1.ts' exists - use it as a name resolution result. -======== Module name 'folder2/file1' was successfully resolved to 'c:/root/folder2/file1.ts'. ======== -======== Resolving module 'folder3/file2' from 'c:/root/folder1/file1.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'folder3/file2'. -Module name 'folder3/file2', matched pattern '*'. -Trying substitution '*', candidate module location: 'folder3/file2'. -Loading module as file / folder, candidate module location 'c:/root/folder3/file2', target file types: TypeScript, JavaScript, Declaration, JSON. -Trying substitution 'generated/*', candidate module location: 'generated/folder3/file2'. -Loading module as file / folder, candidate module location 'c:/root/generated/folder3/file2', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/generated/folder3/file2.ts' exists - use it as a name resolution result. -======== Module name 'folder3/file2' was successfully resolved to 'c:/root/generated/folder3/file2.ts'. ======== -======== Resolving module 'components/file3' from 'c:/root/folder1/file1.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'components/file3'. -Module name 'components/file3', matched pattern 'components/*'. -Trying substitution 'shared/components/*', candidate module location: 'shared/components/file3'. -Loading module as file / folder, candidate module location 'c:/root/shared/components/file3', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/shared/components/file3.ts' does not exist. -File 'c:/root/shared/components/file3.tsx' does not exist. -File 'c:/root/shared/components/file3.d.ts' does not exist. -File 'c:/root/shared/components/file3.js' does not exist. -File 'c:/root/shared/components/file3.jsx' does not exist. -File 'c:/root/shared/components/file3/package.json' does not exist. -File 'c:/root/shared/components/file3/index.ts' does not exist. -File 'c:/root/shared/components/file3/index.tsx' does not exist. -File 'c:/root/shared/components/file3/index.d.ts' exists - use it as a name resolution result. -======== Module name 'components/file3' was successfully resolved to 'c:/root/shared/components/file3/index.d.ts'. ======== -======== Resolving module 'file4' from 'c:/root/folder1/file1.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'file4'. -Module name 'file4', matched pattern '*'. -Trying substitution '*', candidate module location: 'file4'. -Loading module as file / folder, candidate module location 'c:/root/file4', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/file4.ts' does not exist. -File 'c:/root/file4.tsx' does not exist. -File 'c:/root/file4.d.ts' does not exist. -File 'c:/root/file4.js' does not exist. -File 'c:/root/file4.jsx' does not exist. -Directory 'c:/root/file4' does not exist, skipping all lookups in it. -Trying substitution 'generated/*', candidate module location: 'generated/file4'. -Loading module as file / folder, candidate module location 'c:/root/generated/file4', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/generated/file4.ts' does not exist. -File 'c:/root/generated/file4.tsx' does not exist. -File 'c:/root/generated/file4.d.ts' does not exist. -File 'c:/root/generated/file4.js' does not exist. -File 'c:/root/generated/file4.jsx' does not exist. -Directory 'c:/root/generated/file4' does not exist, skipping all lookups in it. -File 'c:/root/folder1/package.json' does not exist. -File 'c:/root/package.json' does not exist. -File 'c:/package.json' does not exist. -Loading module 'file4' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory 'c:/root/folder1/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/folder1/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules/@types' does not exist, skipping all lookups in it. -File 'c:/node_modules/file4.ts' exists - use it as a name resolution result. -Resolving real path for 'c:/node_modules/file4.ts', result 'c:/node_modules/file4.ts'. -======== Module name 'file4' was successfully resolved to 'c:/node_modules/file4.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.types deleted file mode 100644 index a05ebc3137..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution5_node.types +++ /dev/null @@ -1,70 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution5_node.ts] //// - -=== c:/root/folder1/file1.ts === -import {x} from "folder2/file1" ->x : number - -import {y} from "folder3/file2" ->y : number - -import {z} from "components/file3" ->z : number - -import {z1} from "file4" ->z1 : number - -declare function use(a: any): void; ->use : (a: any) => void ->a : any - -use(x.toExponential()); ->use(x.toExponential()) : void ->use : (a: any) => void ->x.toExponential() : string ->x.toExponential : (fractionDigits?: number) => string ->x : number ->toExponential : (fractionDigits?: number) => string - -use(y.toExponential()); ->use(y.toExponential()) : void ->use : (a: any) => void ->y.toExponential() : string ->y.toExponential : (fractionDigits?: number) => string ->y : number ->toExponential : (fractionDigits?: number) => string - -use(z.toExponential()); ->use(z.toExponential()) : void ->use : (a: any) => void ->z.toExponential() : string ->z.toExponential : (fractionDigits?: number) => string ->z : number ->toExponential : (fractionDigits?: number) => string - -use(z1.toExponential()); ->use(z1.toExponential()) : void ->use : (a: any) => void ->z1.toExponential() : string ->z1.toExponential : (fractionDigits?: number) => string ->z1 : number ->toExponential : (fractionDigits?: number) => string - -=== c:/root/folder2/file1.ts === -export var x = 1; ->x : number ->1 : 1 - -=== c:/root/generated/folder3/file2.ts === -export var y = 1; ->y : number ->1 : 1 - -=== c:/root/shared/components/file3/index.d.ts === -export var z: number; ->z : number - -=== c:/node_modules/file4.ts === -export var z1 = 1; ->z1 : number ->1 : 1 - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.errors.txt deleted file mode 100644 index bd1f1ab3f4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.errors.txt +++ /dev/null @@ -1,63 +0,0 @@ -c:/root/generated/src/project/file2.ts(2,17): error TS2307: Cannot find module 'templates/module2' or its corresponding type declarations. -c:/root/src/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./../*"]}' instead. -c:/root/src/tsconfig.json(6,17): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -c:/root/src/tsconfig.json(10,17): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== c:/root/src/tsconfig.json (3 errors) ==== - { - "compilerOptions": { - "baseUrl": "../", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./../*"]}' instead. - "paths": { - "*": [ - "*", - ~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - "c:/shared/*" - ], - "templates/*": [ - "generated/src/templates/*" - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - ] - }, - "rootDirs": [ - ".", - "../generated/src" - ] - } - } - -==== c:/root/src/file1.ts (0 errors) ==== - import {x} from "./project/file2"; - import {y} from "module3"; - - declare function use(x: string); - use(x.toFixed()); - use(y.toFixed()); - -==== c:/root/src/file3/index.d.ts (0 errors) ==== - export let x: number; - -==== c:/root/generated/src/project/file2.ts (1 errors) ==== - import {a} from "module1"; - import {b} from "templates/module2"; - ~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module 'templates/module2' or its corresponding type declarations. - import {x as c} from "../file3"; - export let x = a + b + c; - -==== c:/shared/module1/index.d.ts (0 errors) ==== - export let a: number - -==== c:/root/generated/src/templates/module2.ts (0 errors) ==== - export let b: number; - -==== c:/node_modules/module3.d.ts (0 errors) ==== - export let y: number; - - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.js deleted file mode 100644 index 34dd765ef2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.js +++ /dev/null @@ -1,45 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts] //// - -//// [file2.ts] -import {a} from "module1"; -import {b} from "templates/module2"; -import {x as c} from "../file3"; -export let x = a + b + c; - -//// [index.d.ts] -export let a: number - -//// [module2.ts] -export let b: number; - -//// [module3.d.ts] -export let y: number; - - -//// [file1.ts] -import {x} from "./project/file2"; -import {y} from "module3"; - -declare function use(x: string); -use(x.toFixed()); -use(y.toFixed()); - -//// [index.d.ts] -export let x: number; - - -//// [file2.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -const module1_1 = require("module1"); -const module2_1 = require("templates/module2"); -const file3_1 = require("../file3"); -exports.x = module1_1.a + module2_1.b + file3_1.x; -//// [file1.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const file2_1 = require("./project/file2"); -const module3_1 = require("module3"); -use(file2_1.x.toFixed()); -use(module3_1.y.toFixed()); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.js.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.js.diff deleted file mode 100644 index 10e38f31a2..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.js.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- old.pathMappingBasedModuleResolution7_node.js -+++ new.pathMappingBasedModuleResolution7_node.js -@@= skipped -27, +27 lines =@@ - export let x: number; - - --//// [module2.js] --"use strict"; --Object.defineProperty(exports, "__esModule", { value: true }); --exports.b = void 0; - //// [file2.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.x = void 0; --var module1_1 = require("module1"); --var module2_1 = require("templates/module2"); --var file3_1 = require("../file3"); -+const module1_1 = require("module1"); -+const module2_1 = require("templates/module2"); -+const file3_1 = require("../file3"); - exports.x = module1_1.a + module2_1.b + file3_1.x; - //// [file1.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --var file2_1 = require("./project/file2"); --var module3_1 = require("module3"); -+const file2_1 = require("./project/file2"); -+const module3_1 = require("module3"); - use(file2_1.x.toFixed()); - use(module3_1.y.toFixed()); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.symbols deleted file mode 100644 index 50a1a8b1cf..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.symbols +++ /dev/null @@ -1,53 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts] //// - -=== c:/root/src/file1.ts === -import {x} from "./project/file2"; ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -import {y} from "module3"; ->y : Symbol(y, Decl(file1.ts, 1, 8)) - -declare function use(x: string); ->use : Symbol(use, Decl(file1.ts, 1, 26)) ->x : Symbol(x, Decl(file1.ts, 3, 21)) - -use(x.toFixed()); ->use : Symbol(use, Decl(file1.ts, 1, 26)) ->x : Symbol(x, Decl(file1.ts, 0, 8)) - -use(y.toFixed()); ->use : Symbol(use, Decl(file1.ts, 1, 26)) ->y.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --)) ->y : Symbol(y, Decl(file1.ts, 1, 8)) ->toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --)) - -=== c:/root/src/file3/index.d.ts === -export let x: number; ->x : Symbol(x, Decl(index.d.ts, 0, 10)) - -=== c:/root/generated/src/project/file2.ts === -import {a} from "module1"; ->a : Symbol(a, Decl(file2.ts, 0, 8)) - -import {b} from "templates/module2"; ->b : Symbol(b, Decl(file2.ts, 1, 8)) - -import {x as c} from "../file3"; ->x : Symbol(c, Decl(index.d.ts, 0, 10)) ->c : Symbol(c, Decl(file2.ts, 2, 8)) - -export let x = a + b + c; ->x : Symbol(x, Decl(file2.ts, 3, 10)) ->a : Symbol(a, Decl(file2.ts, 0, 8)) ->b : Symbol(b, Decl(file2.ts, 1, 8)) ->c : Symbol(c, Decl(file2.ts, 2, 8)) - -=== c:/shared/module1/index.d.ts === -export let a: number ->a : Symbol(a, Decl(index.d.ts, 0, 10)) - -=== c:/node_modules/module3.d.ts === -export let y: number; ->y : Symbol(y, Decl(module3.d.ts, 0, 10)) - - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.symbols.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.symbols.diff deleted file mode 100644 index 1ddc71801f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.symbols.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.pathMappingBasedModuleResolution7_node.symbols -+++ new.pathMappingBasedModuleResolution7_node.symbols -@@= skipped -12, +12 lines =@@ - - use(x.toFixed()); - >use : Symbol(use, Decl(file1.ts, 1, 26)) -->x.toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --)) - >x : Symbol(x, Decl(file1.ts, 0, 8)) -->toFixed : Symbol(Number.toFixed, Decl(lib.es5.d.ts, --, --)) - - use(y.toFixed()); - >use : Symbol(use, Decl(file1.ts, 1, 26)) -@@= skipped -34, +32 lines =@@ - === c:/shared/module1/index.d.ts === - export let a: number - >a : Symbol(a, Decl(index.d.ts, 0, 10)) -- --=== c:/root/generated/src/templates/module2.ts === --export let b: number; -->b : Symbol(b, Decl(module2.ts, 0, 10)) - - === c:/node_modules/module3.d.ts === - export let y: number; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.trace.json deleted file mode 100644 index c7c733b635..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.trace.json +++ /dev/null @@ -1,132 +0,0 @@ -======== Resolving module './project/file2' from 'c:/root/src/file1.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'rootDirs' option is set, using it to resolve relative module name './project/file2'. -Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/src/project/file2' - 'true'. -Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/src/project/file2' - 'false'. -Longest matching prefix for 'c:/root/src/project/file2' is 'c:/root/src/'. -Loading 'project/file2' from the root dir 'c:/root/src/', candidate location 'c:/root/src/project/file2'. -Loading module as file / folder, candidate module location 'c:/root/src/project/file2', target file types: TypeScript, JavaScript, Declaration, JSON. -Directory 'c:/root/src/project' does not exist, skipping all lookups in it. -Trying other entries in 'rootDirs'. -Loading 'project/file2' from the root dir 'c:/root/generated/src', candidate location 'c:/root/generated/src/project/file2'. -Loading module as file / folder, candidate module location 'c:/root/generated/src/project/file2', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/generated/src/project/file2.ts' exists - use it as a name resolution result. -======== Module name './project/file2' was successfully resolved to 'c:/root/generated/src/project/file2.ts'. ======== -======== Resolving module 'module3' from 'c:/root/src/file1.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'module3'. -Module name 'module3', matched pattern '*'. -Trying substitution '*', candidate module location: 'module3'. -Loading module as file / folder, candidate module location 'c:/root/src/module3', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/src/module3.ts' does not exist. -File 'c:/root/src/module3.tsx' does not exist. -File 'c:/root/src/module3.d.ts' does not exist. -File 'c:/root/src/module3.js' does not exist. -File 'c:/root/src/module3.jsx' does not exist. -Directory 'c:/root/src/module3' does not exist, skipping all lookups in it. -Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module3'. -Loading module as file / folder, candidate module location 'c:/shared/module3', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/shared/module3.ts' does not exist. -File 'c:/shared/module3.tsx' does not exist. -File 'c:/shared/module3.d.ts' does not exist. -File 'c:/shared/module3.js' does not exist. -File 'c:/shared/module3.jsx' does not exist. -Directory 'c:/shared/module3' does not exist, skipping all lookups in it. -File 'c:/root/src/package.json' does not exist. -File 'c:/root/package.json' does not exist. -File 'c:/package.json' does not exist. -Loading module 'module3' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory 'c:/root/src/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/src/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules/@types' does not exist, skipping all lookups in it. -File 'c:/node_modules/module3.ts' does not exist. -File 'c:/node_modules/module3.tsx' does not exist. -File 'c:/node_modules/module3.d.ts' exists - use it as a name resolution result. -Resolving real path for 'c:/node_modules/module3.d.ts', result 'c:/node_modules/module3.d.ts'. -======== Module name 'module3' was successfully resolved to 'c:/node_modules/module3.d.ts'. ======== -======== Resolving module 'module1' from 'c:/root/generated/src/project/file2.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'module1'. -Module name 'module1', matched pattern '*'. -Trying substitution '*', candidate module location: 'module1'. -Loading module as file / folder, candidate module location 'c:/root/src/module1', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/src/module1.ts' does not exist. -File 'c:/root/src/module1.tsx' does not exist. -File 'c:/root/src/module1.d.ts' does not exist. -File 'c:/root/src/module1.js' does not exist. -File 'c:/root/src/module1.jsx' does not exist. -Directory 'c:/root/src/module1' does not exist, skipping all lookups in it. -Trying substitution 'c:/shared/*', candidate module location: 'c:/shared/module1'. -Loading module as file / folder, candidate module location 'c:/shared/module1', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/shared/module1.ts' does not exist. -File 'c:/shared/module1.tsx' does not exist. -File 'c:/shared/module1.d.ts' does not exist. -File 'c:/shared/module1.js' does not exist. -File 'c:/shared/module1.jsx' does not exist. -File 'c:/shared/module1/package.json' does not exist. -File 'c:/shared/module1/index.ts' does not exist. -File 'c:/shared/module1/index.tsx' does not exist. -File 'c:/shared/module1/index.d.ts' exists - use it as a name resolution result. -======== Module name 'module1' was successfully resolved to 'c:/shared/module1/index.d.ts'. ======== -======== Resolving module 'templates/module2' from 'c:/root/generated/src/project/file2.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'templates/module2'. -Module name 'templates/module2', matched pattern 'templates/*'. -Trying substitution 'generated/src/templates/*', candidate module location: 'generated/src/templates/module2'. -Loading module as file / folder, candidate module location 'c:/root/src/generated/src/templates/module2', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/generated/src/project/package.json' does not exist. -File 'c:/root/generated/src/package.json' does not exist. -File 'c:/root/generated/package.json' does not exist. -File 'c:/root/package.json' does not exist according to earlier cached lookups. -File 'c:/package.json' does not exist according to earlier cached lookups. -Loading module 'templates/module2' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory 'c:/root/generated/src/project/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/generated/src/project/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/generated/src/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/generated/src/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/generated/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/generated/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules/@types' does not exist, skipping all lookups in it. -Directory 'c:/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory 'c:/root/generated/src/project/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/generated/src/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/generated/node_modules' does not exist, skipping all lookups in it. -Directory 'c:/root/node_modules' does not exist, skipping all lookups in it. -======== Module name 'templates/module2' was not resolved. ======== -======== Resolving module '../file3' from 'c:/root/generated/src/project/file2.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'rootDirs' option is set, using it to resolve relative module name '../file3'. -Checking if 'c:/root/src/' is the longest matching prefix for 'c:/root/generated/src/file3' - 'false'. -Checking if 'c:/root/generated/src/' is the longest matching prefix for 'c:/root/generated/src/file3' - 'true'. -Longest matching prefix for 'c:/root/generated/src/file3' is 'c:/root/generated/src/'. -Loading 'file3' from the root dir 'c:/root/generated/src/', candidate location 'c:/root/generated/src/file3'. -Loading module as file / folder, candidate module location 'c:/root/generated/src/file3', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/generated/src/file3.ts' does not exist. -File 'c:/root/generated/src/file3.tsx' does not exist. -File 'c:/root/generated/src/file3.d.ts' does not exist. -File 'c:/root/generated/src/file3.js' does not exist. -File 'c:/root/generated/src/file3.jsx' does not exist. -Directory 'c:/root/generated/src/file3' does not exist, skipping all lookups in it. -Trying other entries in 'rootDirs'. -Loading 'file3' from the root dir 'c:/root/src', candidate location 'c:/root/src/file3'. -Loading module as file / folder, candidate module location 'c:/root/src/file3', target file types: TypeScript, JavaScript, Declaration, JSON. -File 'c:/root/src/file3.ts' does not exist. -File 'c:/root/src/file3.tsx' does not exist. -File 'c:/root/src/file3.d.ts' does not exist. -File 'c:/root/src/file3.js' does not exist. -File 'c:/root/src/file3.jsx' does not exist. -File 'c:/root/src/file3/package.json' does not exist. -File 'c:/root/src/file3/index.ts' does not exist. -File 'c:/root/src/file3/index.tsx' does not exist. -File 'c:/root/src/file3/index.d.ts' exists - use it as a name resolution result. -======== Module name '../file3' was successfully resolved to 'c:/root/src/file3/index.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.types deleted file mode 100644 index ab0a2262b7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.types +++ /dev/null @@ -1,61 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution7_node.ts] //// - -=== c:/root/src/file1.ts === -import {x} from "./project/file2"; ->x : any - -import {y} from "module3"; ->y : number - -declare function use(x: string); ->use : (x: string) => any ->x : string - -use(x.toFixed()); ->use(x.toFixed()) : any ->use : (x: string) => any ->x.toFixed() : any ->x.toFixed : any ->x : any ->toFixed : any - -use(y.toFixed()); ->use(y.toFixed()) : any ->use : (x: string) => any ->y.toFixed() : string ->y.toFixed : (fractionDigits?: number) => string ->y : number ->toFixed : (fractionDigits?: number) => string - -=== c:/root/src/file3/index.d.ts === -export let x: number; ->x : number - -=== c:/root/generated/src/project/file2.ts === -import {a} from "module1"; ->a : number - -import {b} from "templates/module2"; ->b : any - -import {x as c} from "../file3"; ->x : number ->c : number - -export let x = a + b + c; ->x : any ->a + b + c : any ->a + b : any ->a : number ->b : any ->c : number - -=== c:/shared/module1/index.d.ts === -export let a: number ->a : number - -=== c:/node_modules/module3.d.ts === -export let y: number; ->y : number - - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.types.diff b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.types.diff deleted file mode 100644 index 29d5328fcc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution7_node.types.diff +++ /dev/null @@ -1,59 +0,0 @@ ---- old.pathMappingBasedModuleResolution7_node.types -+++ new.pathMappingBasedModuleResolution7_node.types -@@= skipped -1, +1 lines =@@ - - === c:/root/src/file1.ts === - import {x} from "./project/file2"; -->x : number -+>x : any - - import {y} from "module3"; - >y : number -@@= skipped -12, +12 lines =@@ - use(x.toFixed()); - >use(x.toFixed()) : any - >use : (x: string) => any -->x.toFixed() : string -->x.toFixed : (fractionDigits?: number) => string -->x : number -->toFixed : (fractionDigits?: number) => string -+>x.toFixed() : any -+>x.toFixed : any -+>x : any -+>toFixed : any - - use(y.toFixed()); - >use(y.toFixed()) : any -@@= skipped -22, +22 lines =@@ - >a : number - - import {b} from "templates/module2"; -->b : number -+>b : any - - import {x as c} from "../file3"; - >x : number - >c : number - - export let x = a + b + c; -->x : number -->a + b + c : number -->a + b : number -+>x : any -+>a + b + c : any -+>a + b : any - >a : number -->b : number -+>b : any - >c : number - - === c:/shared/module1/index.d.ts === - export let a: number - >a : number -- --=== c:/root/generated/src/templates/module2.ts === --export let b: number; -->b : number - - === c:/node_modules/module3.d.ts === - export let y: number; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.errors.txt deleted file mode 100644 index 2451485e85..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.errors.txt +++ /dev/null @@ -1,28 +0,0 @@ -c:/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -c:/root/tsconfig.json(6,16): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== c:/root/tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "@speedy/*/testing": [ - "*/dist/index.ts" - ~~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - ] - } - } - } - -==== c:/root/index.ts (0 errors) ==== - import {x} from "@speedy/folder1/testing" - -==== c:/root/folder1/dist/index.ts (0 errors) ==== - export const x = 1 + 2; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.js deleted file mode 100644 index e727b75ca6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.js +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution8_node.ts] //// - -//// [index.ts] -import {x} from "@speedy/folder1/testing" - -//// [index.ts] -export const x = 1 + 2; - - -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.x = void 0; -exports.x = 1 + 2; -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.symbols deleted file mode 100644 index 2b889dc6cb..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution8_node.ts] //// - -=== c:/root/index.ts === -import {x} from "@speedy/folder1/testing" ->x : Symbol(x, Decl(index.ts, 0, 8)) - -=== c:/root/folder1/dist/index.ts === -export const x = 1 + 2; ->x : Symbol(x, Decl(index.ts, 0, 12)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.trace.json deleted file mode 100644 index db03ff8304..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.trace.json +++ /dev/null @@ -1,8 +0,0 @@ -======== Resolving module '@speedy/folder1/testing' from 'c:/root/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '@speedy/folder1/testing'. -Module name '@speedy/folder1/testing', matched pattern '@speedy/*/testing'. -Trying substitution '*/dist/index.ts', candidate module location: 'folder1/dist/index.ts'. -File 'c:/root/folder1/dist/index.ts' exists - use it as a name resolution result. -======== Module name '@speedy/folder1/testing' was successfully resolved to 'c:/root/folder1/dist/index.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.types deleted file mode 100644 index abeeeb2299..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution8_node.types +++ /dev/null @@ -1,13 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution8_node.ts] //// - -=== c:/root/index.ts === -import {x} from "@speedy/folder1/testing" ->x : number - -=== c:/root/folder1/dist/index.ts === -export const x = 1 + 2; ->x : number ->1 + 2 : number ->1 : 1 ->2 : 2 - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt deleted file mode 100644 index 9b4240c53e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt +++ /dev/null @@ -1,29 +0,0 @@ -/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== /root/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "/*": ["./src/*"] - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /root/src/foo.ts (0 errors) ==== - export function foo() {} - -==== /root/src/bar.js (0 errors) ==== - export function bar() {} - -==== /root/a.ts (0 errors) ==== - import { foo } from "/foo"; - import { bar } from "/bar"; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.js deleted file mode 100644 index 5d30186345..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.ts] //// - -//// [foo.ts] -export function foo() {} - -//// [bar.js] -export function bar() {} - -//// [a.ts] -import { foo } from "/foo"; -import { bar } from "/bar"; - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo = foo; -function foo() { } -//// [bar.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = bar; -function bar() { } -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.symbols deleted file mode 100644 index 8a3f6ffe65..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.ts] //// - -=== /root/src/foo.ts === -export function foo() {} ->foo : Symbol(foo, Decl(foo.ts, 0, 0)) - -=== /root/src/bar.js === -export function bar() {} ->bar : Symbol(bar, Decl(bar.js, 0, 0)) - -=== /root/a.ts === -import { foo } from "/foo"; ->foo : Symbol(foo, Decl(a.ts, 0, 8)) - -import { bar } from "/bar"; ->bar : Symbol(bar, Decl(a.ts, 1, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.trace.json deleted file mode 100644 index 9bd8d21bcc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.trace.json +++ /dev/null @@ -1,21 +0,0 @@ -======== Resolving module '/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/foo'. -Module name '/foo', matched pattern '/*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name '/foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module '/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/bar'. -Module name '/bar', matched pattern '/*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist. -File '/root/src/bar.tsx' does not exist. -File '/root/src/bar.d.ts' does not exist. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name '/bar' was successfully resolved to '/root/src/bar.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.types deleted file mode 100644 index 5a11fb4294..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.ts] //// - -=== /root/src/foo.ts === -export function foo() {} ->foo : () => void - -=== /root/src/bar.js === -export function bar() {} ->bar : () => void - -=== /root/a.ts === -import { foo } from "/foo"; ->foo : () => void - -import { bar } from "/bar"; ->bar : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt deleted file mode 100644 index a3a5b6a83b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt +++ /dev/null @@ -1,53 +0,0 @@ -/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== /root/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "/*": ["./src/*"], - "c:/*": ["./src/*"], - "c:\\*": ["./src/*"], - "//server/*": ["./src/*"], - "\\\\server\\*": ["./src/*"], - "file:///*": ["./src/*"], - "file://c:/*": ["./src/*"], - "file://server/*": ["./src/*"], - "http://server/*": ["./src/*"] - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /root/src/foo.ts (0 errors) ==== - export function foo() {} - -==== /root/src/bar.js (0 errors) ==== - export function bar() {} - -==== /root/a.ts (0 errors) ==== - import { foo as foo1 } from "/foo"; - import { bar as bar1 } from "/bar"; - import { foo as foo2 } from "c:/foo"; - import { bar as bar2 } from "c:/bar"; - import { foo as foo3 } from "c:\\foo"; - import { bar as bar3 } from "c:\\bar"; - import { foo as foo4 } from "//server/foo"; - import { bar as bar4 } from "//server/bar"; - import { foo as foo5 } from "\\\\server\\foo"; - import { bar as bar5 } from "\\\\server\\bar"; - import { foo as foo6 } from "file:///foo"; - import { bar as bar6 } from "file:///bar"; - import { foo as foo7 } from "file://c:/foo"; - import { bar as bar7 } from "file://c:/bar"; - import { foo as foo8 } from "file://server/foo"; - import { bar as bar8 } from "file://server/bar"; - import { foo as foo9 } from "http://server/foo"; - import { bar as bar9 } from "http://server/bar"; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.js deleted file mode 100644 index 3a328d664b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.js +++ /dev/null @@ -1,42 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.ts] //// - -//// [foo.ts] -export function foo() {} - -//// [bar.js] -export function bar() {} - -//// [a.ts] -import { foo as foo1 } from "/foo"; -import { bar as bar1 } from "/bar"; -import { foo as foo2 } from "c:/foo"; -import { bar as bar2 } from "c:/bar"; -import { foo as foo3 } from "c:\\foo"; -import { bar as bar3 } from "c:\\bar"; -import { foo as foo4 } from "//server/foo"; -import { bar as bar4 } from "//server/bar"; -import { foo as foo5 } from "\\\\server\\foo"; -import { bar as bar5 } from "\\\\server\\bar"; -import { foo as foo6 } from "file:///foo"; -import { bar as bar6 } from "file:///bar"; -import { foo as foo7 } from "file://c:/foo"; -import { bar as bar7 } from "file://c:/bar"; -import { foo as foo8 } from "file://server/foo"; -import { bar as bar8 } from "file://server/bar"; -import { foo as foo9 } from "http://server/foo"; -import { bar as bar9 } from "http://server/bar"; - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo = foo; -function foo() { } -//// [bar.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = bar; -function bar() { } -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols deleted file mode 100644 index 8b00c716a9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.symbols +++ /dev/null @@ -1,83 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.ts] //// - -=== /root/src/foo.ts === -export function foo() {} ->foo : Symbol(foo, Decl(foo.ts, 0, 0)) - -=== /root/src/bar.js === -export function bar() {} ->bar : Symbol(bar, Decl(bar.js, 0, 0)) - -=== /root/a.ts === -import { foo as foo1 } from "/foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo1 : Symbol(foo1, Decl(a.ts, 0, 8)) - -import { bar as bar1 } from "/bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar1 : Symbol(bar1, Decl(a.ts, 1, 8)) - -import { foo as foo2 } from "c:/foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo2 : Symbol(foo2, Decl(a.ts, 2, 8)) - -import { bar as bar2 } from "c:/bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar2 : Symbol(bar2, Decl(a.ts, 3, 8)) - -import { foo as foo3 } from "c:\\foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo3 : Symbol(foo3, Decl(a.ts, 4, 8)) - -import { bar as bar3 } from "c:\\bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar3 : Symbol(bar3, Decl(a.ts, 5, 8)) - -import { foo as foo4 } from "//server/foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo4 : Symbol(foo4, Decl(a.ts, 6, 8)) - -import { bar as bar4 } from "//server/bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar4 : Symbol(bar4, Decl(a.ts, 7, 8)) - -import { foo as foo5 } from "\\\\server\\foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo5 : Symbol(foo5, Decl(a.ts, 8, 8)) - -import { bar as bar5 } from "\\\\server\\bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar5 : Symbol(bar5, Decl(a.ts, 9, 8)) - -import { foo as foo6 } from "file:///foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo6 : Symbol(foo6, Decl(a.ts, 10, 8)) - -import { bar as bar6 } from "file:///bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar6 : Symbol(bar6, Decl(a.ts, 11, 8)) - -import { foo as foo7 } from "file://c:/foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo7 : Symbol(foo7, Decl(a.ts, 12, 8)) - -import { bar as bar7 } from "file://c:/bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar7 : Symbol(bar7, Decl(a.ts, 13, 8)) - -import { foo as foo8 } from "file://server/foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo8 : Symbol(foo8, Decl(a.ts, 14, 8)) - -import { bar as bar8 } from "file://server/bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar8 : Symbol(bar8, Decl(a.ts, 15, 8)) - -import { foo as foo9 } from "http://server/foo"; ->foo : Symbol(foo1, Decl(foo.ts, 0, 0)) ->foo9 : Symbol(foo9, Decl(a.ts, 16, 8)) - -import { bar as bar9 } from "http://server/bar"; ->bar : Symbol(bar1, Decl(bar.js, 0, 0)) ->bar9 : Symbol(bar9, Decl(a.ts, 17, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.trace.json deleted file mode 100644 index 3f6ee633c0..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.trace.json +++ /dev/null @@ -1,189 +0,0 @@ -======== Resolving module '/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/foo'. -Module name '/foo', matched pattern '/*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name '/foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module '/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/bar'. -Module name '/bar', matched pattern '/*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist. -File '/root/src/bar.tsx' does not exist. -File '/root/src/bar.d.ts' does not exist. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name '/bar' was successfully resolved to '/root/src/bar.js'. ======== -======== Resolving module 'c:/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'c:/foo'. -Module name 'c:/foo', matched pattern 'c:/*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name 'c:/foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module 'c:/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'c:/bar'. -Module name 'c:/bar', matched pattern 'c:/*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.tsx' does not exist according to earlier cached lookups. -File '/root/src/bar.d.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name 'c:/bar' was successfully resolved to '/root/src/bar.js'. ======== -======== Resolving module 'c:\foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'c:\foo'. -Module name 'c:\foo', matched pattern 'c:\*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name 'c:\foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module 'c:\bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'c:\bar'. -Module name 'c:\bar', matched pattern 'c:\*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.tsx' does not exist according to earlier cached lookups. -File '/root/src/bar.d.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name 'c:\bar' was successfully resolved to '/root/src/bar.js'. ======== -======== Resolving module '//server/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '//server/foo'. -Module name '//server/foo', matched pattern '//server/*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name '//server/foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module '//server/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '//server/bar'. -Module name '//server/bar', matched pattern '//server/*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.tsx' does not exist according to earlier cached lookups. -File '/root/src/bar.d.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name '//server/bar' was successfully resolved to '/root/src/bar.js'. ======== -======== Resolving module '\\server\foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '\\server\foo'. -Module name '\\server\foo', matched pattern '\\server\*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name '\\server\foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module '\\server\bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '\\server\bar'. -Module name '\\server\bar', matched pattern '\\server\*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.tsx' does not exist according to earlier cached lookups. -File '/root/src/bar.d.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name '\\server\bar' was successfully resolved to '/root/src/bar.js'. ======== -======== Resolving module 'file:///foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'file:///foo'. -Module name 'file:///foo', matched pattern 'file:///*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name 'file:///foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module 'file:///bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'file:///bar'. -Module name 'file:///bar', matched pattern 'file:///*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.tsx' does not exist according to earlier cached lookups. -File '/root/src/bar.d.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name 'file:///bar' was successfully resolved to '/root/src/bar.js'. ======== -======== Resolving module 'file://c:/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'file://c:/foo'. -Module name 'file://c:/foo', matched pattern 'file://c:/*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name 'file://c:/foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module 'file://c:/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'file://c:/bar'. -Module name 'file://c:/bar', matched pattern 'file://c:/*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.tsx' does not exist according to earlier cached lookups. -File '/root/src/bar.d.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name 'file://c:/bar' was successfully resolved to '/root/src/bar.js'. ======== -======== Resolving module 'file://server/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'file://server/foo'. -Module name 'file://server/foo', matched pattern 'file://server/*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name 'file://server/foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module 'file://server/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'file://server/bar'. -Module name 'file://server/bar', matched pattern 'file://server/*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.tsx' does not exist according to earlier cached lookups. -File '/root/src/bar.d.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name 'file://server/bar' was successfully resolved to '/root/src/bar.js'. ======== -======== Resolving module 'http://server/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'http://server/foo'. -Module name 'http://server/foo', matched pattern 'http://server/*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name 'http://server/foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module 'http://server/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'http://server/bar'. -Module name 'http://server/bar', matched pattern 'http://server/*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.tsx' does not exist according to earlier cached lookups. -File '/root/src/bar.d.ts' does not exist according to earlier cached lookups. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name 'http://server/bar' was successfully resolved to '/root/src/bar.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.types deleted file mode 100644 index 67da661c15..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.types +++ /dev/null @@ -1,83 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.ts] //// - -=== /root/src/foo.ts === -export function foo() {} ->foo : () => void - -=== /root/src/bar.js === -export function bar() {} ->bar : () => void - -=== /root/a.ts === -import { foo as foo1 } from "/foo"; ->foo : () => void ->foo1 : () => void - -import { bar as bar1 } from "/bar"; ->bar : () => void ->bar1 : () => void - -import { foo as foo2 } from "c:/foo"; ->foo : () => void ->foo2 : () => void - -import { bar as bar2 } from "c:/bar"; ->bar : () => void ->bar2 : () => void - -import { foo as foo3 } from "c:\\foo"; ->foo : () => void ->foo3 : () => void - -import { bar as bar3 } from "c:\\bar"; ->bar : () => void ->bar3 : () => void - -import { foo as foo4 } from "//server/foo"; ->foo : () => void ->foo4 : () => void - -import { bar as bar4 } from "//server/bar"; ->bar : () => void ->bar4 : () => void - -import { foo as foo5 } from "\\\\server\\foo"; ->foo : () => void ->foo5 : () => void - -import { bar as bar5 } from "\\\\server\\bar"; ->bar : () => void ->bar5 : () => void - -import { foo as foo6 } from "file:///foo"; ->foo : () => void ->foo6 : () => void - -import { bar as bar6 } from "file:///bar"; ->bar : () => void ->bar6 : () => void - -import { foo as foo7 } from "file://c:/foo"; ->foo : () => void ->foo7 : () => void - -import { bar as bar7 } from "file://c:/bar"; ->bar : () => void ->bar7 : () => void - -import { foo as foo8 } from "file://server/foo"; ->foo : () => void ->foo8 : () => void - -import { bar as bar8 } from "file://server/bar"; ->bar : () => void ->bar8 : () => void - -import { foo as foo9 } from "http://server/foo"; ->foo : () => void ->foo9 : () => void - -import { bar as bar9 } from "http://server/bar"; ->bar : () => void ->bar9 : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt deleted file mode 100644 index 0d3551d2c4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== /root/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "/client/*": ["./client/*"], - "/import/*": ["./import/*"] - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /root/import/foo.ts (0 errors) ==== - export function foo() {} - -==== /root/client/bar.js (0 errors) ==== - export function bar() {} - -==== /root/src/a.ts (0 errors) ==== - import { foo } from "/import/foo"; - import { bar } from "/client/bar"; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.js deleted file mode 100644 index 1e82815314..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.ts] //// - -//// [foo.ts] -export function foo() {} - -//// [bar.js] -export function bar() {} - -//// [a.ts] -import { foo } from "/import/foo"; -import { bar } from "/client/bar"; - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo = foo; -function foo() { } -//// [bar.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = bar; -function bar() { } -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.symbols deleted file mode 100644 index 2be8402c4e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.ts] //// - -=== /root/import/foo.ts === -export function foo() {} ->foo : Symbol(foo, Decl(foo.ts, 0, 0)) - -=== /root/client/bar.js === -export function bar() {} ->bar : Symbol(bar, Decl(bar.js, 0, 0)) - -=== /root/src/a.ts === -import { foo } from "/import/foo"; ->foo : Symbol(foo, Decl(a.ts, 0, 8)) - -import { bar } from "/client/bar"; ->bar : Symbol(bar, Decl(a.ts, 1, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.trace.json deleted file mode 100644 index 04ef899b76..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.trace.json +++ /dev/null @@ -1,21 +0,0 @@ -======== Resolving module '/import/foo' from '/root/src/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/import/foo'. -Module name '/import/foo', matched pattern '/import/*'. -Trying substitution './import/*', candidate module location: './import/foo'. -Loading module as file / folder, candidate module location '/root/import/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/import/foo.ts' exists - use it as a name resolution result. -======== Module name '/import/foo' was successfully resolved to '/root/import/foo.ts'. ======== -======== Resolving module '/client/bar' from '/root/src/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/client/bar'. -Module name '/client/bar', matched pattern '/client/*'. -Trying substitution './client/*', candidate module location: './client/bar'. -Loading module as file / folder, candidate module location '/root/client/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/client/bar.ts' does not exist. -File '/root/client/bar.tsx' does not exist. -File '/root/client/bar.d.ts' does not exist. -File '/root/client/bar.js' exists - use it as a name resolution result. -======== Module name '/client/bar' was successfully resolved to '/root/client/bar.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.types deleted file mode 100644 index 46f1855085..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.ts] //// - -=== /root/import/foo.ts === -export function foo() {} ->foo : () => void - -=== /root/client/bar.js === -export function bar() {} ->bar : () => void - -=== /root/src/a.ts === -import { foo } from "/import/foo"; ->foo : () => void - -import { bar } from "/client/bar"; ->bar : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt deleted file mode 100644 index 8d8000f267..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt +++ /dev/null @@ -1,29 +0,0 @@ -/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== /root/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "/*": ["./src/*"] - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /root/a.ts (0 errors) ==== - import { foo } from "/foo"; - import { bar } from "/bar"; - -==== /foo.ts (0 errors) ==== - export function foo() {} - -==== /bar.js (0 errors) ==== - export function bar() {} - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js deleted file mode 100644 index 194e02979d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.ts] //// - -//// [foo.ts] -export function foo() {} - -//// [bar.js] -export function bar() {} - -//// [a.ts] -import { foo } from "/foo"; -import { bar } from "/bar"; - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo = foo; -function foo() { } -//// [bar.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = bar; -function bar() { } -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.symbols deleted file mode 100644 index 6e0b0e75fc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.ts] //// - -=== /root/a.ts === -import { foo } from "/foo"; ->foo : Symbol(foo, Decl(a.ts, 0, 8)) - -import { bar } from "/bar"; ->bar : Symbol(bar, Decl(a.ts, 1, 8)) - -=== /foo.ts === -export function foo() {} ->foo : Symbol(foo, Decl(foo.ts, 0, 0)) - -=== /bar.js === -export function bar() {} ->bar : Symbol(bar, Decl(bar.js, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.trace.json deleted file mode 100644 index 4f68837ad7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.trace.json +++ /dev/null @@ -1,23 +0,0 @@ -======== Resolving module '/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/foo'. -Module name '/foo', matched pattern '/*'. -Trying substitution './src/*', candidate module location: './src/foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo.ts' exists - use it as a name resolution result. -======== Module name '/foo' was successfully resolved to '/foo.ts'. ======== -======== Resolving module '/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/bar'. -Module name '/bar', matched pattern '/*'. -Trying substitution './src/*', candidate module location: './src/bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -Loading module as file / folder, candidate module location '/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/bar.ts' does not exist. -File '/bar.tsx' does not exist. -File '/bar.d.ts' does not exist. -File '/bar.js' exists - use it as a name resolution result. -======== Module name '/bar' was successfully resolved to '/bar.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.types deleted file mode 100644 index e189dff5ab..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.ts] //// - -=== /root/a.ts === -import { foo } from "/foo"; ->foo : () => void - -import { bar } from "/bar"; ->bar : () => void - -=== /foo.ts === -export function foo() {} ->foo : () => void - -=== /bar.js === -export function bar() {} ->bar : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt deleted file mode 100644 index 04131f0fd1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt +++ /dev/null @@ -1,29 +0,0 @@ -/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== /root/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": ["./src/*"] - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /root/src/foo.ts (0 errors) ==== - export function foo() {} - -==== /root/src/bar.js (0 errors) ==== - export function bar() {} - -==== /root/a.ts (0 errors) ==== - import { foo } from "/foo"; - import { bar } from "/bar"; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.js deleted file mode 100644 index aa1d13db71..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.ts] //// - -//// [foo.ts] -export function foo() {} - -//// [bar.js] -export function bar() {} - -//// [a.ts] -import { foo } from "/foo"; -import { bar } from "/bar"; - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo = foo; -function foo() { } -//// [bar.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = bar; -function bar() { } -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.symbols deleted file mode 100644 index e5d724a080..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.ts] //// - -=== /root/src/foo.ts === -export function foo() {} ->foo : Symbol(foo, Decl(foo.ts, 0, 0)) - -=== /root/src/bar.js === -export function bar() {} ->bar : Symbol(bar, Decl(bar.js, 0, 0)) - -=== /root/a.ts === -import { foo } from "/foo"; ->foo : Symbol(foo, Decl(a.ts, 0, 8)) - -import { bar } from "/bar"; ->bar : Symbol(bar, Decl(a.ts, 1, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.trace.json deleted file mode 100644 index 950910be01..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.trace.json +++ /dev/null @@ -1,21 +0,0 @@ -======== Resolving module '/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/foo'. -Module name '/foo', matched pattern '*'. -Trying substitution './src/*', candidate module location: './src//foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/foo.ts' exists - use it as a name resolution result. -======== Module name '/foo' was successfully resolved to '/root/src/foo.ts'. ======== -======== Resolving module '/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/bar'. -Module name '/bar', matched pattern '*'. -Trying substitution './src/*', candidate module location: './src//bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/root/src/bar.ts' does not exist. -File '/root/src/bar.tsx' does not exist. -File '/root/src/bar.d.ts' does not exist. -File '/root/src/bar.js' exists - use it as a name resolution result. -======== Module name '/bar' was successfully resolved to '/root/src/bar.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.types deleted file mode 100644 index cd61a9513e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.ts] //// - -=== /root/src/foo.ts === -export function foo() {} ->foo : () => void - -=== /root/src/bar.js === -export function bar() {} ->bar : () => void - -=== /root/a.ts === -import { foo } from "/foo"; ->foo : () => void - -import { bar } from "/bar"; ->bar : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt deleted file mode 100644 index b5258b6653..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt +++ /dev/null @@ -1,29 +0,0 @@ -/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. - - -==== /root/tsconfig.json (1 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": ["./src/*"] - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /root/a.ts (0 errors) ==== - import { foo } from "/foo"; - import { bar } from "/bar"; - -==== /foo.ts (0 errors) ==== - export function foo() {} - -==== /bar.js (0 errors) ==== - export function bar() {} - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js deleted file mode 100644 index 27ea060dd7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.ts] //// - -//// [foo.ts] -export function foo() {} - -//// [bar.js] -export function bar() {} - -//// [a.ts] -import { foo } from "/foo"; -import { bar } from "/bar"; - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo = foo; -function foo() { } -//// [bar.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = bar; -function bar() { } -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.symbols deleted file mode 100644 index d048de95e6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.ts] //// - -=== /root/a.ts === -import { foo } from "/foo"; ->foo : Symbol(foo, Decl(a.ts, 0, 8)) - -import { bar } from "/bar"; ->bar : Symbol(bar, Decl(a.ts, 1, 8)) - -=== /foo.ts === -export function foo() {} ->foo : Symbol(foo, Decl(foo.ts, 0, 0)) - -=== /bar.js === -export function bar() {} ->bar : Symbol(bar, Decl(bar.js, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.trace.json deleted file mode 100644 index 610a3b617f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.trace.json +++ /dev/null @@ -1,23 +0,0 @@ -======== Resolving module '/foo' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/foo'. -Module name '/foo', matched pattern '*'. -Trying substitution './src/*', candidate module location: './src//foo'. -Loading module as file / folder, candidate module location '/root/src/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -Loading module as file / folder, candidate module location '/foo', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/foo.ts' exists - use it as a name resolution result. -======== Module name '/foo' was successfully resolved to '/foo.ts'. ======== -======== Resolving module '/bar' from '/root/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name '/bar'. -Module name '/bar', matched pattern '*'. -Trying substitution './src/*', candidate module location: './src//bar'. -Loading module as file / folder, candidate module location '/root/src/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -Loading module as file / folder, candidate module location '/bar', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/bar.ts' does not exist. -File '/bar.tsx' does not exist. -File '/bar.d.ts' does not exist. -File '/bar.js' exists - use it as a name resolution result. -======== Module name '/bar' was successfully resolved to '/bar.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.types deleted file mode 100644 index 54630514ac..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.ts] //// - -=== /root/a.ts === -import { foo } from "/foo"; ->foo : () => void - -import { bar } from "/bar"; ->bar : () => void - -=== /foo.ts === -export function foo() {} ->foo : () => void - -=== /bar.js === -export function bar() {} ->bar : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.errors.txt deleted file mode 100644 index 96771109f5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.errors.txt +++ /dev/null @@ -1,36 +0,0 @@ -/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -/tsconfig.json(5,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -/tsconfig.json(6,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== /tsconfig.json (3 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "foo": ["foo/foo.ts"], - ~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - "bar": ["bar/bar.js"] - ~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /foo/foo.ts (0 errors) ==== - export function foo() {} - -==== /bar/bar.js (0 errors) ==== - export function bar() {} - -==== /a.ts (0 errors) ==== - import { foo } from "foo"; - import { bar } from "bar"; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.js deleted file mode 100644 index bf7852b116..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.js +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts] //// - -//// [foo.ts] -export function foo() {} - -//// [bar.js] -export function bar() {} - -//// [a.ts] -import { foo } from "foo"; -import { bar } from "bar"; - - -//// [foo.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo = foo; -function foo() { } -//// [bar.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = bar; -function bar() { } -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.symbols deleted file mode 100644 index c657460d53..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts] //// - -=== /foo/foo.ts === -export function foo() {} ->foo : Symbol(foo, Decl(foo.ts, 0, 0)) - -=== /bar/bar.js === -export function bar() {} ->bar : Symbol(bar, Decl(bar.js, 0, 0)) - -=== /a.ts === -import { foo } from "foo"; ->foo : Symbol(foo, Decl(a.ts, 0, 8)) - -import { bar } from "bar"; ->bar : Symbol(bar, Decl(a.ts, 1, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.trace.json deleted file mode 100644 index e06bc1c1c9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.trace.json +++ /dev/null @@ -1,16 +0,0 @@ -======== Resolving module 'foo' from '/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'foo'. -Module name 'foo', matched pattern 'foo'. -Trying substitution 'foo/foo.ts', candidate module location: 'foo/foo.ts'. -File '/foo/foo.ts' exists - use it as a name resolution result. -======== Module name 'foo' was successfully resolved to '/foo/foo.ts'. ======== -======== Resolving module 'bar' from '/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'bar'. -Module name 'bar', matched pattern 'bar'. -Trying substitution 'bar/bar.js', candidate module location: 'bar/bar.js'. -File '/bar/bar.js' exists - use it as a name resolution result. -======== Module name 'bar' was successfully resolved to '/bar/bar.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.types deleted file mode 100644 index f93c07e2cc..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension.ts] //// - -=== /foo/foo.ts === -export function foo() {} ->foo : () => void - -=== /bar/bar.js === -export function bar() {} ->bar : () => void - -=== /a.ts === -import { foo } from "foo"; ->foo : () => void - -import { bar } from "bar"; ->bar : () => void - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.errors.txt deleted file mode 100644 index 85662d2c56..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -/tsconfig.json(5,19): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== /tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": ["foo/*"] - ~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } - -==== /foo/zone.js/index.d.ts (0 errors) ==== - export const x: number; - -==== /foo/zone.tsx/index.d.ts (0 errors) ==== - export const y: number; - -==== /a.ts (0 errors) ==== - import { x } from "zone.js"; - import { y } from "zone.tsx"; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.js deleted file mode 100644 index 2eda1e8391..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.js +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtensionInName.ts] //// - -//// [index.d.ts] -export const x: number; - -//// [index.d.ts] -export const y: number; - -//// [a.ts] -import { x } from "zone.js"; -import { y } from "zone.tsx"; - - -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.symbols deleted file mode 100644 index 8dd5a45ab7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtensionInName.ts] //// - -=== /foo/zone.js/index.d.ts === -export const x: number; ->x : Symbol(x, Decl(index.d.ts, 0, 12)) - -=== /foo/zone.tsx/index.d.ts === -export const y: number; ->y : Symbol(y, Decl(index.d.ts, 0, 12)) - -=== /a.ts === -import { x } from "zone.js"; ->x : Symbol(x, Decl(a.ts, 0, 8)) - -import { y } from "zone.tsx"; ->y : Symbol(y, Decl(a.ts, 1, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.trace.json deleted file mode 100644 index 6d82934790..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.trace.json +++ /dev/null @@ -1,46 +0,0 @@ -======== Resolving module 'zone.js' from '/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'zone.js'. -Module name 'zone.js', matched pattern '*'. -Trying substitution 'foo/*', candidate module location: 'foo/zone.js'. -Loading module as file / folder, candidate module location '/foo/zone.js', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/foo/zone.js' has a '.js' extension - stripping it. -File '/foo/zone.ts' does not exist. -File '/foo/zone.tsx' does not exist. -File '/foo/zone.d.ts' does not exist. -File '/foo/zone.js' does not exist. -File '/foo/zone.jsx' does not exist. -File '/foo/zone.js.ts' does not exist. -File '/foo/zone.js.tsx' does not exist. -File '/foo/zone.js.d.ts' does not exist. -File '/foo/zone.js.js' does not exist. -File '/foo/zone.js.jsx' does not exist. -File '/foo/zone.js/package.json' does not exist. -File '/foo/zone.js/index.ts' does not exist. -File '/foo/zone.js/index.tsx' does not exist. -File '/foo/zone.js/index.d.ts' exists - use it as a name resolution result. -======== Module name 'zone.js' was successfully resolved to '/foo/zone.js/index.d.ts'. ======== -======== Resolving module 'zone.tsx' from '/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'zone.tsx'. -Module name 'zone.tsx', matched pattern '*'. -Trying substitution 'foo/*', candidate module location: 'foo/zone.tsx'. -Loading module as file / folder, candidate module location '/foo/zone.tsx', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/foo/zone.tsx' has a '.tsx' extension - stripping it. -File '/foo/zone.tsx' does not exist according to earlier cached lookups. -File '/foo/zone.ts' does not exist according to earlier cached lookups. -File '/foo/zone.d.ts' does not exist according to earlier cached lookups. -File '/foo/zone.jsx' does not exist according to earlier cached lookups. -File '/foo/zone.js' does not exist according to earlier cached lookups. -File '/foo/zone.tsx.ts' does not exist. -File '/foo/zone.tsx.tsx' does not exist. -File '/foo/zone.tsx.d.ts' does not exist. -File '/foo/zone.tsx.js' does not exist. -File '/foo/zone.tsx.jsx' does not exist. -File '/foo/zone.tsx/package.json' does not exist. -File '/foo/zone.tsx/index.ts' does not exist. -File '/foo/zone.tsx/index.tsx' does not exist. -File '/foo/zone.tsx/index.d.ts' exists - use it as a name resolution result. -======== Module name 'zone.tsx' was successfully resolved to '/foo/zone.tsx/index.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.types deleted file mode 100644 index 5b5ac12335..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtensionInName.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtensionInName.ts] //// - -=== /foo/zone.js/index.d.ts === -export const x: number; ->x : number - -=== /foo/zone.tsx/index.d.ts === -export const y: number; ->y : number - -=== /a.ts === -import { x } from "zone.js"; ->x : number - -import { y } from "zone.tsx"; ->y : number - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt deleted file mode 100644 index 77e996ed4f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt +++ /dev/null @@ -1,31 +0,0 @@ -/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -/tsconfig.json(5,19): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -/tsconfig.json(5,37): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== /tsconfig.json (3 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": ["node_modules/*", "src/types"] - ~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - ~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /a.ts (0 errors) ==== - import foobar from "foo/bar/foobar.js"; - -==== /node_modules/foo/bar/foobar.js (0 errors) ==== - module.exports = { a: 10 }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.js deleted file mode 100644 index 520f8bf8d8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.js +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.ts] //// - -//// [foobar.js] -module.exports = { a: 10 }; - -//// [a.ts] -import foobar from "foo/bar/foobar.js"; - - -//// [/bin/a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.symbols deleted file mode 100644 index 14c6b607be..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.ts] //// - -=== /a.ts === -import foobar from "foo/bar/foobar.js"; ->foobar : Symbol(foobar, Decl(a.ts, 0, 6)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.trace.json deleted file mode 100644 index 1eeb6b8fee..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.trace.json +++ /dev/null @@ -1,15 +0,0 @@ -======== Resolving module 'foo/bar/foobar.js' from '/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'foo/bar/foobar.js'. -Module name 'foo/bar/foobar.js', matched pattern '*'. -Trying substitution 'node_modules/*', candidate module location: 'node_modules/foo/bar/foobar.js'. -Loading module as file / folder, candidate module location '/node_modules/foo/bar/foobar.js', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/node_modules/foo/bar/foobar.js' has a '.js' extension - stripping it. -File '/node_modules/foo/bar/foobar.ts' does not exist. -File '/node_modules/foo/bar/foobar.tsx' does not exist. -File '/node_modules/foo/bar/foobar.d.ts' does not exist. -File '/node_modules/foo/bar/foobar.js' exists - use it as a name resolution result. -File '/node_modules/foo/package.json' does not exist. -Resolving real path for '/node_modules/foo/bar/foobar.js', result '/node_modules/foo/bar/foobar.js'. -======== Module name 'foo/bar/foobar.js' was successfully resolved to '/node_modules/foo/bar/foobar.js'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.types deleted file mode 100644 index dcb8d2d2bb..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.types +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.ts] //// - -=== /a.ts === -import foobar from "foo/bar/foobar.js"; ->foobar : any - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt deleted file mode 100644 index f0a653aaa8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt +++ /dev/null @@ -1,26 +0,0 @@ -/a.ts(1,21): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -/tsconfig.json(5,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== /tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "foo": ["foo/foo.ts"] - ~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } - -==== /a.ts (1 errors) ==== - import { foo } from "foo"; - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.js b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.js deleted file mode 100644 index aeb2102666..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.js +++ /dev/null @@ -1,9 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.ts] //// - -//// [a.ts] -import { foo } from "foo"; - - -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.symbols b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.symbols deleted file mode 100644 index 08ccab783c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.ts] //// - -=== /a.ts === -import { foo } from "foo"; ->foo : Symbol(foo, Decl(a.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json deleted file mode 100644 index 7be5ad8451..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.trace.json +++ /dev/null @@ -1,17 +0,0 @@ -======== Resolving module 'foo' from '/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'foo'. -Module name 'foo', matched pattern 'foo'. -Trying substitution 'foo/foo.ts', candidate module location: 'foo/foo.ts'. -File '/foo/foo.ts' does not exist. -Loading module as file / folder, candidate module location '/foo/foo.ts', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/foo/foo.ts' has a '.ts' extension - stripping it. -File '/package.json' does not exist. -Loading module 'foo' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'foo' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.types b/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.types deleted file mode 100644 index 56e8885776..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.types +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.ts] //// - -=== /a.ts === -import { foo } from "foo"; ->foo : any - diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.errors.txt b/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.errors.txt deleted file mode 100644 index 958098f4fa..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.errors.txt +++ /dev/null @@ -1,34 +0,0 @@ -/project/index.ts(1,20): error TS2307: Cannot find module 'p1' or its corresponding type declarations. -/project/tsconfig.json(3,3): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["../other/*"]}' instead. - - -==== /project/tsconfig.json (1 errors) ==== - { - "extends": "../other/tsconfig.base.json", - "compilerOptions": { - ~~~~~~~~~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["../other/*"]}' instead. - "module": "commonjs", - "paths": { - "p1": ["./lib/p1"] - } - } - } - -==== /project/index.ts (1 errors) ==== - import { p1 } from "p1"; - ~~~~ -!!! error TS2307: Cannot find module 'p1' or its corresponding type declarations. - -==== /other/tsconfig.base.json (0 errors) ==== - { - "compilerOptions": { - "baseUrl": "." - } - } - -==== /other/lib/p1/index.ts (0 errors) ==== - export const p1 = 0; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.js b/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.js deleted file mode 100644 index b96fa9697f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.js +++ /dev/null @@ -1,19 +0,0 @@ -//// [tests/cases/compiler/pathMappingInheritedBaseUrl.ts] //// - -//// [tsconfig.base.json] -{ - "compilerOptions": { - "baseUrl": "." - } -} - -//// [index.ts] -export const p1 = 0; - -//// [index.ts] -import { p1 } from "p1"; - - -//// [index.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.js.diff b/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.js.diff deleted file mode 100644 index c781082f03..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathMappingInheritedBaseUrl.js.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.pathMappingInheritedBaseUrl.js -+++ new.pathMappingInheritedBaseUrl.js -@@= skipped -16, +16 lines =@@ - //// [index.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --exports.p1 = void 0; --exports.p1 = 0; --//// [index.js] --"use strict"; --Object.defineProperty(exports, "__esModule", { value: true }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation1.errors.txt b/testdata/baselines/reference/submodule/compiler/pathsValidation1.errors.txt deleted file mode 100644 index 4dff2cb6b5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation1.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -tsconfig.json(5,18): error TS5063: Substitutions for pattern '*' should be an array. - - -==== tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": "*" - ~~~ -!!! error TS5063: Substitutions for pattern '*' should be an array. - } - } - } -==== a.ts (0 errors) ==== - let x = 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation1.js b/testdata/baselines/reference/submodule/compiler/pathsValidation1.js deleted file mode 100644 index 291a7f71e8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation1.js +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/pathsValidation1.ts] //// - -//// [a.ts] -let x = 1; - -//// [a.js] -let x = 1; diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation1.symbols b/testdata/baselines/reference/submodule/compiler/pathsValidation1.symbols deleted file mode 100644 index 34019f8d99..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation1.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/pathsValidation1.ts] //// - -=== a.ts === -let x = 1; ->x : Symbol(x, Decl(a.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation1.types b/testdata/baselines/reference/submodule/compiler/pathsValidation1.types deleted file mode 100644 index e1af137994..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation1.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/pathsValidation1.ts] //// - -=== a.ts === -let x = 1; ->x : number ->1 : 1 - diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation2.errors.txt b/testdata/baselines/reference/submodule/compiler/pathsValidation2.errors.txt deleted file mode 100644 index f378a3c33b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation2.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -tsconfig.json(5,18): error TS5066: Substitutions for pattern '*' shouldn't be an empty array. - - -==== tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": [1] - ~~~ -!!! error TS5066: Substitutions for pattern '*' shouldn't be an empty array. - } - } - } -==== a.ts (0 errors) ==== - let x = 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation2.js b/testdata/baselines/reference/submodule/compiler/pathsValidation2.js deleted file mode 100644 index 29a0f84058..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation2.js +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/pathsValidation2.ts] //// - -//// [a.ts] -let x = 1; - -//// [a.js] -let x = 1; diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation2.symbols b/testdata/baselines/reference/submodule/compiler/pathsValidation2.symbols deleted file mode 100644 index 6b4bc84e59..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation2.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/pathsValidation2.ts] //// - -=== a.ts === -let x = 1; ->x : Symbol(x, Decl(a.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation2.types b/testdata/baselines/reference/submodule/compiler/pathsValidation2.types deleted file mode 100644 index 2bca41ec6f..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation2.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/pathsValidation2.ts] //// - -=== a.ts === -let x = 1; ->x : number ->1 : 1 - diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation3.errors.txt b/testdata/baselines/reference/submodule/compiler/pathsValidation3.errors.txt deleted file mode 100644 index 47d1320e2a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation3.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -tsconfig.json(5,20): error TS5066: Substitutions for pattern 'foo' shouldn't be an empty array. - - -==== tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "foo": [] - ~~ -!!! error TS5066: Substitutions for pattern 'foo' shouldn't be an empty array. - } - } - } - -==== a.ts (0 errors) ==== - let x = 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation3.js b/testdata/baselines/reference/submodule/compiler/pathsValidation3.js deleted file mode 100644 index 1ae46a4131..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation3.js +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/pathsValidation3.ts] //// - -//// [a.ts] -let x = 1; - -//// [a.js] -let x = 1; diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation3.symbols b/testdata/baselines/reference/submodule/compiler/pathsValidation3.symbols deleted file mode 100644 index 1667faf056..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation3.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/pathsValidation3.ts] //// - -=== a.ts === -let x = 1; ->x : Symbol(x, Decl(a.ts, 0, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation3.types b/testdata/baselines/reference/submodule/compiler/pathsValidation3.types deleted file mode 100644 index 4a0bce98f1..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation3.types +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/compiler/pathsValidation3.ts] //// - -=== a.ts === -let x = 1; ->x : number ->1 : 1 - diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation4.errors.txt b/testdata/baselines/reference/submodule/compiler/pathsValidation4.errors.txt deleted file mode 100644 index cb2d81b0d8..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation4.errors.txt +++ /dev/null @@ -1,34 +0,0 @@ -tsconfig.json(4,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./src/*"]}' instead. -tsconfig.json(6,11): error TS5061: Pattern '@interface/**/*' can have at most one '*' character. -tsconfig.json(7,11): error TS5061: Pattern '@service/**/*' can have at most one '*' character. -tsconfig.json(7,29): error TS5062: Substitution './src/service/**/*' in pattern '@service/**/*' can have at most one '*' character. -tsconfig.json(8,29): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== tsconfig.json (5 errors) ==== - { - "compilerOptions": { - "traceResolution": true, - "baseUrl": "./src", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./src/*"]}' instead. - "paths": { - "@interface/**/*" : ["./src/interface/*"], - ~~~~~~~~~~~~~~~~~ -!!! error TS5061: Pattern '@interface/**/*' can have at most one '*' character. - "@service/**/*": ["./src/service/**/*"], - ~~~~~~~~~~~~~~~ -!!! error TS5061: Pattern '@service/**/*' can have at most one '*' character. - ~~~~~~~~~~~~~~~~~~~~ -!!! error TS5062: Substitution './src/service/**/*' in pattern '@service/**/*' can have at most one '*' character. - "@controller/*": ["controller/*"], - ~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } - -==== src/main.ts (0 errors) ==== - import 'someModule'; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation4.js b/testdata/baselines/reference/submodule/compiler/pathsValidation4.js deleted file mode 100644 index 86d8dac6a5..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation4.js +++ /dev/null @@ -1,9 +0,0 @@ -//// [tests/cases/compiler/pathsValidation4.ts] //// - -//// [main.ts] -import 'someModule'; - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -require("someModule"); diff --git a/testdata/baselines/reference/submodule/compiler/pathsValidation4.trace.json b/testdata/baselines/reference/submodule/compiler/pathsValidation4.trace.json deleted file mode 100644 index 3e08aef365..0000000000 --- a/testdata/baselines/reference/submodule/compiler/pathsValidation4.trace.json +++ /dev/null @@ -1,20 +0,0 @@ -======== Resolving module 'someModule' from '/.src/src/main.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'someModule'. -File '/.src/src/package.json' does not exist. -File '/.src/package.json' does not exist. -File '/package.json' does not exist. -Loading module 'someModule' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/.src/src/node_modules' does not exist, skipping all lookups in it. -Directory '/.src/src/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/.src/node_modules' does not exist, skipping all lookups in it. -Directory '/.src/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/.src/src/node_modules' does not exist, skipping all lookups in it. -Directory '/.src/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'someModule' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt new file mode 100644 index 0000000000..eeb5964c4b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.errors.txt @@ -0,0 +1,54 @@ +privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts(15,12): error TS2323: Cannot redeclare exported variable 'publicUse_im_private_mi_public'. +privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts(17,12): error TS2323: Cannot redeclare exported variable 'publicUse_im_private_mi_public'. + + +==== privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts (2 errors) ==== + /// + /// + // Privacy errors - importing private elements + import im_private_mi_private = require("m"); + import im_private_mu_private = require("m2"); + import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); + import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1"); + + // Usage of privacy error imports + var privateUse_im_private_mi_private = new im_private_mi_private.c_private(); + export var publicUse_im_private_mi_private = new im_private_mi_private.c_private(); + var privateUse_im_private_mu_private = new im_private_mu_private.c_private(); + export var publicUse_im_private_mu_private = new im_private_mu_private.c_private(); + var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); + export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2323: Cannot redeclare exported variable 'publicUse_im_private_mi_public'. + var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); + export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2323: Cannot redeclare exported variable 'publicUse_im_private_mi_public'. + +==== privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts (0 errors) ==== + // Public elements + export class c_public { + foo: string; + } + +==== privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts (0 errors) ==== + export class c_public { + bar: string; + } + +==== privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts (0 errors) ==== + // private elements + // Export - Error ambient modules allowed only in global + declare module 'm' { + export class c_private { + baz: string + } + } + +==== privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts (0 errors) ==== + declare module 'm2' { + export class c_private { + bing: string; + } + } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.js b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.js new file mode 100644 index 0000000000..c683d169a3 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.js @@ -0,0 +1,117 @@ +//// [tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts] //// + +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts] +// Public elements +export class c_public { + foo: string; +} + +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts] +export class c_public { + bar: string; +} + +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts] +// private elements +// Export - Error ambient modules allowed only in global +declare module 'm' { + export class c_private { + baz: string + } +} + +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts] +declare module 'm2' { + export class c_private { + bing: string; + } +} + +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts] +/// +/// +// Privacy errors - importing private elements +import im_private_mi_private = require("m"); +import im_private_mu_private = require("m2"); +import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); +import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1"); + +// Usage of privacy error imports +var privateUse_im_private_mi_private = new im_private_mi_private.c_private(); +export var publicUse_im_private_mi_private = new im_private_mi_private.c_private(); +var privateUse_im_private_mu_private = new im_private_mu_private.c_private(); +export var publicUse_im_private_mu_private = new im_private_mu_private.c_private(); +var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); +export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); +var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); +export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); + + +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.js] +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.js] +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.c_public = void 0; +// Public elements +class c_public { + foo; +} +exports.c_public = c_public; +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.c_public = void 0; +class c_public { + bar; +} +exports.c_public = c_public; +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.publicUse_im_private_mi_public = exports.publicUse_im_private_mu_private = exports.publicUse_im_private_mi_private = void 0; +/// +/// +// Privacy errors - importing private elements +const im_private_mi_private = require("m"); +const im_private_mu_private = require("m2"); +const im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); +// Usage of privacy error imports +var privateUse_im_private_mi_private = new im_private_mi_private.c_private(); +exports.publicUse_im_private_mi_private = new im_private_mi_private.c_private(); +var privateUse_im_private_mu_private = new im_private_mu_private.c_private(); +exports.publicUse_im_private_mu_private = new im_private_mu_private.c_private(); +var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); +exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public(); +var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); +exports.publicUse_im_private_mi_public = new im_private_mi_public.c_public(); + + +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.d.ts] +declare module 'm' { + class c_private { + baz: string; + } +} +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.d.ts] +declare module 'm2' { + class c_private { + bing: string; + } +} +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require.d.ts] +export declare class c_public { + foo: string; +} +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.d.ts] +export declare class c_public { + bar: string; +} +//// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.d.ts] +import im_private_mi_private = require("m"); +import im_private_mu_private = require("m2"); +import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); +export declare var publicUse_im_private_mi_private: im_private_mi_private.c_private; +export declare var publicUse_im_private_mu_private: im_private_mu_private.c_private; +export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public; +export declare var publicUse_im_private_mi_public: im_private_mi_public.c_public; diff --git a/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.js.diff b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.js.diff new file mode 100644 index 0000000000..eaded90b5d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.js.diff @@ -0,0 +1,31 @@ +--- old.privacyTopLevelAmbientExternalModuleImportWithoutExport.js ++++ new.privacyTopLevelAmbientExternalModuleImportWithoutExport.js +@@= skipped -54, +54 lines =@@ + exports.c_public = void 0; + // Public elements + class c_public { ++ foo; + } + exports.c_public = c_public; + //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.js] +@@= skipped -7, +8 lines =@@ + Object.defineProperty(exports, "__esModule", { value: true }); + exports.c_public = void 0; + class c_public { ++ bar; + } + exports.c_public = c_public; + //// [privacyTopLevelAmbientExternalModuleImportWithoutExport_core.js] +@@= skipped -9, +10 lines =@@ + /// + /// + // Privacy errors - importing private elements +-var im_private_mi_private = require("m"); +-var im_private_mu_private = require("m2"); +-var im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); ++const im_private_mi_private = require("m"); ++const im_private_mu_private = require("m2"); ++const im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); + // Usage of privacy error imports + var privateUse_im_private_mi_private = new im_private_mi_private.c_private(); + exports.publicUse_im_private_mi_private = new im_private_mi_private.c_private(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols new file mode 100644 index 0000000000..a3d75551a3 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.symbols @@ -0,0 +1,110 @@ +//// [tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts] //// + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts === +/// +/// +// Privacy errors - importing private elements +import im_private_mi_private = require("m"); +>im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 0, 0)) + +import im_private_mu_private = require("m2"); +>im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 3, 44)) + +import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); +>im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 4, 45)) + +import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1"); +>im_private_mu_public : Symbol(im_private_mu_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 5, 107)) + +// Usage of privacy error imports +var privateUse_im_private_mi_private = new im_private_mi_private.c_private(); +>privateUse_im_private_mi_private : Symbol(privateUse_im_private_mi_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 9, 3)) +>im_private_mi_private.c_private : Symbol(im_private_mi_private.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 2, 20)) +>im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 0, 0)) +>c_private : Symbol(im_private_mi_private.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 2, 20)) + +export var publicUse_im_private_mi_private = new im_private_mi_private.c_private(); +>publicUse_im_private_mi_private : Symbol(publicUse_im_private_mi_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 10, 10)) +>im_private_mi_private.c_private : Symbol(im_private_mi_private.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 2, 20)) +>im_private_mi_private : Symbol(im_private_mi_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 0, 0)) +>c_private : Symbol(im_private_mi_private.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 2, 20)) + +var privateUse_im_private_mu_private = new im_private_mu_private.c_private(); +>privateUse_im_private_mu_private : Symbol(privateUse_im_private_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 11, 3)) +>im_private_mu_private.c_private : Symbol(im_private_mu_private.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 0, 21)) +>im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 3, 44)) +>c_private : Symbol(im_private_mu_private.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 0, 21)) + +export var publicUse_im_private_mu_private = new im_private_mu_private.c_private(); +>publicUse_im_private_mu_private : Symbol(publicUse_im_private_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 12, 10)) +>im_private_mu_private.c_private : Symbol(im_private_mu_private.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 0, 21)) +>im_private_mu_private : Symbol(im_private_mu_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 3, 44)) +>c_private : Symbol(im_private_mu_private.c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 0, 21)) + +var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); +>privateUse_im_private_mi_public : Symbol(privateUse_im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 13, 3), Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 15, 3)) +>im_private_mi_public.c_public : Symbol(im_private_mi_public.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) +>im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 4, 45)) +>c_public : Symbol(im_private_mi_public.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) + +export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); +>publicUse_im_private_mi_public : Symbol(publicUse_im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 14, 10), Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 16, 10)) +>im_private_mi_public.c_public : Symbol(im_private_mi_public.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) +>im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 4, 45)) +>c_public : Symbol(im_private_mi_public.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) + +var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); +>privateUse_im_private_mi_public : Symbol(privateUse_im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 13, 3), Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 15, 3)) +>im_private_mi_public.c_public : Symbol(im_private_mi_public.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) +>im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 4, 45)) +>c_public : Symbol(im_private_mi_public.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) + +export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); +>publicUse_im_private_mi_public : Symbol(publicUse_im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 14, 10), Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 16, 10)) +>im_private_mi_public.c_public : Symbol(im_private_mi_public.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) +>im_private_mi_public : Symbol(im_private_mi_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts, 4, 45)) +>c_public : Symbol(im_private_mi_public.c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts === +// Public elements +export class c_public { +>c_public : Symbol(c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 0, 0)) + + foo: string; +>foo : Symbol(c_public.foo, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts, 1, 23)) +} + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts === +export class c_public { +>c_public : Symbol(c_public, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts, 0, 0)) + + bar: string; +>bar : Symbol(c_public.bar, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts, 0, 23)) +} + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts === +// private elements +// Export - Error ambient modules allowed only in global +declare module 'm' { +>'m' : Symbol("m", Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 0, 0)) + + export class c_private { +>c_private : Symbol(c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 2, 20)) + + baz: string +>baz : Symbol(c_private.baz, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts, 3, 28)) + } +} + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts === +declare module 'm2' { +>'m2' : Symbol("m2", Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 0, 0)) + + export class c_private { +>c_private : Symbol(c_private, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 0, 21)) + + bing: string; +>bing : Symbol(c_private.bing, Decl(privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts, 1, 28)) + } +} + diff --git a/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.types b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.types new file mode 100644 index 0000000000..8a4d58b1fc --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.types @@ -0,0 +1,118 @@ +//// [tests/cases/compiler/privacyTopLevelAmbientExternalModuleImportWithoutExport.ts] //// + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_core.ts === +/// +/// +// Privacy errors - importing private elements +import im_private_mi_private = require("m"); +>im_private_mi_private : typeof im_private_mi_private + +import im_private_mu_private = require("m2"); +>im_private_mu_private : typeof im_private_mu_private + +import im_private_mi_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require"); +>im_private_mi_public : typeof im_private_mi_public + +import im_private_mu_public = require("./privacyTopLevelAmbientExternalModuleImportWithoutExport_require1"); +>im_private_mu_public : typeof im_private_mu_public + +// Usage of privacy error imports +var privateUse_im_private_mi_private = new im_private_mi_private.c_private(); +>privateUse_im_private_mi_private : im_private_mi_private.c_private +>new im_private_mi_private.c_private() : im_private_mi_private.c_private +>im_private_mi_private.c_private : typeof im_private_mi_private.c_private +>im_private_mi_private : typeof im_private_mi_private +>c_private : typeof im_private_mi_private.c_private + +export var publicUse_im_private_mi_private = new im_private_mi_private.c_private(); +>publicUse_im_private_mi_private : im_private_mi_private.c_private +>new im_private_mi_private.c_private() : im_private_mi_private.c_private +>im_private_mi_private.c_private : typeof im_private_mi_private.c_private +>im_private_mi_private : typeof im_private_mi_private +>c_private : typeof im_private_mi_private.c_private + +var privateUse_im_private_mu_private = new im_private_mu_private.c_private(); +>privateUse_im_private_mu_private : im_private_mu_private.c_private +>new im_private_mu_private.c_private() : im_private_mu_private.c_private +>im_private_mu_private.c_private : typeof im_private_mu_private.c_private +>im_private_mu_private : typeof im_private_mu_private +>c_private : typeof im_private_mu_private.c_private + +export var publicUse_im_private_mu_private = new im_private_mu_private.c_private(); +>publicUse_im_private_mu_private : im_private_mu_private.c_private +>new im_private_mu_private.c_private() : im_private_mu_private.c_private +>im_private_mu_private.c_private : typeof im_private_mu_private.c_private +>im_private_mu_private : typeof im_private_mu_private +>c_private : typeof im_private_mu_private.c_private + +var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); +>privateUse_im_private_mi_public : im_private_mi_public.c_public +>new im_private_mi_public.c_public() : im_private_mi_public.c_public +>im_private_mi_public.c_public : typeof im_private_mi_public.c_public +>im_private_mi_public : typeof im_private_mi_public +>c_public : typeof im_private_mi_public.c_public + +export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); +>publicUse_im_private_mi_public : im_private_mi_public.c_public +>new im_private_mi_public.c_public() : im_private_mi_public.c_public +>im_private_mi_public.c_public : typeof im_private_mi_public.c_public +>im_private_mi_public : typeof im_private_mi_public +>c_public : typeof im_private_mi_public.c_public + +var privateUse_im_private_mi_public = new im_private_mi_public.c_public(); +>privateUse_im_private_mi_public : im_private_mi_public.c_public +>new im_private_mi_public.c_public() : im_private_mi_public.c_public +>im_private_mi_public.c_public : typeof im_private_mi_public.c_public +>im_private_mi_public : typeof im_private_mi_public +>c_public : typeof im_private_mi_public.c_public + +export var publicUse_im_private_mi_public = new im_private_mi_public.c_public(); +>publicUse_im_private_mi_public : im_private_mi_public.c_public +>new im_private_mi_public.c_public() : im_private_mi_public.c_public +>im_private_mi_public.c_public : typeof im_private_mi_public.c_public +>im_private_mi_public : typeof im_private_mi_public +>c_public : typeof im_private_mi_public.c_public + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_require.ts === +// Public elements +export class c_public { +>c_public : c_public + + foo: string; +>foo : string +} + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_require1.ts === +export class c_public { +>c_public : c_public + + bar: string; +>bar : string +} + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_require2.ts === +// private elements +// Export - Error ambient modules allowed only in global +declare module 'm' { +>'m' : typeof import("m") + + export class c_private { +>c_private : c_private + + baz: string +>baz : string + } +} + +=== privacyTopLevelAmbientExternalModuleImportWithoutExport_require3.ts === +declare module 'm2' { +>'m2' : typeof import("m2") + + export class c_private { +>c_private : c_private + + bing: string; +>bing : string + } +} + diff --git a/testdata/baselines/reference/submodule/compiler/propTypeValidatorInference.js b/testdata/baselines/reference/submodule/compiler/propTypeValidatorInference.js index 08487d20b5..50643f7024 100644 --- a/testdata/baselines/reference/submodule/compiler/propTypeValidatorInference.js +++ b/testdata/baselines/reference/submodule/compiler/propTypeValidatorInference.js @@ -91,8 +91,41 @@ const x: true = (null as any as ExtractPropsMatch); //// [file.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const PropTypes = require("prop-types"); +const PropTypes = __importStar(require("prop-types")); const innerProps = { foo: PropTypes.string.isRequired, bar: PropTypes.bool, diff --git a/testdata/baselines/reference/submodule/compiler/propTypeValidatorInference.js.diff b/testdata/baselines/reference/submodule/compiler/propTypeValidatorInference.js.diff index 4504bc62e8..43a943b68f 100644 --- a/testdata/baselines/reference/submodule/compiler/propTypeValidatorInference.js.diff +++ b/testdata/baselines/reference/submodule/compiler/propTypeValidatorInference.js.diff @@ -1,11 +1,11 @@ --- old.propTypeValidatorInference.js +++ new.propTypeValidatorInference.js -@@= skipped -91, +91 lines =@@ - //// [file.js] - "use strict"; +@@= skipped -124, +124 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var PropTypes = require("prop-types"); -+const PropTypes = require("prop-types"); +-var PropTypes = __importStar(require("prop-types")); ++const PropTypes = __importStar(require("prop-types")); const innerProps = { foo: PropTypes.string.isRequired, bar: PropTypes.bool, \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.errors.txt b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.errors.txt new file mode 100644 index 0000000000..74353bba9b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.errors.txt @@ -0,0 +1,36 @@ +propertyIdentityWithPrivacyMismatch_1.ts(5,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'Foo', but here has type 'Foo'. +propertyIdentityWithPrivacyMismatch_1.ts(13,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'y' must be of type 'Foo1', but here has type 'Foo2'. + + +==== propertyIdentityWithPrivacyMismatch_1.ts (2 errors) ==== + /// + import m1 = require('mod1'); + import m2 = require('mod2'); + var x: m1.Foo; + var x: m2.Foo; // Should be error (mod1.Foo !== mod2.Foo) + ~ +!!! error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'Foo', but here has type 'Foo'. +!!! related TS6203 propertyIdentityWithPrivacyMismatch_1.ts:4:5: 'x' was also declared here. + class Foo1 { + private n; + } + class Foo2 { + private n; + } + var y: Foo1; + var y: Foo2; + ~ +!!! error TS2403: Subsequent variable declarations must have the same type. Variable 'y' must be of type 'Foo1', but here has type 'Foo2'. +!!! related TS6203 propertyIdentityWithPrivacyMismatch_1.ts:12:5: 'y' was also declared here. +==== propertyIdentityWithPrivacyMismatch_0.ts (0 errors) ==== + declare module 'mod1' { + class Foo { + private n; + } + } + declare module 'mod2' { + class Foo { + private n; + } + } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.js b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.js new file mode 100644 index 0000000000..3053609d1f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.js @@ -0,0 +1,43 @@ +//// [tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts] //// + +//// [propertyIdentityWithPrivacyMismatch_0.ts] +declare module 'mod1' { + class Foo { + private n; + } +} +declare module 'mod2' { + class Foo { + private n; + } +} + +//// [propertyIdentityWithPrivacyMismatch_1.ts] +/// +import m1 = require('mod1'); +import m2 = require('mod2'); +var x: m1.Foo; +var x: m2.Foo; // Should be error (mod1.Foo !== mod2.Foo) +class Foo1 { + private n; +} +class Foo2 { + private n; +} +var y: Foo1; +var y: Foo2; + +//// [propertyIdentityWithPrivacyMismatch_0.js] +//// [propertyIdentityWithPrivacyMismatch_1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +var x; +var x; // Should be error (mod1.Foo !== mod2.Foo) +class Foo1 { + n; +} +class Foo2 { + n; +} +var y; +var y; diff --git a/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.js.diff b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.js.diff new file mode 100644 index 0000000000..46c3178dc3 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.js.diff @@ -0,0 +1,13 @@ +--- old.propertyIdentityWithPrivacyMismatch.js ++++ new.propertyIdentityWithPrivacyMismatch.js +@@= skipped -33, +33 lines =@@ + var x; + var x; // Should be error (mod1.Foo !== mod2.Foo) + class Foo1 { ++ n; + } + class Foo2 { ++ n; + } + var y; + var y; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.symbols b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.symbols new file mode 100644 index 0000000000..307638c665 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.symbols @@ -0,0 +1,62 @@ +//// [tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts] //// + +=== propertyIdentityWithPrivacyMismatch_1.ts === +/// +import m1 = require('mod1'); +>m1 : Symbol(m1, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 0, 0)) + +import m2 = require('mod2'); +>m2 : Symbol(m2, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 1, 28)) + +var x: m1.Foo; +>x : Symbol(x, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 3, 3), Decl(propertyIdentityWithPrivacyMismatch_1.ts, 4, 3)) +>m1 : Symbol(m1, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 0, 0)) +>Foo : Symbol(m1.Foo, Decl(propertyIdentityWithPrivacyMismatch_0.ts, 0, 23)) + +var x: m2.Foo; // Should be error (mod1.Foo !== mod2.Foo) +>x : Symbol(x, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 3, 3), Decl(propertyIdentityWithPrivacyMismatch_1.ts, 4, 3)) +>m2 : Symbol(m2, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 1, 28)) +>Foo : Symbol(m2.Foo, Decl(propertyIdentityWithPrivacyMismatch_0.ts, 5, 23)) + +class Foo1 { +>Foo1 : Symbol(Foo1, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 4, 14)) + + private n; +>n : Symbol(Foo1.n, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 5, 12)) +} +class Foo2 { +>Foo2 : Symbol(Foo2, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 7, 1)) + + private n; +>n : Symbol(Foo2.n, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 8, 12)) +} +var y: Foo1; +>y : Symbol(y, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 11, 3), Decl(propertyIdentityWithPrivacyMismatch_1.ts, 12, 3)) +>Foo1 : Symbol(Foo1, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 4, 14)) + +var y: Foo2; +>y : Symbol(y, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 11, 3), Decl(propertyIdentityWithPrivacyMismatch_1.ts, 12, 3)) +>Foo2 : Symbol(Foo2, Decl(propertyIdentityWithPrivacyMismatch_1.ts, 7, 1)) + +=== propertyIdentityWithPrivacyMismatch_0.ts === +declare module 'mod1' { +>'mod1' : Symbol("mod1", Decl(propertyIdentityWithPrivacyMismatch_0.ts, 0, 0)) + + class Foo { +>Foo : Symbol(Foo, Decl(propertyIdentityWithPrivacyMismatch_0.ts, 0, 23)) + + private n; +>n : Symbol(Foo.n, Decl(propertyIdentityWithPrivacyMismatch_0.ts, 1, 15)) + } +} +declare module 'mod2' { +>'mod2' : Symbol("mod2", Decl(propertyIdentityWithPrivacyMismatch_0.ts, 4, 1)) + + class Foo { +>Foo : Symbol(Foo, Decl(propertyIdentityWithPrivacyMismatch_0.ts, 5, 23)) + + private n; +>n : Symbol(Foo.n, Decl(propertyIdentityWithPrivacyMismatch_0.ts, 6, 15)) + } +} + diff --git a/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.types b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.types new file mode 100644 index 0000000000..601f58df5d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/propertyIdentityWithPrivacyMismatch.types @@ -0,0 +1,58 @@ +//// [tests/cases/compiler/propertyIdentityWithPrivacyMismatch.ts] //// + +=== propertyIdentityWithPrivacyMismatch_1.ts === +/// +import m1 = require('mod1'); +>m1 : typeof m1 + +import m2 = require('mod2'); +>m2 : typeof m2 + +var x: m1.Foo; +>x : m1.Foo +>m1 : any + +var x: m2.Foo; // Should be error (mod1.Foo !== mod2.Foo) +>x : m1.Foo +>m2 : any + +class Foo1 { +>Foo1 : Foo1 + + private n; +>n : any +} +class Foo2 { +>Foo2 : Foo2 + + private n; +>n : any +} +var y: Foo1; +>y : Foo1 + +var y: Foo2; +>y : Foo1 + +=== propertyIdentityWithPrivacyMismatch_0.ts === +declare module 'mod1' { +>'mod1' : typeof import("mod1") + + class Foo { +>Foo : Foo + + private n; +>n : any + } +} +declare module 'mod2' { +>'mod2' : typeof import("mod2") + + class Foo { +>Foo : Foo + + private n; +>n : any + } +} + diff --git a/testdata/baselines/reference/submodule/compiler/reactNamespaceImportPresevation.js b/testdata/baselines/reference/submodule/compiler/reactNamespaceImportPresevation.js index 8bb4b4f41a..04a7c867f5 100644 --- a/testdata/baselines/reference/submodule/compiler/reactNamespaceImportPresevation.js +++ b/testdata/baselines/reference/submodule/compiler/reactNamespaceImportPresevation.js @@ -15,6 +15,39 @@ declare var foo: any; //// [test.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const myReactLib = require("my-React-Lib"); // should not be elided +const myReactLib = __importStar(require("my-React-Lib")); // should not be elided ; diff --git a/testdata/baselines/reference/submodule/compiler/reactNamespaceImportPresevation.js.diff b/testdata/baselines/reference/submodule/compiler/reactNamespaceImportPresevation.js.diff index 776d5b8eac..d731b430e4 100644 --- a/testdata/baselines/reference/submodule/compiler/reactNamespaceImportPresevation.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reactNamespaceImportPresevation.js.diff @@ -1,9 +1,9 @@ --- old.reactNamespaceImportPresevation.js +++ new.reactNamespaceImportPresevation.js -@@= skipped -15, +15 lines =@@ - //// [test.jsx] - "use strict"; +@@= skipped -48, +48 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var myReactLib = require("my-React-Lib"); // should not be elided -+const myReactLib = require("my-React-Lib"); // should not be elided +-var myReactLib = __importStar(require("my-React-Lib")); // should not be elided ++const myReactLib = __importStar(require("my-React-Lib")); // should not be elided ; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reactReadonlyHOCAssignabilityReal.js b/testdata/baselines/reference/submodule/compiler/reactReadonlyHOCAssignabilityReal.js index 398c6067ee..8c22bda6f0 100644 --- a/testdata/baselines/reference/submodule/compiler/reactReadonlyHOCAssignabilityReal.js +++ b/testdata/baselines/reference/submodule/compiler/reactReadonlyHOCAssignabilityReal.js @@ -25,9 +25,42 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); function myHigherOrderComponent(Inner) { return class OuterComponent extends React.Component { render() { diff --git a/testdata/baselines/reference/submodule/compiler/reactReadonlyHOCAssignabilityReal.js.diff b/testdata/baselines/reference/submodule/compiler/reactReadonlyHOCAssignabilityReal.js.diff index ced1b236d8..e89557ca64 100644 --- a/testdata/baselines/reference/submodule/compiler/reactReadonlyHOCAssignabilityReal.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reactReadonlyHOCAssignabilityReal.js.diff @@ -1,11 +1,11 @@ --- old.reactReadonlyHOCAssignabilityReal.js +++ new.reactReadonlyHOCAssignabilityReal.js -@@= skipped -26, +26 lines =@@ - }; +@@= skipped -59, +59 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function myHigherOrderComponent(Inner) { return class OuterComponent extends React.Component { render() { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reactSFCAndFunctionResolvable.js b/testdata/baselines/reference/submodule/compiler/reactSFCAndFunctionResolvable.js index 366d48ac9a..ff6d8e7375 100644 --- a/testdata/baselines/reference/submodule/compiler/reactSFCAndFunctionResolvable.js +++ b/testdata/baselines/reference/submodule/compiler/reactSFCAndFunctionResolvable.js @@ -30,8 +30,41 @@ const RandomComponent: React.SFC = () => { //// [reactSFCAndFunctionResolvable.js] "use strict"; /// +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const React = require("react"); +const React = __importStar(require("react")); const RandomComponent = () => { const Component = condition1 ? Radio diff --git a/testdata/baselines/reference/submodule/compiler/reactSFCAndFunctionResolvable.js.diff b/testdata/baselines/reference/submodule/compiler/reactSFCAndFunctionResolvable.js.diff index 6d6fd84e25..5b9e54d964 100644 --- a/testdata/baselines/reference/submodule/compiler/reactSFCAndFunctionResolvable.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reactSFCAndFunctionResolvable.js.diff @@ -1,11 +1,11 @@ --- old.reactSFCAndFunctionResolvable.js +++ new.reactSFCAndFunctionResolvable.js -@@= skipped -30, +30 lines =@@ - "use strict"; - /// +@@= skipped -63, +63 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const RandomComponent = () => { const Component = condition1 ? Radio \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM.js b/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM.js index 07eb8f5ce7..273bd624d0 100644 --- a/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM.js +++ b/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM.js @@ -27,8 +27,41 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const React = require("react"); +const React = __importStar(require("react")); const classes = ""; const rest = {}; const children = []; diff --git a/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM.js.diff b/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM.js.diff index 95bdd6f6ec..b5ae67ef8e 100644 --- a/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM.js.diff @@ -1,11 +1,11 @@ --- old.reactTagNameComponentWithPropsNoOOM.js +++ new.reactTagNameComponentWithPropsNoOOM.js -@@= skipped -27, +27 lines =@@ - return __assign.apply(this, arguments); - }; +@@= skipped -60, +60 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const classes = ""; const rest = {}; const children = []; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM2.js b/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM2.js index f7ab3ffc65..cf42e0f0f0 100644 --- a/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM2.js +++ b/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM2.js @@ -27,8 +27,41 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const React = require("react"); +const React = __importStar(require("react")); const classes = ""; const rest = {}; const children = []; diff --git a/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM2.js.diff b/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM2.js.diff index ccc77b4289..9c224671ac 100644 --- a/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reactTagNameComponentWithPropsNoOOM2.js.diff @@ -1,11 +1,11 @@ --- old.reactTagNameComponentWithPropsNoOOM2.js +++ new.reactTagNameComponentWithPropsNoOOM2.js -@@= skipped -27, +27 lines =@@ - return __assign.apply(this, arguments); - }; +@@= skipped -60, +60 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const classes = ""; const rest = {}; const children = []; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.js b/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.js index 84e33dbff6..e9f66549cb 100644 --- a/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.js +++ b/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.js @@ -36,8 +36,11 @@ export default Form //// [index.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const react_emotion_1 = require("react-emotion"); +const react_emotion_1 = __importDefault(require("react-emotion")); const Form = (0, react_emotion_1.default)('div')({ color: "red" }); exports.default = Form; diff --git a/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.js.diff b/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.js.diff index 451a16d8c8..2ce025d9bf 100644 --- a/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reactTransitiveImportHasValidDeclaration.js.diff @@ -1,10 +1,10 @@ --- old.reactTransitiveImportHasValidDeclaration.js +++ new.reactTransitiveImportHasValidDeclaration.js -@@= skipped -36, +36 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -39, +39 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var react_emotion_1 = require("react-emotion"); -+const react_emotion_1 = require("react-emotion"); +-var react_emotion_1 = __importDefault(require("react-emotion")); ++const react_emotion_1 = __importDefault(require("react-emotion")); const Form = (0, react_emotion_1.default)('div')({ color: "red" }); exports.default = Form; diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.errors.txt b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.errors.txt new file mode 100644 index 0000000000..54f4c6840e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.errors.txt @@ -0,0 +1,23 @@ +recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts(2,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts(3,5): error TS2303: Circular definition of import alias 'self'. + + +==== recursiveExportAssignmentAndFindAliasedType1_moduleA.ts (0 errors) ==== + /// + import moduleC = require("moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB"); + export var b: ClassB; // This should result in type ClassB +==== recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts (2 errors) ==== + declare module "moduleC" { + import self = require("moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + } + +==== recursiveExportAssignmentAndFindAliasedType1_moduleB.ts (0 errors) ==== + class ClassB { } + export = ClassB; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.errors.txt.diff new file mode 100644 index 0000000000..3176798bca --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.errors.txt.diff @@ -0,0 +1,24 @@ +--- old.recursiveExportAssignmentAndFindAliasedType1.errors.txt ++++ new.recursiveExportAssignmentAndFindAliasedType1.errors.txt +@@= skipped -0, +0 lines =@@ + recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts(2,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts(3,5): error TS2303: Circular definition of import alias 'self'. + + + ==== recursiveExportAssignmentAndFindAliasedType1_moduleA.ts (0 errors) ==== +@@= skipped -5, +6 lines =@@ + import moduleC = require("moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB"); + export var b: ClassB; // This should result in type ClassB +-==== recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts (1 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts (2 errors) ==== + declare module "moduleC" { + import self = require("moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + !!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + } + + ==== recursiveExportAssignmentAndFindAliasedType1_moduleB.ts (0 errors) ==== \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.js b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.js new file mode 100644 index 0000000000..dd5d73bf8e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.js @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts] //// + +//// [recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts] +declare module "moduleC" { + import self = require("moduleC"); + export = self; +} + +//// [recursiveExportAssignmentAndFindAliasedType1_moduleB.ts] +class ClassB { } +export = ClassB; + +//// [recursiveExportAssignmentAndFindAliasedType1_moduleA.ts] +/// +import moduleC = require("moduleC"); +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB"); +export var b: ClassB; // This should result in type ClassB + +//// [recursiveExportAssignmentAndFindAliasedType1_moduleB.js] +"use strict"; +class ClassB { +} +module.exports = ClassB; +//// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.b = void 0; diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.symbols b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.symbols new file mode 100644 index 0000000000..39da715015 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.symbols @@ -0,0 +1,32 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType1_moduleA.ts === +/// +import moduleC = require("moduleC"); +>moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleA.ts, 0, 0)) + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB"); +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleA.ts, 1, 36)) + +export var b: ClassB; // This should result in type ClassB +>b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleA.ts, 3, 10)) +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleA.ts, 1, 36)) + +=== recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts === +declare module "moduleC" { +>"moduleC" : Symbol("moduleC", Decl(recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts, 0, 0)) + + import self = require("moduleC"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts, 0, 26)) + + export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts, 0, 26)) +} + +=== recursiveExportAssignmentAndFindAliasedType1_moduleB.ts === +class ClassB { } +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleB.ts, 0, 0)) + +export = ClassB; +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType1_moduleB.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.types b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.types new file mode 100644 index 0000000000..36005ae3a6 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType1.types @@ -0,0 +1,31 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType1.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType1_moduleA.ts === +/// +import moduleC = require("moduleC"); +>moduleC : any + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType1_moduleB"); +>ClassB : typeof ClassB + +export var b: ClassB; // This should result in type ClassB +>b : ClassB + +=== recursiveExportAssignmentAndFindAliasedType1_moduleDef.d.ts === +declare module "moduleC" { +>"moduleC" : typeof import("moduleC") + + import self = require("moduleC"); +>self : any + + export = self; +>self : any +} + +=== recursiveExportAssignmentAndFindAliasedType1_moduleB.ts === +class ClassB { } +>ClassB : ClassB + +export = ClassB; +>ClassB : ClassB + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.errors.txt b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.errors.txt new file mode 100644 index 0000000000..8366d3ed78 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.errors.txt @@ -0,0 +1,33 @@ +recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(2,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(3,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(6,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(7,5): error TS2303: Circular definition of import alias 'self'. + + +==== recursiveExportAssignmentAndFindAliasedType2_moduleA.ts (0 errors) ==== + /// + import moduleC = require("moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB"); + export var b: ClassB; // This should result in type ClassB +==== recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts (4 errors) ==== + declare module "moduleC" { + import self = require("moduleD"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + } + declare module "moduleD" { + import self = require("moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + } + +==== recursiveExportAssignmentAndFindAliasedType2_moduleB.ts (0 errors) ==== + class ClassB { } + export = ClassB; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.errors.txt.diff new file mode 100644 index 0000000000..a686e629a5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.errors.txt.diff @@ -0,0 +1,34 @@ +--- old.recursiveExportAssignmentAndFindAliasedType2.errors.txt ++++ new.recursiveExportAssignmentAndFindAliasedType2.errors.txt +@@= skipped -0, +0 lines =@@ + recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(2,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(3,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(6,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts(7,5): error TS2303: Circular definition of import alias 'self'. + + + ==== recursiveExportAssignmentAndFindAliasedType2_moduleA.ts (0 errors) ==== +@@= skipped -5, +8 lines =@@ + import moduleC = require("moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB"); + export var b: ClassB; // This should result in type ClassB +-==== recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts (1 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts (4 errors) ==== + declare module "moduleC" { + import self = require("moduleD"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + !!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + } + declare module "moduleD" { + import self = require("moduleC"); ++ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + } + + ==== recursiveExportAssignmentAndFindAliasedType2_moduleB.ts (0 errors) ==== \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.js b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.js new file mode 100644 index 0000000000..da82910967 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.js @@ -0,0 +1,31 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts] //// + +//// [recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts] +declare module "moduleC" { + import self = require("moduleD"); + export = self; +} +declare module "moduleD" { + import self = require("moduleC"); + export = self; +} + +//// [recursiveExportAssignmentAndFindAliasedType2_moduleB.ts] +class ClassB { } +export = ClassB; + +//// [recursiveExportAssignmentAndFindAliasedType2_moduleA.ts] +/// +import moduleC = require("moduleC"); +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB"); +export var b: ClassB; // This should result in type ClassB + +//// [recursiveExportAssignmentAndFindAliasedType2_moduleB.js] +"use strict"; +class ClassB { +} +module.exports = ClassB; +//// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.b = void 0; diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.symbols b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.symbols new file mode 100644 index 0000000000..54bd6aae65 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.symbols @@ -0,0 +1,41 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType2_moduleA.ts === +/// +import moduleC = require("moduleC"); +>moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleA.ts, 0, 0)) + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB"); +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleA.ts, 1, 36)) + +export var b: ClassB; // This should result in type ClassB +>b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleA.ts, 3, 10)) +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleA.ts, 1, 36)) + +=== recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts === +declare module "moduleC" { +>"moduleC" : Symbol("moduleC", Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 0, 0)) + + import self = require("moduleD"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 0, 26)) + + export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 0, 26)) +} +declare module "moduleD" { +>"moduleD" : Symbol("moduleD", Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 3, 1)) + + import self = require("moduleC"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 4, 26)) + + export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts, 4, 26)) +} + +=== recursiveExportAssignmentAndFindAliasedType2_moduleB.ts === +class ClassB { } +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleB.ts, 0, 0)) + +export = ClassB; +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType2_moduleB.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.types b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.types new file mode 100644 index 0000000000..a90db40780 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType2.types @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType2.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType2_moduleA.ts === +/// +import moduleC = require("moduleC"); +>moduleC : any + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType2_moduleB"); +>ClassB : typeof ClassB + +export var b: ClassB; // This should result in type ClassB +>b : ClassB + +=== recursiveExportAssignmentAndFindAliasedType2_moduleDef.d.ts === +declare module "moduleC" { +>"moduleC" : typeof import("moduleC") + + import self = require("moduleD"); +>self : any + + export = self; +>self : any +} +declare module "moduleD" { +>"moduleD" : typeof import("moduleD") + + import self = require("moduleC"); +>self : any + + export = self; +>self : any +} + +=== recursiveExportAssignmentAndFindAliasedType2_moduleB.ts === +class ClassB { } +>ClassB : ClassB + +export = ClassB; +>ClassB : ClassB + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.errors.txt b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.errors.txt new file mode 100644 index 0000000000..45e03abe17 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.errors.txt @@ -0,0 +1,43 @@ +recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(2,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(3,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(6,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(7,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(10,5): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(11,5): error TS2303: Circular definition of import alias 'self'. + + +==== recursiveExportAssignmentAndFindAliasedType3_moduleA.ts (0 errors) ==== + /// + import moduleC = require("moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB"); + export var b: ClassB; // This should result in type ClassB +==== recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts (6 errors) ==== + declare module "moduleC" { + import self = require("moduleD"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + } + declare module "moduleD" { + import self = require("moduleE"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + } + declare module "moduleE" { + import self = require("moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + } + +==== recursiveExportAssignmentAndFindAliasedType3_moduleB.ts (0 errors) ==== + class ClassB { } + export = ClassB; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.errors.txt.diff new file mode 100644 index 0000000000..c4ef8f002b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.errors.txt.diff @@ -0,0 +1,44 @@ +--- old.recursiveExportAssignmentAndFindAliasedType3.errors.txt ++++ new.recursiveExportAssignmentAndFindAliasedType3.errors.txt +@@= skipped -0, +0 lines =@@ + recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(2,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(3,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(6,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(7,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(10,5): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts(11,5): error TS2303: Circular definition of import alias 'self'. + + + ==== recursiveExportAssignmentAndFindAliasedType3_moduleA.ts (0 errors) ==== +@@= skipped -5, +10 lines =@@ + import moduleC = require("moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB"); + export var b: ClassB; // This should result in type ClassB +-==== recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts (1 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts (6 errors) ==== + declare module "moduleC" { + import self = require("moduleD"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + !!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + } + declare module "moduleD" { + import self = require("moduleE"); ++ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + } + declare module "moduleE" { + import self = require("moduleC"); ++ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + } + + ==== recursiveExportAssignmentAndFindAliasedType3_moduleB.ts (0 errors) ==== \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.js b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.js new file mode 100644 index 0000000000..97fd3d5538 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.js @@ -0,0 +1,35 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts] //// + +//// [recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts] +declare module "moduleC" { + import self = require("moduleD"); + export = self; +} +declare module "moduleD" { + import self = require("moduleE"); + export = self; +} +declare module "moduleE" { + import self = require("moduleC"); + export = self; +} + +//// [recursiveExportAssignmentAndFindAliasedType3_moduleB.ts] +class ClassB { } +export = ClassB; + +//// [recursiveExportAssignmentAndFindAliasedType3_moduleA.ts] +/// +import moduleC = require("moduleC"); +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB"); +export var b: ClassB; // This should result in type ClassB + +//// [recursiveExportAssignmentAndFindAliasedType3_moduleB.js] +"use strict"; +class ClassB { +} +module.exports = ClassB; +//// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.b = void 0; diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.symbols b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.symbols new file mode 100644 index 0000000000..9198693250 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.symbols @@ -0,0 +1,50 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType3_moduleA.ts === +/// +import moduleC = require("moduleC"); +>moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleA.ts, 0, 0)) + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB"); +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleA.ts, 1, 36)) + +export var b: ClassB; // This should result in type ClassB +>b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleA.ts, 3, 10)) +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleA.ts, 1, 36)) + +=== recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts === +declare module "moduleC" { +>"moduleC" : Symbol("moduleC", Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 0, 0)) + + import self = require("moduleD"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 0, 26)) + + export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 0, 26)) +} +declare module "moduleD" { +>"moduleD" : Symbol("moduleD", Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 3, 1)) + + import self = require("moduleE"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 4, 26)) + + export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 4, 26)) +} +declare module "moduleE" { +>"moduleE" : Symbol("moduleE", Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 7, 1)) + + import self = require("moduleC"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 8, 26)) + + export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts, 8, 26)) +} + +=== recursiveExportAssignmentAndFindAliasedType3_moduleB.ts === +class ClassB { } +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleB.ts, 0, 0)) + +export = ClassB; +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType3_moduleB.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.types b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.types new file mode 100644 index 0000000000..6372d180ee --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType3.types @@ -0,0 +1,49 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType3.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType3_moduleA.ts === +/// +import moduleC = require("moduleC"); +>moduleC : any + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType3_moduleB"); +>ClassB : typeof ClassB + +export var b: ClassB; // This should result in type ClassB +>b : ClassB + +=== recursiveExportAssignmentAndFindAliasedType3_moduleDef.d.ts === +declare module "moduleC" { +>"moduleC" : typeof import("moduleC") + + import self = require("moduleD"); +>self : any + + export = self; +>self : any +} +declare module "moduleD" { +>"moduleD" : typeof import("moduleD") + + import self = require("moduleE"); +>self : any + + export = self; +>self : any +} +declare module "moduleE" { +>"moduleE" : typeof import("moduleE") + + import self = require("moduleC"); +>self : any + + export = self; +>self : any +} + +=== recursiveExportAssignmentAndFindAliasedType3_moduleB.ts === +class ClassB { } +>ClassB : ClassB + +export = ClassB; +>ClassB : ClassB + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.errors.txt b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.errors.txt new file mode 100644 index 0000000000..27a0b13e2b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.errors.txt @@ -0,0 +1,20 @@ +recursiveExportAssignmentAndFindAliasedType4_moduleC.ts(1,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType4_moduleC.ts(2,1): error TS2303: Circular definition of import alias 'self'. + + +==== recursiveExportAssignmentAndFindAliasedType4_moduleA.ts (0 errors) ==== + import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB"); + export var b: ClassB; // This should result in type ClassB +==== recursiveExportAssignmentAndFindAliasedType4_moduleC.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + +==== recursiveExportAssignmentAndFindAliasedType4_moduleB.ts (0 errors) ==== + class ClassB { } + export = ClassB; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.errors.txt.diff new file mode 100644 index 0000000000..72fe0ce09a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.errors.txt.diff @@ -0,0 +1,22 @@ +--- old.recursiveExportAssignmentAndFindAliasedType4.errors.txt ++++ new.recursiveExportAssignmentAndFindAliasedType4.errors.txt +@@= skipped -0, +0 lines =@@ + recursiveExportAssignmentAndFindAliasedType4_moduleC.ts(1,1): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType4_moduleC.ts(2,1): error TS2303: Circular definition of import alias 'self'. + + + ==== recursiveExportAssignmentAndFindAliasedType4_moduleA.ts (0 errors) ==== + import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB"); + export var b: ClassB; // This should result in type ClassB +-==== recursiveExportAssignmentAndFindAliasedType4_moduleC.ts (1 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType4_moduleC.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + !!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + + ==== recursiveExportAssignmentAndFindAliasedType4_moduleB.ts (0 errors) ==== + class ClassB { } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.js b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.js new file mode 100644 index 0000000000..d71f2af0f1 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.js @@ -0,0 +1,28 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts] //// + +//// [recursiveExportAssignmentAndFindAliasedType4_moduleC.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); +export = self; + +//// [recursiveExportAssignmentAndFindAliasedType4_moduleB.ts] +class ClassB { } +export = ClassB; + +//// [recursiveExportAssignmentAndFindAliasedType4_moduleA.ts] +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB"); +export var b: ClassB; // This should result in type ClassB + +//// [recursiveExportAssignmentAndFindAliasedType4_moduleC.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); +module.exports = self; +//// [recursiveExportAssignmentAndFindAliasedType4_moduleB.js] +"use strict"; +class ClassB { +} +module.exports = ClassB; +//// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.b = void 0; diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.js.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.js.diff new file mode 100644 index 0000000000..fdee67c32e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.js.diff @@ -0,0 +1,11 @@ +--- old.recursiveExportAssignmentAndFindAliasedType4.js ++++ new.recursiveExportAssignmentAndFindAliasedType4.js +@@= skipped -14, +14 lines =@@ + + //// [recursiveExportAssignmentAndFindAliasedType4_moduleC.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); + module.exports = self; + //// [recursiveExportAssignmentAndFindAliasedType4_moduleB.js] + "use strict"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.symbols b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.symbols new file mode 100644 index 0000000000..be2c5d433a --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.symbols @@ -0,0 +1,27 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType4_moduleA.ts === +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); +>moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 0)) + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB"); +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 83)) + +export var b: ClassB; // This should result in type ClassB +>b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 2, 10)) +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleA.ts, 0, 83)) + +=== recursiveExportAssignmentAndFindAliasedType4_moduleC.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleC.ts, 0, 0)) + +export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleC.ts, 0, 0)) + +=== recursiveExportAssignmentAndFindAliasedType4_moduleB.ts === +class ClassB { } +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleB.ts, 0, 0)) + +export = ClassB; +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType4_moduleB.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.types b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.types new file mode 100644 index 0000000000..efeacd4c08 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType4.types @@ -0,0 +1,26 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType4.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType4_moduleA.ts === +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); +>moduleC : any + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType4_moduleB"); +>ClassB : typeof ClassB + +export var b: ClassB; // This should result in type ClassB +>b : ClassB + +=== recursiveExportAssignmentAndFindAliasedType4_moduleC.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType4_moduleC"); +>self : any + +export = self; +>self : any + +=== recursiveExportAssignmentAndFindAliasedType4_moduleB.ts === +class ClassB { } +>ClassB : ClassB + +export = ClassB; +>ClassB : ClassB + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.errors.txt b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.errors.txt new file mode 100644 index 0000000000..5920c89151 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.errors.txt @@ -0,0 +1,30 @@ +recursiveExportAssignmentAndFindAliasedType5_moduleC.ts(1,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType5_moduleC.ts(2,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType5_moduleD.ts(1,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType5_moduleD.ts(2,1): error TS2303: Circular definition of import alias 'self'. + + +==== recursiveExportAssignmentAndFindAliasedType5_moduleA.ts (0 errors) ==== + import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB"); + export var b: ClassB; // This should result in type ClassB +==== recursiveExportAssignmentAndFindAliasedType5_moduleC.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + +==== recursiveExportAssignmentAndFindAliasedType5_moduleD.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + +==== recursiveExportAssignmentAndFindAliasedType5_moduleB.ts (0 errors) ==== + class ClassB { } + export = ClassB; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.errors.txt.diff new file mode 100644 index 0000000000..688a30932e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.errors.txt.diff @@ -0,0 +1,33 @@ +--- old.recursiveExportAssignmentAndFindAliasedType5.errors.txt ++++ new.recursiveExportAssignmentAndFindAliasedType5.errors.txt +@@= skipped -0, +0 lines =@@ ++recursiveExportAssignmentAndFindAliasedType5_moduleC.ts(1,1): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType5_moduleC.ts(2,1): error TS2303: Circular definition of import alias 'self'. + recursiveExportAssignmentAndFindAliasedType5_moduleD.ts(1,1): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType5_moduleD.ts(2,1): error TS2303: Circular definition of import alias 'self'. + + + ==== recursiveExportAssignmentAndFindAliasedType5_moduleA.ts (0 errors) ==== + import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB"); + export var b: ClassB; // This should result in type ClassB +-==== recursiveExportAssignmentAndFindAliasedType5_moduleC.ts (0 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType5_moduleC.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD"); ++ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + +-==== recursiveExportAssignmentAndFindAliasedType5_moduleD.ts (1 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType5_moduleD.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + !!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + + ==== recursiveExportAssignmentAndFindAliasedType5_moduleB.ts (0 errors) ==== + class ClassB { } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.js b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.js new file mode 100644 index 0000000000..c910426875 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.js @@ -0,0 +1,36 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts] //// + +//// [recursiveExportAssignmentAndFindAliasedType5_moduleC.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD"); +export = self; + +//// [recursiveExportAssignmentAndFindAliasedType5_moduleD.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); +export = self; + +//// [recursiveExportAssignmentAndFindAliasedType5_moduleB.ts] +class ClassB { } +export = ClassB; + +//// [recursiveExportAssignmentAndFindAliasedType5_moduleA.ts] +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB"); +export var b: ClassB; // This should result in type ClassB + +//// [recursiveExportAssignmentAndFindAliasedType5_moduleD.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); +module.exports = self; +//// [recursiveExportAssignmentAndFindAliasedType5_moduleC.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD"); +module.exports = self; +//// [recursiveExportAssignmentAndFindAliasedType5_moduleB.js] +"use strict"; +class ClassB { +} +module.exports = ClassB; +//// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.b = void 0; diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.js.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.js.diff new file mode 100644 index 0000000000..b73424c230 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.js.diff @@ -0,0 +1,16 @@ +--- old.recursiveExportAssignmentAndFindAliasedType5.js ++++ new.recursiveExportAssignmentAndFindAliasedType5.js +@@= skipped -18, +18 lines =@@ + + //// [recursiveExportAssignmentAndFindAliasedType5_moduleD.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); + module.exports = self; + //// [recursiveExportAssignmentAndFindAliasedType5_moduleC.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD"); + module.exports = self; + //// [recursiveExportAssignmentAndFindAliasedType5_moduleB.js] + "use strict"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.symbols b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.symbols new file mode 100644 index 0000000000..45145f3995 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.symbols @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType5_moduleA.ts === +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); +>moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 0)) + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB"); +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 83)) + +export var b: ClassB; // This should result in type ClassB +>b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 2, 10)) +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleA.ts, 0, 83)) + +=== recursiveExportAssignmentAndFindAliasedType5_moduleC.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleC.ts, 0, 0)) + +export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleC.ts, 0, 0)) + +=== recursiveExportAssignmentAndFindAliasedType5_moduleD.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleD.ts, 0, 0)) + +export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleD.ts, 0, 0)) + +=== recursiveExportAssignmentAndFindAliasedType5_moduleB.ts === +class ClassB { } +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleB.ts, 0, 0)) + +export = ClassB; +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType5_moduleB.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.types b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.types new file mode 100644 index 0000000000..245a557d13 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType5.types @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType5.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType5_moduleA.ts === +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); +>moduleC : any + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType5_moduleB"); +>ClassB : typeof ClassB + +export var b: ClassB; // This should result in type ClassB +>b : ClassB + +=== recursiveExportAssignmentAndFindAliasedType5_moduleC.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleD"); +>self : any + +export = self; +>self : any + +=== recursiveExportAssignmentAndFindAliasedType5_moduleD.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType5_moduleC"); +>self : any + +export = self; +>self : any + +=== recursiveExportAssignmentAndFindAliasedType5_moduleB.ts === +class ClassB { } +>ClassB : ClassB + +export = ClassB; +>ClassB : ClassB + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.errors.txt b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.errors.txt new file mode 100644 index 0000000000..431089345f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.errors.txt @@ -0,0 +1,40 @@ +recursiveExportAssignmentAndFindAliasedType6_moduleC.ts(1,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType6_moduleC.ts(2,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType6_moduleD.ts(1,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType6_moduleD.ts(2,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType6_moduleE.ts(1,1): error TS2303: Circular definition of import alias 'self'. +recursiveExportAssignmentAndFindAliasedType6_moduleE.ts(2,1): error TS2303: Circular definition of import alias 'self'. + + +==== recursiveExportAssignmentAndFindAliasedType6_moduleA.ts (0 errors) ==== + import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB"); + export var b: ClassB; // This should result in type ClassB +==== recursiveExportAssignmentAndFindAliasedType6_moduleC.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + +==== recursiveExportAssignmentAndFindAliasedType6_moduleD.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + +==== recursiveExportAssignmentAndFindAliasedType6_moduleE.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + export = self; + ~~~~~~~~~~~~~~ +!!! error TS2303: Circular definition of import alias 'self'. + +==== recursiveExportAssignmentAndFindAliasedType6_moduleB.ts (0 errors) ==== + class ClassB { } + export = ClassB; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.errors.txt.diff new file mode 100644 index 0000000000..e6311ffd5f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.errors.txt.diff @@ -0,0 +1,44 @@ +--- old.recursiveExportAssignmentAndFindAliasedType6.errors.txt ++++ new.recursiveExportAssignmentAndFindAliasedType6.errors.txt +@@= skipped -0, +0 lines =@@ ++recursiveExportAssignmentAndFindAliasedType6_moduleC.ts(1,1): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType6_moduleC.ts(2,1): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType6_moduleD.ts(1,1): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType6_moduleD.ts(2,1): error TS2303: Circular definition of import alias 'self'. + recursiveExportAssignmentAndFindAliasedType6_moduleE.ts(1,1): error TS2303: Circular definition of import alias 'self'. ++recursiveExportAssignmentAndFindAliasedType6_moduleE.ts(2,1): error TS2303: Circular definition of import alias 'self'. + + + ==== recursiveExportAssignmentAndFindAliasedType6_moduleA.ts (0 errors) ==== + import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); + import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB"); + export var b: ClassB; // This should result in type ClassB +-==== recursiveExportAssignmentAndFindAliasedType6_moduleC.ts (0 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType6_moduleC.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD"); ++ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + +-==== recursiveExportAssignmentAndFindAliasedType6_moduleD.ts (0 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType6_moduleD.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE"); ++ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + +-==== recursiveExportAssignmentAndFindAliasedType6_moduleE.ts (1 errors) ==== ++==== recursiveExportAssignmentAndFindAliasedType6_moduleE.ts (2 errors) ==== + import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + !!! error TS2303: Circular definition of import alias 'self'. + export = self; ++ ~~~~~~~~~~~~~~ ++!!! error TS2303: Circular definition of import alias 'self'. + + ==== recursiveExportAssignmentAndFindAliasedType6_moduleB.ts (0 errors) ==== + class ClassB { } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.js b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.js new file mode 100644 index 0000000000..ee08185a0c --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.js @@ -0,0 +1,44 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts] //// + +//// [recursiveExportAssignmentAndFindAliasedType6_moduleC.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD"); +export = self; + +//// [recursiveExportAssignmentAndFindAliasedType6_moduleD.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE"); +export = self; + +//// [recursiveExportAssignmentAndFindAliasedType6_moduleE.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); +export = self; + +//// [recursiveExportAssignmentAndFindAliasedType6_moduleB.ts] +class ClassB { } +export = ClassB; + +//// [recursiveExportAssignmentAndFindAliasedType6_moduleA.ts] +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB"); +export var b: ClassB; // This should result in type ClassB + +//// [recursiveExportAssignmentAndFindAliasedType6_moduleE.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); +module.exports = self; +//// [recursiveExportAssignmentAndFindAliasedType6_moduleD.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE"); +module.exports = self; +//// [recursiveExportAssignmentAndFindAliasedType6_moduleC.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD"); +module.exports = self; +//// [recursiveExportAssignmentAndFindAliasedType6_moduleB.js] +"use strict"; +class ClassB { +} +module.exports = ClassB; +//// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.b = void 0; diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.js.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.js.diff new file mode 100644 index 0000000000..b8f781b0a0 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.js.diff @@ -0,0 +1,21 @@ +--- old.recursiveExportAssignmentAndFindAliasedType6.js ++++ new.recursiveExportAssignmentAndFindAliasedType6.js +@@= skipped -22, +22 lines =@@ + + //// [recursiveExportAssignmentAndFindAliasedType6_moduleE.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); + module.exports = self; + //// [recursiveExportAssignmentAndFindAliasedType6_moduleD.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE"); + module.exports = self; + //// [recursiveExportAssignmentAndFindAliasedType6_moduleC.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD"); + module.exports = self; + //// [recursiveExportAssignmentAndFindAliasedType6_moduleB.js] + "use strict"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.symbols b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.symbols new file mode 100644 index 0000000000..55f08c9021 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.symbols @@ -0,0 +1,41 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType6_moduleA.ts === +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); +>moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 0)) + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB"); +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 83)) + +export var b: ClassB; // This should result in type ClassB +>b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 2, 10)) +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleA.ts, 0, 83)) + +=== recursiveExportAssignmentAndFindAliasedType6_moduleC.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleC.ts, 0, 0)) + +export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleC.ts, 0, 0)) + +=== recursiveExportAssignmentAndFindAliasedType6_moduleD.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleD.ts, 0, 0)) + +export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleD.ts, 0, 0)) + +=== recursiveExportAssignmentAndFindAliasedType6_moduleE.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleE.ts, 0, 0)) + +export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleE.ts, 0, 0)) + +=== recursiveExportAssignmentAndFindAliasedType6_moduleB.ts === +class ClassB { } +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleB.ts, 0, 0)) + +export = ClassB; +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType6_moduleB.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.types b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.types new file mode 100644 index 0000000000..4127407217 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType6.types @@ -0,0 +1,40 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType6.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType6_moduleA.ts === +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); +>moduleC : any + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType6_moduleB"); +>ClassB : typeof ClassB + +export var b: ClassB; // This should result in type ClassB +>b : ClassB + +=== recursiveExportAssignmentAndFindAliasedType6_moduleC.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleD"); +>self : any + +export = self; +>self : any + +=== recursiveExportAssignmentAndFindAliasedType6_moduleD.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleE"); +>self : any + +export = self; +>self : any + +=== recursiveExportAssignmentAndFindAliasedType6_moduleE.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType6_moduleC"); +>self : any + +export = self; +>self : any + +=== recursiveExportAssignmentAndFindAliasedType6_moduleB.ts === +class ClassB { } +>ClassB : ClassB + +export = ClassB; +>ClassB : ClassB + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.js b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.js new file mode 100644 index 0000000000..e98e380bb5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.js @@ -0,0 +1,46 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts] //// + +//// [recursiveExportAssignmentAndFindAliasedType7_moduleC.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD"); +var selfVar = self; +export = selfVar; + +//// [recursiveExportAssignmentAndFindAliasedType7_moduleD.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE"); +export = self; + +//// [recursiveExportAssignmentAndFindAliasedType7_moduleE.ts] +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); +export = self; + +//// [recursiveExportAssignmentAndFindAliasedType7_moduleB.ts] +class ClassB { } +export = ClassB; + +//// [recursiveExportAssignmentAndFindAliasedType7_moduleA.ts] +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType7_moduleB"); +export var b: ClassB; // This should result in type ClassB + +//// [recursiveExportAssignmentAndFindAliasedType7_moduleE.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); +module.exports = self; +//// [recursiveExportAssignmentAndFindAliasedType7_moduleD.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE"); +module.exports = self; +//// [recursiveExportAssignmentAndFindAliasedType7_moduleC.js] +"use strict"; +const self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD"); +var selfVar = self; +module.exports = selfVar; +//// [recursiveExportAssignmentAndFindAliasedType7_moduleB.js] +"use strict"; +class ClassB { +} +module.exports = ClassB; +//// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.b = void 0; diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.js.diff b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.js.diff new file mode 100644 index 0000000000..e1ed8ec84e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.js.diff @@ -0,0 +1,21 @@ +--- old.recursiveExportAssignmentAndFindAliasedType7.js ++++ new.recursiveExportAssignmentAndFindAliasedType7.js +@@= skipped -23, +23 lines =@@ + + //// [recursiveExportAssignmentAndFindAliasedType7_moduleE.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); + module.exports = self; + //// [recursiveExportAssignmentAndFindAliasedType7_moduleD.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE"); + module.exports = self; + //// [recursiveExportAssignmentAndFindAliasedType7_moduleC.js] + "use strict"; +-var self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD"); ++const self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD"); + var selfVar = self; + module.exports = selfVar; + //// [recursiveExportAssignmentAndFindAliasedType7_moduleB.js] \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.symbols b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.symbols new file mode 100644 index 0000000000..e9095b64c9 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.symbols @@ -0,0 +1,45 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType7_moduleA.ts === +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); +>moduleC : Symbol(moduleC, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 0)) + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType7_moduleB"); +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 83)) + +export var b: ClassB; // This should result in type ClassB +>b : Symbol(b, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 2, 10)) +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleA.ts, 0, 83)) + +=== recursiveExportAssignmentAndFindAliasedType7_moduleC.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleC.ts, 0, 0)) + +var selfVar = self; +>selfVar : Symbol(selfVar, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleC.ts, 1, 3)) +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleC.ts, 0, 0)) + +export = selfVar; +>selfVar : Symbol(selfVar, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleC.ts, 1, 3)) + +=== recursiveExportAssignmentAndFindAliasedType7_moduleD.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleD.ts, 0, 0)) + +export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleD.ts, 0, 0)) + +=== recursiveExportAssignmentAndFindAliasedType7_moduleE.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleE.ts, 0, 0)) + +export = self; +>self : Symbol(self, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleE.ts, 0, 0)) + +=== recursiveExportAssignmentAndFindAliasedType7_moduleB.ts === +class ClassB { } +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleB.ts, 0, 0)) + +export = ClassB; +>ClassB : Symbol(ClassB, Decl(recursiveExportAssignmentAndFindAliasedType7_moduleB.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.types b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.types new file mode 100644 index 0000000000..5ae57520bb --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/recursiveExportAssignmentAndFindAliasedType7.types @@ -0,0 +1,44 @@ +//// [tests/cases/compiler/recursiveExportAssignmentAndFindAliasedType7.ts] //// + +=== recursiveExportAssignmentAndFindAliasedType7_moduleA.ts === +import moduleC = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); +>moduleC : any + +import ClassB = require("./recursiveExportAssignmentAndFindAliasedType7_moduleB"); +>ClassB : typeof ClassB + +export var b: ClassB; // This should result in type ClassB +>b : ClassB + +=== recursiveExportAssignmentAndFindAliasedType7_moduleC.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleD"); +>self : any + +var selfVar = self; +>selfVar : any +>self : any + +export = selfVar; +>selfVar : any + +=== recursiveExportAssignmentAndFindAliasedType7_moduleD.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleE"); +>self : any + +export = self; +>self : any + +=== recursiveExportAssignmentAndFindAliasedType7_moduleE.ts === +import self = require("./recursiveExportAssignmentAndFindAliasedType7_moduleC"); +>self : any + +export = self; +>self : any + +=== recursiveExportAssignmentAndFindAliasedType7_moduleB.ts === +class ClassB { } +>ClassB : ClassB + +export = ClassB; +>ClassB : ClassB + diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.js b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.js index d8c5df7475..eeb1843da4 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.js +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.js @@ -14,9 +14,12 @@ exports.b = void 0; exports.b = null; //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = exports.b = void 0; const b_1 = require("./b"); Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); const b_2 = require("./b"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } }); +Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.js.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.js.diff index 13d23aeb8a..3c2ca96322 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault.js.diff @@ -1,7 +1,7 @@ --- old.reexportMissingDefault.js +++ new.reexportMissingDefault.js -@@= skipped -15, +15 lines =@@ - "use strict"; +@@= skipped -18, +18 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = exports.b = void 0; -var b_1 = require("./b"); @@ -9,4 +9,4 @@ Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); -var b_2 = require("./b"); +const b_2 = require("./b"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } }); \ No newline at end of file + Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.js b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.js index 4596eb2b92..50c3bc4ec2 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.js +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.js @@ -14,9 +14,12 @@ exports.b = void 0; exports.b = null; //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = exports.b = void 0; const b_1 = require("./b"); Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); const b_2 = require("./b"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } }); +Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.js.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.js.diff index af6a54130b..d799ddcaf3 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault2.js.diff @@ -1,7 +1,7 @@ --- old.reexportMissingDefault2.js +++ new.reexportMissingDefault2.js -@@= skipped -15, +15 lines =@@ - "use strict"; +@@= skipped -18, +18 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = exports.b = void 0; -var b_1 = require("./b"); @@ -9,4 +9,4 @@ Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); -var b_2 = require("./b"); +const b_2 = require("./b"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } }); \ No newline at end of file + Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.js b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.js index af97ed84bf..02b0c77c6a 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.js +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.js @@ -14,9 +14,12 @@ exports.b = void 0; exports.b = null; //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = exports.b = void 0; const b_1 = require("./b"); Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); const b_2 = require("./b"); -Object.defineProperty(exports, "a", { enumerable: true, get: function () { return b_2.default; } }); +Object.defineProperty(exports, "a", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.js.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.js.diff index bee0f9c010..ab0ae7ccdb 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault3.js.diff @@ -1,7 +1,7 @@ --- old.reexportMissingDefault3.js +++ new.reexportMissingDefault3.js -@@= skipped -15, +15 lines =@@ - "use strict"; +@@= skipped -18, +18 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = exports.b = void 0; -var b_1 = require("./b"); @@ -9,4 +9,4 @@ Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); -var b_2 = require("./b"); +const b_2 = require("./b"); - Object.defineProperty(exports, "a", { enumerable: true, get: function () { return b_2.default; } }); \ No newline at end of file + Object.defineProperty(exports, "a", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.js b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.js index 9c0661aeb4..e0904b28a0 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.js +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.js @@ -10,9 +10,12 @@ export { default } from "./b"; //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = exports.b = void 0; const b_1 = require("./b"); Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); const b_2 = require("./b"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } }); +Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.js.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.js.diff index b887685474..b423665146 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault4.js.diff @@ -1,7 +1,7 @@ --- old.reexportMissingDefault4.js +++ new.reexportMissingDefault4.js -@@= skipped -11, +11 lines =@@ - "use strict"; +@@= skipped -14, +14 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = exports.b = void 0; -var b_1 = require("./b"); @@ -9,4 +9,4 @@ Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); -var b_2 = require("./b"); +const b_2 = require("./b"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } }); \ No newline at end of file + Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.js b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.js index 9ff07b1c74..f778c22f6f 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.js +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.js @@ -14,9 +14,12 @@ exports.b = void 0; exports.b = null; //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = exports.b = void 0; const b_1 = require("./b"); Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); const b_2 = require("./b"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } }); +Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); diff --git a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.js.diff b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.js.diff index 606630a091..fdf3a34e67 100644 --- a/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.js.diff +++ b/testdata/baselines/reference/submodule/compiler/reexportMissingDefault6.js.diff @@ -1,7 +1,7 @@ --- old.reexportMissingDefault6.js +++ new.reexportMissingDefault6.js -@@= skipped -15, +15 lines =@@ - "use strict"; +@@= skipped -18, +18 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = exports.b = void 0; -var b_1 = require("./b"); @@ -9,4 +9,4 @@ Object.defineProperty(exports, "b", { enumerable: true, get: function () { return b_1.b; } }); -var b_2 = require("./b"); +const b_2 = require("./b"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { return b_2.default; } }); \ No newline at end of file + Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(b_2).default; } }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/requireAsFunctionInExternalModule.js b/testdata/baselines/reference/submodule/compiler/requireAsFunctionInExternalModule.js index 268febfd36..142b96dc67 100644 --- a/testdata/baselines/reference/submodule/compiler/requireAsFunctionInExternalModule.js +++ b/testdata/baselines/reference/submodule/compiler/requireAsFunctionInExternalModule.js @@ -25,9 +25,42 @@ function require(a) { } function has(a) { return true; } //// [m.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.hello = hello; -const c_1 = require("./c"); +const c_1 = __importStar(require("./c")); function hello() { } if ((0, c_1.has)('ember-debug')) { (0, c_1.default)('ember-debug'); diff --git a/testdata/baselines/reference/submodule/compiler/requireAsFunctionInExternalModule.js.diff b/testdata/baselines/reference/submodule/compiler/requireAsFunctionInExternalModule.js.diff index 93d1ef728f..2d51aecbe8 100644 --- a/testdata/baselines/reference/submodule/compiler/requireAsFunctionInExternalModule.js.diff +++ b/testdata/baselines/reference/submodule/compiler/requireAsFunctionInExternalModule.js.diff @@ -1,11 +1,11 @@ --- old.requireAsFunctionInExternalModule.js +++ new.requireAsFunctionInExternalModule.js -@@= skipped -26, +26 lines =@@ - "use strict"; +@@= skipped -59, +59 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.hello = hello; --var c_1 = require("./c"); -+const c_1 = require("./c"); +-var c_1 = __importStar(require("./c")); ++const c_1 = __importStar(require("./c")); function hello() { } if ((0, c_1.has)('ember-debug')) { (0, c_1.default)('ember-debug'); diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithModuleEmitNone.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithModuleEmitNone.errors.txt.diff index 199bdfdb7c..8d2d9a075c 100644 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithModuleEmitNone.errors.txt.diff +++ b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithModuleEmitNone.errors.txt.diff @@ -2,10 +2,12 @@ +++ new.requireOfJsonFileWithModuleEmitNone.errors.txt @@= skipped -0, +0 lines =@@ -error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'. +-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -file1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'. - - -!!! error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'. +-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -==== file1.ts (1 errors) ==== - import * as b from './b.json'; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt.diff index ced70dff4b..65a0d5622f 100644 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt.diff +++ b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt.diff @@ -3,11 +3,13 @@ @@= skipped -0, +0 lines =@@ -error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'. -error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later. +-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -file1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'. - - -!!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'. -!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later. +-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -==== file1.ts (1 errors) ==== - import * as b from './b.json'; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt deleted file mode 100644 index 9d76c9120c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt +++ /dev/null @@ -1,34 +0,0 @@ -/a.ts(1,20): error TS2732: Cannot find module 'foo/bar/foobar.json'. Consider using '--resolveJsonModule' to import module with '.json' extension. -/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -/tsconfig.json(5,19): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -/tsconfig.json(5,37): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== /tsconfig.json (3 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": ["node_modules/*", "src/types"] - ~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - ~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /a.ts (1 errors) ==== - import foobar from "foo/bar/foobar.json"; - ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2732: Cannot find module 'foo/bar/foobar.json'. Consider using '--resolveJsonModule' to import module with '.json' extension. - -==== /node_modules/foo/bar/foobar.json (0 errors) ==== - { "a": 10 } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.js b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.js deleted file mode 100644 index 93cfba254a..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.js +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.ts] //// - -//// [foobar.json] -{ "a": 10 } - -//// [a.ts] -import foobar from "foo/bar/foobar.json"; - - -//// [/bin/a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.symbols b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.symbols deleted file mode 100644 index 74f2e4cd7d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.symbols +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.ts] //// - -=== /a.ts === -import foobar from "foo/bar/foobar.json"; ->foobar : Symbol(foobar, Decl(a.ts, 0, 6)) - diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.trace.json b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.trace.json deleted file mode 100644 index 0767776327..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.trace.json +++ /dev/null @@ -1,34 +0,0 @@ -======== Resolving module 'foo/bar/foobar.json' from '/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'foo/bar/foobar.json'. -Module name 'foo/bar/foobar.json', matched pattern '*'. -Trying substitution 'node_modules/*', candidate module location: 'node_modules/foo/bar/foobar.json'. -Loading module as file / folder, candidate module location '/node_modules/foo/bar/foobar.json', target file types: TypeScript, JavaScript, Declaration. -File name '/node_modules/foo/bar/foobar.json' has a '.json' extension - stripping it. -File '/node_modules/foo/bar/foobar.d.json.ts' does not exist. -File '/node_modules/foo/bar/foobar.json.ts' does not exist. -File '/node_modules/foo/bar/foobar.json.tsx' does not exist. -File '/node_modules/foo/bar/foobar.json.d.ts' does not exist. -File '/node_modules/foo/bar/foobar.json.js' does not exist. -File '/node_modules/foo/bar/foobar.json.jsx' does not exist. -Directory '/node_modules/foo/bar/foobar.json' does not exist, skipping all lookups in it. -Trying substitution 'src/types', candidate module location: 'src/types'. -Loading module as file / folder, candidate module location '/src/types', target file types: TypeScript, JavaScript, Declaration. -File '/package.json' does not exist. -Loading module 'foo/bar/foobar.json' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -File '/node_modules/foo/package.json' does not exist. -File name '/node_modules/foo/bar/foobar.json' has a '.json' extension - stripping it. -File '/node_modules/foo/bar/foobar.d.json.ts' does not exist according to earlier cached lookups. -File '/node_modules/foo/bar/foobar.json.ts' does not exist according to earlier cached lookups. -File '/node_modules/foo/bar/foobar.json.tsx' does not exist according to earlier cached lookups. -File '/node_modules/foo/bar/foobar.json.d.ts' does not exist according to earlier cached lookups. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -File name '/node_modules/@types/foo/bar/foobar.json' has a '.json' extension - stripping it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript. -File '/node_modules/foo/package.json' does not exist according to earlier cached lookups. -File name '/node_modules/foo/bar/foobar.json' has a '.json' extension - stripping it. -File '/node_modules/foo/bar/foobar.json.js' does not exist according to earlier cached lookups. -File '/node_modules/foo/bar/foobar.json.jsx' does not exist according to earlier cached lookups. -======== Module name 'foo/bar/foobar.json' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.types b/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.types deleted file mode 100644 index 65462e500d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.types +++ /dev/null @@ -1,6 +0,0 @@ -//// [tests/cases/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.ts] //// - -=== /a.ts === -import foobar from "foo/bar/foobar.json"; ->foobar : any - diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.errors.txt b/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.errors.txt deleted file mode 100644 index 7c9d28533e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.errors.txt +++ /dev/null @@ -1,31 +0,0 @@ -/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. - Use '"paths": {"*": ["./*"]}' instead. -/tsconfig.json(5,19): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -/tsconfig.json(5,37): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - - -==== /tsconfig.json (3 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", - ~~~~~~~~~ -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": ["node_modules/*", "src/types"] - ~~~~~~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - ~~~~~~~~~~~ -!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - }, - "allowJs": true, - "outDir": "bin" - } - } - -==== /a.ts (0 errors) ==== - import foobar from "foo/bar/foobar.json"; - -==== /node_modules/foo/bar/foobar.json (0 errors) ==== - { "a": 10 } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.js b/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.js deleted file mode 100644 index 88eb73fa87..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.js +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/requireOfJsonFile_PathMapping.ts] //// - -//// [foobar.json] -{ "a": 10 } - -//// [a.ts] -import foobar from "foo/bar/foobar.json"; - - -//// [/bin/a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.symbols b/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.symbols deleted file mode 100644 index 2aa0a38360..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/compiler/requireOfJsonFile_PathMapping.ts] //// - -=== /a.ts === -import foobar from "foo/bar/foobar.json"; ->foobar : Symbol(foobar, Decl(a.ts, 0, 6)) - -=== /node_modules/foo/bar/foobar.json === -{ "a": 10 } ->"a" : Symbol("a", Decl(foobar.json, 0, 1)) - diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.trace.json b/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.trace.json deleted file mode 100644 index 1c02ac1083..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.trace.json +++ /dev/null @@ -1,13 +0,0 @@ -======== Resolving module 'foo/bar/foobar.json' from '/a.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -'paths' option is specified, looking for a pattern to match module name 'foo/bar/foobar.json'. -Module name 'foo/bar/foobar.json', matched pattern '*'. -Trying substitution 'node_modules/*', candidate module location: 'node_modules/foo/bar/foobar.json'. -Loading module as file / folder, candidate module location '/node_modules/foo/bar/foobar.json', target file types: TypeScript, JavaScript, Declaration, JSON. -File name '/node_modules/foo/bar/foobar.json' has a '.json' extension - stripping it. -File '/node_modules/foo/bar/foobar.d.json.ts' does not exist. -File '/node_modules/foo/bar/foobar.json' exists - use it as a name resolution result. -File '/node_modules/foo/package.json' does not exist. -Resolving real path for '/node_modules/foo/bar/foobar.json', result '/node_modules/foo/bar/foobar.json'. -======== Module name 'foo/bar/foobar.json' was successfully resolved to '/node_modules/foo/bar/foobar.json'. ======== diff --git a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.types b/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.types deleted file mode 100644 index 93b10048df..0000000000 --- a/testdata/baselines/reference/submodule/compiler/requireOfJsonFile_PathMapping.types +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/compiler/requireOfJsonFile_PathMapping.ts] //// - -=== /a.ts === -import foobar from "foo/bar/foobar.json"; ->foobar : { a: number; } - -=== /node_modules/foo/bar/foobar.json === -{ "a": 10 } ->{ "a": 10 } : { a: number; } ->"a" : number ->10 : 10 - diff --git a/testdata/baselines/reference/submodule/compiler/returnTypePredicateIsInstantiateInContextOfTarget.js b/testdata/baselines/reference/submodule/compiler/returnTypePredicateIsInstantiateInContextOfTarget.js index 9aa3fb3d00..523f5e1949 100644 --- a/testdata/baselines/reference/submodule/compiler/returnTypePredicateIsInstantiateInContextOfTarget.js +++ b/testdata/baselines/reference/submodule/compiler/returnTypePredicateIsInstantiateInContextOfTarget.js @@ -18,9 +18,42 @@ const TestRender = () => ; //// [returnTypePredicateIsInstantiateInContextOfTarget.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); class TestComponent extends React.Component { static defaultProps = { isAny: TestComponent.isAny diff --git a/testdata/baselines/reference/submodule/compiler/returnTypePredicateIsInstantiateInContextOfTarget.js.diff b/testdata/baselines/reference/submodule/compiler/returnTypePredicateIsInstantiateInContextOfTarget.js.diff index f3efdc8b6f..9f21aac6f4 100644 --- a/testdata/baselines/reference/submodule/compiler/returnTypePredicateIsInstantiateInContextOfTarget.js.diff +++ b/testdata/baselines/reference/submodule/compiler/returnTypePredicateIsInstantiateInContextOfTarget.js.diff @@ -1,10 +1,10 @@ --- old.returnTypePredicateIsInstantiateInContextOfTarget.js +++ new.returnTypePredicateIsInstantiateInContextOfTarget.js -@@= skipped -19, +19 lines =@@ - "use strict"; +@@= skipped -52, +52 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); +-var React = __importStar(require("react")); -let TestComponent = (() => { - class TestComponent extends React.Component { - // Type guard is defined as a static class property @@ -13,7 +13,7 @@ - } - } - TestComponent.defaultProps = { -+const React = require("react"); ++const React = __importStar(require("react")); +class TestComponent extends React.Component { + static defaultProps = { isAny: TestComponent.isAny diff --git a/testdata/baselines/reference/submodule/compiler/selfReferentialDefaultNoStackOverflow.js b/testdata/baselines/reference/submodule/compiler/selfReferentialDefaultNoStackOverflow.js index f032036b05..9d9f1b248a 100644 --- a/testdata/baselines/reference/submodule/compiler/selfReferentialDefaultNoStackOverflow.js +++ b/testdata/baselines/reference/submodule/compiler/selfReferentialDefaultNoStackOverflow.js @@ -11,8 +11,11 @@ export default { //// [QSpinner.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const QSpinner_1 = require("./QSpinner"); +const QSpinner_1 = __importDefault(require("./QSpinner")); exports.default = { mixins: [QSpinner_1.default], name: 'QSpinner' diff --git a/testdata/baselines/reference/submodule/compiler/selfReferentialDefaultNoStackOverflow.js.diff b/testdata/baselines/reference/submodule/compiler/selfReferentialDefaultNoStackOverflow.js.diff index a5edb40db3..665e8fc4e5 100644 --- a/testdata/baselines/reference/submodule/compiler/selfReferentialDefaultNoStackOverflow.js.diff +++ b/testdata/baselines/reference/submodule/compiler/selfReferentialDefaultNoStackOverflow.js.diff @@ -1,11 +1,11 @@ --- old.selfReferentialDefaultNoStackOverflow.js +++ new.selfReferentialDefaultNoStackOverflow.js -@@= skipped -11, +11 lines =@@ - //// [QSpinner.js] - "use strict"; +@@= skipped -14, +14 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var QSpinner_1 = require("./QSpinner"); -+const QSpinner_1 = require("./QSpinner"); +-var QSpinner_1 = __importDefault(require("./QSpinner")); ++const QSpinner_1 = __importDefault(require("./QSpinner")); exports.default = { mixins: [QSpinner_1.default], name: 'QSpinner' \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.errors.txt.diff deleted file mode 100644 index d9e4756b65..0000000000 --- a/testdata/baselines/reference/submodule/compiler/shorthand-property-es5-es6.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.shorthand-property-es5-es6.errors.txt -+++ new.shorthand-property-es5-es6.errors.txt -@@= skipped -0, +0 lines =@@ --test.ts(1,19): error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+test.ts(1,19): error TS2307: Cannot find module './foo' or its corresponding type declarations. - - - ==== test.ts (1 errors) ==== - import {foo} from './foo'; - ~~~~~~~ --!!! error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module './foo' or its corresponding type declarations. - const baz = 42; - const bar = { foo, baz }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.errors.txt.diff deleted file mode 100644 index 58bc337ca6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/shorthand-property-es6-es6.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.shorthand-property-es6-es6.errors.txt -+++ new.shorthand-property-es6-es6.errors.txt -@@= skipped -0, +0 lines =@@ --test.ts(1,19): error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+test.ts(1,19): error TS2307: Cannot find module './foo' or its corresponding type declarations. - - - ==== test.ts (1 errors) ==== - import {foo} from './foo'; - ~~~~~~~ --!!! error TS2792: Cannot find module './foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module './foo' or its corresponding type declarations. - const baz = 42; - const bar = { foo, baz }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.errors.txt b/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.errors.txt deleted file mode 100644 index ea595a3390..0000000000 --- a/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.errors.txt +++ /dev/null @@ -1,24 +0,0 @@ -error TS5055: Cannot write file 'jsDocOptionality.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'jsDocOptionality.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== jsDocOptionality.js (0 errors) ==== - function MyClass() { - this.prop = null; - } - /** - * @param {string} required - * @param {string} [notRequired] - * @returns {MyClass} - */ - MyClass.prototype.optionalParam = function(required, notRequired) { - return this; - }; - let pInst = new MyClass(); - let c1 = pInst.optionalParam('hello') - let c2 = pInst.optionalParam('hello', null) - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.symbols b/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.symbols deleted file mode 100644 index 8d03715858..0000000000 --- a/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.symbols +++ /dev/null @@ -1,34 +0,0 @@ -//// [tests/cases/compiler/signaturesUseJSDocForOptionalParameters.ts] //// - -=== jsDocOptionality.js === -function MyClass() { ->MyClass : Symbol(MyClass, Decl(jsDocOptionality.js, 0, 0)) - - this.prop = null; -} -/** - * @param {string} required - * @param {string} [notRequired] - * @returns {MyClass} - */ -MyClass.prototype.optionalParam = function(required, notRequired) { ->MyClass.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->MyClass : Symbol(MyClass, Decl(jsDocOptionality.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->required : Symbol(required, Decl(jsDocOptionality.js, 8, 43)) ->notRequired : Symbol(notRequired, Decl(jsDocOptionality.js, 8, 52)) - - return this; -}; -let pInst = new MyClass(); ->pInst : Symbol(pInst, Decl(jsDocOptionality.js, 11, 3)) ->MyClass : Symbol(MyClass, Decl(jsDocOptionality.js, 0, 0)) - -let c1 = pInst.optionalParam('hello') ->c1 : Symbol(c1, Decl(jsDocOptionality.js, 12, 3)) ->pInst : Symbol(pInst, Decl(jsDocOptionality.js, 11, 3)) - -let c2 = pInst.optionalParam('hello', null) ->c2 : Symbol(c2, Decl(jsDocOptionality.js, 13, 3)) ->pInst : Symbol(pInst, Decl(jsDocOptionality.js, 11, 3)) - diff --git a/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.symbols.diff b/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.symbols.diff deleted file mode 100644 index fe6ac218ee..0000000000 --- a/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.symbols.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- old.signaturesUseJSDocForOptionalParameters.symbols -+++ new.signaturesUseJSDocForOptionalParameters.symbols -@@= skipped -4, +4 lines =@@ - >MyClass : Symbol(MyClass, Decl(jsDocOptionality.js, 0, 0)) - - this.prop = null; -->this.prop : Symbol(MyClass.prop, Decl(jsDocOptionality.js, 0, 20)) -->this : Symbol(MyClass, Decl(jsDocOptionality.js, 0, 0)) -->prop : Symbol(MyClass.prop, Decl(jsDocOptionality.js, 0, 20)) - } - /** - * @param {string} required -@@= skipped -10, +7 lines =@@ - * @returns {MyClass} - */ - MyClass.prototype.optionalParam = function(required, notRequired) { -->MyClass.prototype : Symbol(MyClass.optionalParam, Decl(jsDocOptionality.js, 2, 1)) -+>MyClass.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >MyClass : Symbol(MyClass, Decl(jsDocOptionality.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->optionalParam : Symbol(MyClass.optionalParam, Decl(jsDocOptionality.js, 2, 1)) - >required : Symbol(required, Decl(jsDocOptionality.js, 8, 43)) - >notRequired : Symbol(notRequired, Decl(jsDocOptionality.js, 8, 52)) - - return this; -->this : Symbol(MyClass, Decl(jsDocOptionality.js, 0, 0)) -- - }; - let pInst = new MyClass(); - >pInst : Symbol(pInst, Decl(jsDocOptionality.js, 11, 3)) -@@= skipped -17, +14 lines =@@ - - let c1 = pInst.optionalParam('hello') - >c1 : Symbol(c1, Decl(jsDocOptionality.js, 12, 3)) -->pInst.optionalParam : Symbol(MyClass.optionalParam, Decl(jsDocOptionality.js, 2, 1)) - >pInst : Symbol(pInst, Decl(jsDocOptionality.js, 11, 3)) -->optionalParam : Symbol(MyClass.optionalParam, Decl(jsDocOptionality.js, 2, 1)) - - let c2 = pInst.optionalParam('hello', null) - >c2 : Symbol(c2, Decl(jsDocOptionality.js, 13, 3)) -->pInst.optionalParam : Symbol(MyClass.optionalParam, Decl(jsDocOptionality.js, 2, 1)) - >pInst : Symbol(pInst, Decl(jsDocOptionality.js, 11, 3)) -->optionalParam : Symbol(MyClass.optionalParam, Decl(jsDocOptionality.js, 2, 1)) diff --git a/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.types b/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.types deleted file mode 100644 index c149ffbcea..0000000000 --- a/testdata/baselines/reference/submodule/compiler/signaturesUseJSDocForOptionalParameters.types +++ /dev/null @@ -1,53 +0,0 @@ -//// [tests/cases/compiler/signaturesUseJSDocForOptionalParameters.ts] //// - -=== jsDocOptionality.js === -function MyClass() { ->MyClass : () => void - - this.prop = null; ->this.prop = null : null ->this.prop : any ->this : any ->prop : any -} -/** - * @param {string} required - * @param {string} [notRequired] - * @returns {MyClass} - */ -MyClass.prototype.optionalParam = function(required, notRequired) { ->MyClass.prototype.optionalParam = function(required, notRequired) { return this;} : (required: any, notRequired: any) => any ->MyClass.prototype.optionalParam : any ->MyClass.prototype : any ->MyClass : () => void ->prototype : any ->optionalParam : any ->function(required, notRequired) { return this;} : (required: any, notRequired: any) => any ->required : any ->notRequired : any - - return this; ->this : any - -}; -let pInst = new MyClass(); ->pInst : any ->new MyClass() : any ->MyClass : () => void - -let c1 = pInst.optionalParam('hello') ->c1 : any ->pInst.optionalParam('hello') : any ->pInst.optionalParam : any ->pInst : any ->optionalParam : any ->'hello' : "hello" - -let c2 = pInst.optionalParam('hello', null) ->c2 : any ->pInst.optionalParam('hello', null) : any ->pInst.optionalParam : any ->pInst : any ->optionalParam : any ->'hello' : "hello" - diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.errors.txt b/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.errors.txt deleted file mode 100644 index fed15e5aea..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== testFiles/app.ts (0 errors) ==== - // Note in the out result we are using same folder name only different in casing - // Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts - class c { - } - -==== testFiles/app2.ts (0 errors) ==== - class d { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.symbols b/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.symbols deleted file mode 100644 index 8a0d31eee9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/sourceMapWithCaseSensitiveFileNames.ts] //// - -=== testFiles/app.ts === -// Note in the out result we are using same folder name only different in casing -// Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts -class c { ->c : Symbol(c, Decl(app.ts, 0, 0)) -} - -=== testFiles/app2.ts === -class d { ->d : Symbol(d, Decl(app2.ts, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.types b/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.types deleted file mode 100644 index 4e8a446571..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithCaseSensitiveFileNames.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/sourceMapWithCaseSensitiveFileNames.ts] //// - -=== testFiles/app.ts === -// Note in the out result we are using same folder name only different in casing -// Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts -class c { ->c : c -} - -=== testFiles/app2.ts === -class d { ->d : d -} - diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.errors.txt b/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.errors.txt deleted file mode 100644 index 06b9e85842..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.errors.txt +++ /dev/null @@ -1,22 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== b.ts (0 errors) ==== - /*-------------------------------------------------------------------------- - Copyright - ---------------------------------------------------------------------------*/ - - /// - var y = x; - -==== a.ts (0 errors) ==== - /*-------------------------------------------------------------------------- - Copyright - ---------------------------------------------------------------------------*/ - - var x = { - a: 10, - b: 20 - }; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.symbols b/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.symbols deleted file mode 100644 index ff6c988f34..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.symbols +++ /dev/null @@ -1,28 +0,0 @@ -//// [tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts] //// - -=== b.ts === -/*-------------------------------------------------------------------------- -Copyright ----------------------------------------------------------------------------*/ - -/// -var y = x; ->y : Symbol(y, Decl(b.ts, 5, 3)) ->x : Symbol(x, Decl(a.ts, 4, 3)) - -=== a.ts === -/*-------------------------------------------------------------------------- -Copyright ----------------------------------------------------------------------------*/ - -var x = { ->x : Symbol(x, Decl(a.ts, 4, 3)) - - a: 10, ->a : Symbol(a, Decl(a.ts, 4, 9)) - - b: 20 ->b : Symbol(b, Decl(a.ts, 5, 10)) - -}; - diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.types b/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.types deleted file mode 100644 index 70010a3329..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithCopyright.types +++ /dev/null @@ -1,31 +0,0 @@ -//// [tests/cases/compiler/sourceMapWithMultipleFilesWithCopyright.ts] //// - -=== b.ts === -/*-------------------------------------------------------------------------- -Copyright ----------------------------------------------------------------------------*/ - -/// -var y = x; ->y : { a: number; b: number; } ->x : { a: number; b: number; } - -=== a.ts === -/*-------------------------------------------------------------------------- -Copyright ----------------------------------------------------------------------------*/ - -var x = { ->x : { a: number; b: number; } ->{ a: 10, b: 20} : { a: number; b: number; } - - a: 10, ->a : number ->10 : 10 - - b: 20 ->b : number ->20 : 20 - -}; - diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt b/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt deleted file mode 100644 index d70b2c5374..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.ts (0 errors) ==== - module M { - export var X = 1; - } - interface Navigator { - getGamepads(func?: any): any; - webkitGetGamepads(func?: any): any - msGetGamepads(func?: any): any; - webkitGamepads(func?: any): any; - } - -==== b.ts (0 errors) ==== - module m1 { - export class c1 { - } - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols b/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols deleted file mode 100644 index b98896057b..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.symbols +++ /dev/null @@ -1,38 +0,0 @@ -//// [tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts] //// - -=== a.ts === -module M { ->M : Symbol(M, Decl(a.ts, 0, 0)) - - export var X = 1; ->X : Symbol(X, Decl(a.ts, 1, 14)) -} -interface Navigator { ->Navigator : Symbol(Navigator, Decl(lib.dom.d.ts, --, --), Decl(lib.dom.d.ts, --, --), Decl(a.ts, 2, 1)) - - getGamepads(func?: any): any; ->getGamepads : Symbol(Navigator.getGamepads, Decl(lib.dom.d.ts, --, --), Decl(a.ts, 3, 21)) ->func : Symbol(func, Decl(a.ts, 4, 16)) - - webkitGetGamepads(func?: any): any ->webkitGetGamepads : Symbol(Navigator.webkitGetGamepads, Decl(a.ts, 4, 33)) ->func : Symbol(func, Decl(a.ts, 5, 22)) - - msGetGamepads(func?: any): any; ->msGetGamepads : Symbol(Navigator.msGetGamepads, Decl(a.ts, 5, 38)) ->func : Symbol(func, Decl(a.ts, 6, 18)) - - webkitGamepads(func?: any): any; ->webkitGamepads : Symbol(Navigator.webkitGamepads, Decl(a.ts, 6, 35)) ->func : Symbol(func, Decl(a.ts, 7, 19)) -} - -=== b.ts === -module m1 { ->m1 : Symbol(m1, Decl(b.ts, 0, 0)) - - export class c1 { ->c1 : Symbol(c1, Decl(b.ts, 0, 11)) - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.types b/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.types deleted file mode 100644 index ab77620e97..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.types +++ /dev/null @@ -1,37 +0,0 @@ -//// [tests/cases/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.ts] //// - -=== a.ts === -module M { ->M : typeof M - - export var X = 1; ->X : number ->1 : 1 -} -interface Navigator { - getGamepads(func?: any): any; ->getGamepads : { (): Gamepad[]; (func?: any): any; } ->func : any - - webkitGetGamepads(func?: any): any ->webkitGetGamepads : (func?: any) => any ->func : any - - msGetGamepads(func?: any): any; ->msGetGamepads : (func?: any) => any ->func : any - - webkitGamepads(func?: any): any; ->webkitGamepads : (func?: any) => any ->func : any -} - -=== b.ts === -module m1 { ->m1 : typeof m1 - - export class c1 { ->c1 : c1 - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.types.diff b/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.types.diff deleted file mode 100644 index 28511c9649..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.types.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.sourceMapWithMultipleFilesWithFileEndingWithInterface.types -+++ new.sourceMapWithMultipleFilesWithFileEndingWithInterface.types -@@= skipped -9, +9 lines =@@ - } - interface Navigator { - getGamepads(func?: any): any; -->getGamepads : { (): (Gamepad | null)[]; (func?: any): any; } -+>getGamepads : { (): Gamepad[]; (func?: any): any; } - >func : any - - webkitGetGamepads(func?: any): any \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.errors.txt b/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.errors.txt deleted file mode 100644 index 7702c5314e..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== testFiles/app.ts (0 errors) ==== - // Note in the out result we are using same folder name only different in casing - // Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap - class c { - } - -==== testFiles/app2.ts (0 errors) ==== - class d { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.symbols b/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.symbols deleted file mode 100644 index 2b39131908..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.symbols +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/sourceMapWithNonCaseSensitiveFileNames.ts] //// - -=== testFiles/app.ts === -// Note in the out result we are using same folder name only different in casing -// Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap -class c { ->c : Symbol(c, Decl(app.ts, 0, 0)) -} - -=== testFiles/app2.ts === -class d { ->d : Symbol(d, Decl(app2.ts, 0, 0)) -} - diff --git a/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.types b/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.types deleted file mode 100644 index 5cd56b3263..0000000000 --- a/testdata/baselines/reference/submodule/compiler/sourceMapWithNonCaseSensitiveFileNames.types +++ /dev/null @@ -1,14 +0,0 @@ -//// [tests/cases/compiler/sourceMapWithNonCaseSensitiveFileNames.ts] //// - -=== testFiles/app.ts === -// Note in the out result we are using same folder name only different in casing -// Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap -class c { ->c : c -} - -=== testFiles/app2.ts === -class d { ->d : d -} - diff --git a/testdata/baselines/reference/submodule/compiler/spellingSuggestionJSXAttribute.js b/testdata/baselines/reference/submodule/compiler/spellingSuggestionJSXAttribute.js index 84a1006910..1a3b3be308 100644 --- a/testdata/baselines/reference/submodule/compiler/spellingSuggestionJSXAttribute.js +++ b/testdata/baselines/reference/submodule/compiler/spellingSuggestionJSXAttribute.js @@ -20,9 +20,42 @@ class MyComp extends React.Component<{ className?: string, htmlFor?: string }> { //// [spellingSuggestionJSXAttribute.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const React = require("react"); +const React = __importStar(require("react")); function MyComp2(props) { return null; } diff --git a/testdata/baselines/reference/submodule/compiler/spellingSuggestionJSXAttribute.js.diff b/testdata/baselines/reference/submodule/compiler/spellingSuggestionJSXAttribute.js.diff index c7ab83af1e..32fd03e8e4 100644 --- a/testdata/baselines/reference/submodule/compiler/spellingSuggestionJSXAttribute.js.diff +++ b/testdata/baselines/reference/submodule/compiler/spellingSuggestionJSXAttribute.js.diff @@ -1,11 +1,11 @@ --- old.spellingSuggestionJSXAttribute.js +++ new.spellingSuggestionJSXAttribute.js -@@= skipped -21, +21 lines =@@ - "use strict"; +@@= skipped -54, +54 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function MyComp2(props) { return null; } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/spreadExpressionContextualTypeWithNamespace.js b/testdata/baselines/reference/submodule/compiler/spreadExpressionContextualTypeWithNamespace.js index 58620e049f..b3975a1093 100644 --- a/testdata/baselines/reference/submodule/compiler/spreadExpressionContextualTypeWithNamespace.js +++ b/testdata/baselines/reference/submodule/compiler/spreadExpressionContextualTypeWithNamespace.js @@ -61,8 +61,41 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const stuff = require("./spreadExpressionContextualTypeWithNamespace_0"); +const stuff = __importStar(require("./spreadExpressionContextualTypeWithNamespace_0")); stuff.func; stuff.klass; stuff.obj; diff --git a/testdata/baselines/reference/submodule/compiler/spreadExpressionContextualTypeWithNamespace.js.diff b/testdata/baselines/reference/submodule/compiler/spreadExpressionContextualTypeWithNamespace.js.diff index c8f0893e6d..fd019f673b 100644 --- a/testdata/baselines/reference/submodule/compiler/spreadExpressionContextualTypeWithNamespace.js.diff +++ b/testdata/baselines/reference/submodule/compiler/spreadExpressionContextualTypeWithNamespace.js.diff @@ -1,11 +1,11 @@ --- old.spreadExpressionContextualTypeWithNamespace.js +++ new.spreadExpressionContextualTypeWithNamespace.js -@@= skipped -61, +61 lines =@@ - return __assign.apply(this, arguments); - }; +@@= skipped -94, +94 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var stuff = require("./spreadExpressionContextualTypeWithNamespace_0"); -+const stuff = require("./spreadExpressionContextualTypeWithNamespace_0"); +-var stuff = __importStar(require("./spreadExpressionContextualTypeWithNamespace_0")); ++const stuff = __importStar(require("./spreadExpressionContextualTypeWithNamespace_0")); stuff.func; stuff.klass; stuff.obj; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.js b/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.js index f284560d85..0aeb812b6a 100644 --- a/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.js +++ b/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.js @@ -41,7 +41,40 @@ hoge.fetch(null as any); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const Backbone = require("backbone"); +const Backbone = __importStar(require("backbone")); const hoge = new Backbone.Model(); hoge.fetch(null); diff --git a/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.js.diff b/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.js.diff index 441eee163b..04e95c6e1b 100644 --- a/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.js.diff +++ b/testdata/baselines/reference/submodule/compiler/stackDepthLimitCastingType.js.diff @@ -1,10 +1,10 @@ --- old.stackDepthLimitCastingType.js +++ new.stackDepthLimitCastingType.js -@@= skipped -41, +41 lines =@@ - //// [index.js] - "use strict"; +@@= skipped -74, +74 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var Backbone = require("backbone"); -+const Backbone = require("backbone"); +-var Backbone = __importStar(require("backbone")); ++const Backbone = __importStar(require("backbone")); const hoge = new Backbone.Model(); hoge.fetch(null); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.errors.txt b/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.errors.txt new file mode 100644 index 0000000000..d44a6f4221 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.errors.txt @@ -0,0 +1,26 @@ +staticInstanceResolution5_1.ts(4,14): error TS2709: Cannot use namespace 'WinJS' as a type. +staticInstanceResolution5_1.ts(5,23): error TS2709: Cannot use namespace 'WinJS' as a type. +staticInstanceResolution5_1.ts(6,16): error TS2709: Cannot use namespace 'WinJS' as a type. + + +==== staticInstanceResolution5_1.ts (3 errors) ==== + import WinJS = require('./staticInstanceResolution5_0'); + + // these 3 should be errors + var x = (w1: WinJS) => { }; + ~~~~~ +!!! error TS2709: Cannot use namespace 'WinJS' as a type. + var y = function (w2: WinJS) { } + ~~~~~ +!!! error TS2709: Cannot use namespace 'WinJS' as a type. + function z(w3: WinJS) { } + ~~~~~ +!!! error TS2709: Cannot use namespace 'WinJS' as a type. + +==== staticInstanceResolution5_0.ts (0 errors) ==== + export class Promise { + static timeout(delay: number): Promise { + return null; + } + } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.js b/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.js new file mode 100644 index 0000000000..f297e0196b --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.js @@ -0,0 +1,35 @@ +//// [tests/cases/compiler/staticInstanceResolution5.ts] //// + +//// [staticInstanceResolution5_0.ts] +export class Promise { + static timeout(delay: number): Promise { + return null; + } +} + +//// [staticInstanceResolution5_1.ts] +import WinJS = require('./staticInstanceResolution5_0'); + +// these 3 should be errors +var x = (w1: WinJS) => { }; +var y = function (w2: WinJS) { } +function z(w3: WinJS) { } + + +//// [staticInstanceResolution5_0.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.Promise = void 0; +class Promise { + static timeout(delay) { + return null; + } +} +exports.Promise = Promise; +//// [staticInstanceResolution5_1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +// these 3 should be errors +var x = (w1) => { }; +var y = function (w2) { }; +function z(w3) { } diff --git a/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.symbols b/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.symbols new file mode 100644 index 0000000000..60e1997492 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.symbols @@ -0,0 +1,35 @@ +//// [tests/cases/compiler/staticInstanceResolution5.ts] //// + +=== staticInstanceResolution5_1.ts === +import WinJS = require('./staticInstanceResolution5_0'); +>WinJS : Symbol(WinJS, Decl(staticInstanceResolution5_1.ts, 0, 0)) + +// these 3 should be errors +var x = (w1: WinJS) => { }; +>x : Symbol(x, Decl(staticInstanceResolution5_1.ts, 3, 3)) +>w1 : Symbol(w1, Decl(staticInstanceResolution5_1.ts, 3, 9)) +>WinJS : Symbol(WinJS) + +var y = function (w2: WinJS) { } +>y : Symbol(y, Decl(staticInstanceResolution5_1.ts, 4, 3)) +>w2 : Symbol(w2, Decl(staticInstanceResolution5_1.ts, 4, 18)) +>WinJS : Symbol(WinJS) + +function z(w3: WinJS) { } +>z : Symbol(z, Decl(staticInstanceResolution5_1.ts, 4, 32)) +>w3 : Symbol(w3, Decl(staticInstanceResolution5_1.ts, 5, 11)) +>WinJS : Symbol(WinJS) + +=== staticInstanceResolution5_0.ts === +export class Promise { +>Promise : Symbol(Promise, Decl(staticInstanceResolution5_0.ts, 0, 0)) + + static timeout(delay: number): Promise { +>timeout : Symbol(Promise.timeout, Decl(staticInstanceResolution5_0.ts, 0, 22)) +>delay : Symbol(delay, Decl(staticInstanceResolution5_0.ts, 1, 19)) +>Promise : Symbol(Promise, Decl(staticInstanceResolution5_0.ts, 0, 0)) + + return null; + } +} + diff --git a/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.types b/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.types new file mode 100644 index 0000000000..b7a0919b43 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/staticInstanceResolution5.types @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/staticInstanceResolution5.ts] //// + +=== staticInstanceResolution5_1.ts === +import WinJS = require('./staticInstanceResolution5_0'); +>WinJS : typeof WinJS + +// these 3 should be errors +var x = (w1: WinJS) => { }; +>x : (w1: WinJS) => void +>(w1: WinJS) => { } : (w1: WinJS) => void +>w1 : WinJS + +var y = function (w2: WinJS) { } +>y : (w2: WinJS) => void +>function (w2: WinJS) { } : (w2: WinJS) => void +>w2 : WinJS + +function z(w3: WinJS) { } +>z : (w3: WinJS) => void +>w3 : WinJS + +=== staticInstanceResolution5_0.ts === +export class Promise { +>Promise : Promise + + static timeout(delay: number): Promise { +>timeout : (delay: number) => Promise +>delay : number + + return null; + } +} + diff --git a/testdata/baselines/reference/submodule/compiler/strictModeWordInImportDeclaration.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/strictModeWordInImportDeclaration.errors.txt.diff deleted file mode 100644 index 130c0b36f6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/strictModeWordInImportDeclaration.errors.txt.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- old.strictModeWordInImportDeclaration.errors.txt -+++ new.strictModeWordInImportDeclaration.errors.txt -@@= skipped -0, +0 lines =@@ - strictModeWordInImportDeclaration.ts(2,13): error TS1214: Identifier expected. 'package' is a reserved word in strict mode. Modules are automatically in strict mode. --strictModeWordInImportDeclaration.ts(2,26): error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+strictModeWordInImportDeclaration.ts(2,26): error TS2307: Cannot find module './1' or its corresponding type declarations. - strictModeWordInImportDeclaration.ts(3,16): error TS1214: Identifier expected. 'private' is a reserved word in strict mode. Modules are automatically in strict mode. --strictModeWordInImportDeclaration.ts(3,30): error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+strictModeWordInImportDeclaration.ts(3,30): error TS2307: Cannot find module './1' or its corresponding type declarations. - strictModeWordInImportDeclaration.ts(4,8): error TS1214: Identifier expected. 'public' is a reserved word in strict mode. Modules are automatically in strict mode. --strictModeWordInImportDeclaration.ts(4,20): error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+strictModeWordInImportDeclaration.ts(4,20): error TS2307: Cannot find module './1' or its corresponding type declarations. - - - ==== strictModeWordInImportDeclaration.ts (6 errors) ==== -@@= skipped -11, +11 lines =@@ - ~~~~~~~ - !!! error TS1214: Identifier expected. 'package' is a reserved word in strict mode. Modules are automatically in strict mode. - ~~~~~ --!!! error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module './1' or its corresponding type declarations. - import {foo as private} from "./1" - ~~~~~~~ - !!! error TS1214: Identifier expected. 'private' is a reserved word in strict mode. Modules are automatically in strict mode. - ~~~~~ --!!! error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module './1' or its corresponding type declarations. - import public from "./1" - ~~~~~~ - !!! error TS1214: Identifier expected. 'public' is a reserved word in strict mode. Modules are automatically in strict mode. - ~~~~~ --!!! error TS2792: Cannot find module './1'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module './1' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js index 59acfb4178..f86e06bd9b 100644 --- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js +++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js @@ -29,9 +29,42 @@ export const a = pkg.invoke(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; -const pkg = require("package-b"); +const pkg = __importStar(require("package-b")); exports.a = pkg.invoke(); diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js.diff index ef5b9496f8..9abad200ba 100644 --- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js.diff +++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js.diff @@ -1,11 +1,11 @@ --- old.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js +++ new.symlinkedWorkspaceDependenciesNoDirectLinkGeneratesNonrelativeName.js -@@= skipped -30, +30 lines =@@ - "use strict"; +@@= skipped -63, +63 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; --var pkg = require("package-b"); -+const pkg = require("package-b"); +-var pkg = __importStar(require("package-b")); ++const pkg = __importStar(require("package-b")); exports.a = pkg.invoke(); diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js index fe24bc8f2a..d638053907 100644 --- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js +++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js @@ -31,9 +31,42 @@ export const a = pkg.invoke(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; -const pkg = require("package-b"); +const pkg = __importStar(require("package-b")); exports.a = pkg.invoke(); diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js.diff index 32ff6fc95c..5cc3323b49 100644 --- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js.diff +++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js.diff @@ -1,11 +1,11 @@ --- old.symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js +++ new.symlinkedWorkspaceDependenciesNoDirectLinkOptionalGeneratesNonrelativeName.js -@@= skipped -32, +32 lines =@@ - "use strict"; +@@= skipped -65, +65 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; --var pkg = require("package-b"); -+const pkg = require("package-b"); +-var pkg = __importStar(require("package-b")); ++const pkg = __importStar(require("package-b")); exports.a = pkg.invoke(); diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js index f1715cc27c..1e8b592fdc 100644 --- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js +++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js @@ -31,9 +31,42 @@ export const a = pkg.invoke(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; -const pkg = require("package-b"); +const pkg = __importStar(require("package-b")); exports.a = pkg.invoke(); diff --git a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js.diff b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js.diff index be48d6757d..6289240d1e 100644 --- a/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js.diff +++ b/testdata/baselines/reference/submodule/compiler/symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js.diff @@ -1,11 +1,11 @@ --- old.symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js +++ new.symlinkedWorkspaceDependenciesNoDirectLinkPeerGeneratesNonrelativeName.js -@@= skipped -32, +32 lines =@@ - "use strict"; +@@= skipped -65, +65 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; --var pkg = require("package-b"); -+const pkg = require("package-b"); +-var pkg = __importStar(require("package-b")); ++const pkg = __importStar(require("package-b")); exports.a = pkg.invoke(); diff --git a/testdata/baselines/reference/submodule/compiler/topLevelLambda4.errors.txt b/testdata/baselines/reference/submodule/compiler/topLevelLambda4.errors.txt new file mode 100644 index 0000000000..588cf7e944 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/topLevelLambda4.errors.txt @@ -0,0 +1,7 @@ +topLevelLambda4.ts(1,22): error TS2532: Object is possibly 'undefined'. + + +==== topLevelLambda4.ts (1 errors) ==== + export var x = () => this.window; + ~~~~ +!!! error TS2532: Object is possibly 'undefined'. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/topLevelLambda4.js b/testdata/baselines/reference/submodule/compiler/topLevelLambda4.js new file mode 100644 index 0000000000..81cf5783eb --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/topLevelLambda4.js @@ -0,0 +1,7 @@ +//// [tests/cases/compiler/topLevelLambda4.ts] //// + +//// [topLevelLambda4.ts] +export var x = () => this.window; + +//// [topLevelLambda4.js] +export var x = () => this.window; diff --git a/testdata/baselines/reference/submodule/compiler/topLevelLambda4.symbols b/testdata/baselines/reference/submodule/compiler/topLevelLambda4.symbols new file mode 100644 index 0000000000..3b05f7ae64 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/topLevelLambda4.symbols @@ -0,0 +1,6 @@ +//// [tests/cases/compiler/topLevelLambda4.ts] //// + +=== topLevelLambda4.ts === +export var x = () => this.window; +>x : Symbol(x, Decl(topLevelLambda4.ts, 0, 10)) + diff --git a/testdata/baselines/reference/submodule/compiler/topLevelLambda4.types b/testdata/baselines/reference/submodule/compiler/topLevelLambda4.types new file mode 100644 index 0000000000..225d2424d4 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/topLevelLambda4.types @@ -0,0 +1,10 @@ +//// [tests/cases/compiler/topLevelLambda4.ts] //// + +=== topLevelLambda4.ts === +export var x = () => this.window; +>x : () => any +>() => this.window : () => any +>this.window : any +>this : undefined +>window : any + diff --git a/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.errors.txt.diff b/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.errors.txt.diff new file mode 100644 index 0000000000..af95e509c7 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.errors.txt.diff @@ -0,0 +1,39 @@ +--- old.transformNestedGeneratorsWithTry.errors.txt ++++ new.transformNestedGeneratorsWithTry.errors.txt +@@= skipped -0, +0 lines =@@ +-main.ts(3,21): error TS1055: Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value. +- Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' provides no match for the signature 'new (executor: (resolve: (value: T | PromiseLike) => void, reject: (reason?: any) => void) => void): PromiseLike'. +-main.ts(5,35): error TS1055: Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value. +- Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' provides no match for the signature 'new (executor: (resolve: (value: T | PromiseLike) => void, reject: (reason?: any) => void) => void): PromiseLike'. +- +- +-==== main.ts (2 errors) ==== +- // https://github.com/Microsoft/TypeScript/issues/11177 +- import * as Bluebird from 'bluebird'; +- async function a(): Bluebird { +- ~~~~~~~~~~~~~~ +-!!! error TS1055: Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value. +-!!! error TS1055: Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' provides no match for the signature 'new (executor: (resolve: (value: T | PromiseLike) => void, reject: (reason?: any) => void) => void): PromiseLike'. +-!!! related TS7038 main.ts:2:1: Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead. +- try { +- const b = async function b(): Bluebird { +- ~~~~~~~~~~~~~~ +-!!! error TS1055: Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value. +-!!! error TS1055: Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' provides no match for the signature 'new (executor: (resolve: (value: T | PromiseLike) => void, reject: (reason?: any) => void) => void): PromiseLike'. +-!!! related TS7038 main.ts:2:1: Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead. +- try { +- await Bluebird.resolve(); // -- remove this and it compiles +- } catch (error) { } +- }; +- +- await b(); // -- or remove this and it compiles +- } catch (error) { } +- } +- +-==== bluebird.d.ts (0 errors) ==== +- declare module "bluebird" { +- type Bluebird = Promise; +- const Bluebird: typeof Promise; +- export = Bluebird; +- } ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.js b/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.js index 18e2b0214c..2effb1d607 100644 --- a/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.js +++ b/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.js @@ -24,9 +24,42 @@ declare module "bluebird" { //// [main.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // https://github.com/Microsoft/TypeScript/issues/11177 -const Bluebird = require("bluebird"); +const Bluebird = __importStar(require("bluebird")); async function a() { try { const b = async function b() { diff --git a/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.js.diff b/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.js.diff index 3f210b9299..90b41568bf 100644 --- a/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.js.diff +++ b/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.js.diff @@ -1,9 +1,9 @@ --- old.transformNestedGeneratorsWithTry.js +++ new.transformNestedGeneratorsWithTry.js -@@= skipped -23, +23 lines =@@ - - //// [main.js] - "use strict"; +@@= skipped -56, +56 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -15,12 +15,12 @@ -}; Object.defineProperty(exports, "__esModule", { value: true }); // https://github.com/Microsoft/TypeScript/issues/11177 --var Bluebird = require("bluebird"); +-var Bluebird = __importStar(require("bluebird")); -function a() { -- return __awaiter(this, void 0, Bluebird, function* () { +- return __awaiter(this, void 0, void 0, function* () { - try { - const b = function b() { -- return __awaiter(this, void 0, Bluebird, function* () { +- return __awaiter(this, void 0, void 0, function* () { - try { - yield Bluebird.resolve(); // -- remove this and it compiles - } @@ -31,7 +31,7 @@ - } - catch (error) { } - }); -+const Bluebird = require("bluebird"); ++const Bluebird = __importStar(require("bluebird")); +async function a() { + try { + const b = async function b() { diff --git a/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.types b/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.types index e2a5f3ce0d..2afc5b3098 100644 --- a/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.types +++ b/testdata/baselines/reference/submodule/compiler/transformNestedGeneratorsWithTry.types @@ -3,7 +3,7 @@ === main.ts === // https://github.com/Microsoft/TypeScript/issues/11177 import * as Bluebird from 'bluebird'; ->Bluebird : PromiseConstructor +>Bluebird : { all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; } async function a(): Bluebird { >a : () => Bluebird @@ -19,7 +19,7 @@ async function a(): Bluebird { >await Bluebird.resolve() : void >Bluebird.resolve() : Promise >Bluebird.resolve : { (): Promise; (value: T): Promise>; (value: T | PromiseLike): Promise>; } ->Bluebird : PromiseConstructor +>Bluebird : { all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; } >resolve : { (): Promise; (value: T): Promise>; (value: T | PromiseLike): Promise>; } } catch (error) { } diff --git a/testdata/baselines/reference/submodule/compiler/tsxDeepAttributeAssignabilityError.js b/testdata/baselines/reference/submodule/compiler/tsxDeepAttributeAssignabilityError.js index bcb2cfc921..d5990c8852 100644 --- a/testdata/baselines/reference/submodule/compiler/tsxDeepAttributeAssignabilityError.js +++ b/testdata/baselines/reference/submodule/compiler/tsxDeepAttributeAssignabilityError.js @@ -27,17 +27,83 @@ export const result =
; function testComponent(props) { return ; diff --git a/testdata/baselines/reference/submodule/compiler/tsxNoTypeAnnotatedSFC.js.diff b/testdata/baselines/reference/submodule/compiler/tsxNoTypeAnnotatedSFC.js.diff index c01b41de14..e3c4cc6c5a 100644 --- a/testdata/baselines/reference/submodule/compiler/tsxNoTypeAnnotatedSFC.js.diff +++ b/testdata/baselines/reference/submodule/compiler/tsxNoTypeAnnotatedSFC.js.diff @@ -1,11 +1,11 @@ --- old.tsxNoTypeAnnotatedSFC.js +++ new.tsxNoTypeAnnotatedSFC.js -@@= skipped -13, +13 lines =@@ - "use strict"; +@@= skipped -46, +46 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); // not _actually_ making react available in this test to regression test #22948 --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); const Test123 = () =>
; function testComponent(props) { return ; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.errors.txt b/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.errors.txt new file mode 100644 index 0000000000..fea09b9ba2 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.errors.txt @@ -0,0 +1,9 @@ +typeAliasDeclarationEmit.ts(3,37): error TS2314: Generic type 'callback' requires 1 type argument(s). + + +==== typeAliasDeclarationEmit.ts (1 errors) ==== + export type callback = () => T; + + export type CallbackArray = () => T; + ~~~~~~~~ +!!! error TS2314: Generic type 'callback' requires 1 type argument(s). \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.js b/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.js new file mode 100644 index 0000000000..8413241fab --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.js @@ -0,0 +1,15 @@ +//// [tests/cases/compiler/typeAliasDeclarationEmit.ts] //// + +//// [typeAliasDeclarationEmit.ts] +export type callback = () => T; + +export type CallbackArray = () => T; + +//// [typeAliasDeclarationEmit.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); + + +//// [typeAliasDeclarationEmit.d.ts] +export type callback = () => T; +export type CallbackArray = () => T; diff --git a/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.symbols b/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.symbols new file mode 100644 index 0000000000..f07f6a2727 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.symbols @@ -0,0 +1,14 @@ +//// [tests/cases/compiler/typeAliasDeclarationEmit.ts] //// + +=== typeAliasDeclarationEmit.ts === +export type callback = () => T; +>callback : Symbol(callback, Decl(typeAliasDeclarationEmit.ts, 0, 0)) +>T : Symbol(T, Decl(typeAliasDeclarationEmit.ts, 0, 21)) +>T : Symbol(T, Decl(typeAliasDeclarationEmit.ts, 0, 21)) + +export type CallbackArray = () => T; +>CallbackArray : Symbol(CallbackArray, Decl(typeAliasDeclarationEmit.ts, 0, 34)) +>T : Symbol(T, Decl(typeAliasDeclarationEmit.ts, 2, 26)) +>callback : Symbol(callback, Decl(typeAliasDeclarationEmit.ts, 0, 0)) +>T : Symbol(T, Decl(typeAliasDeclarationEmit.ts, 2, 26)) + diff --git a/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.types b/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.types new file mode 100644 index 0000000000..d586ada266 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/typeAliasDeclarationEmit.types @@ -0,0 +1,9 @@ +//// [tests/cases/compiler/typeAliasDeclarationEmit.ts] //// + +=== typeAliasDeclarationEmit.ts === +export type callback = () => T; +>callback : callback + +export type CallbackArray = () => T; +>CallbackArray : CallbackArray + diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.errors.txt b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.errors.txt deleted file mode 100644 index 59a7ac20e7..0000000000 --- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /mod2.ts (0 errors) ==== - import {foo} from "./mod1"; - export const bar = foo(); - -==== /types/lib/index.d.ts (0 errors) ==== - interface Lib { x } - -==== /mod1.ts (0 errors) ==== - export function foo(): Lib { return {x: 1} } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.symbols b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.symbols deleted file mode 100644 index 0eb7bfda6d..0000000000 --- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.symbols +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/compiler/typeReferenceDirectives11.ts] //// - -=== /mod2.ts === -import {foo} from "./mod1"; ->foo : Symbol(foo, Decl(mod2.ts, 0, 8)) - -export const bar = foo(); ->bar : Symbol(bar, Decl(mod2.ts, 1, 12)) ->foo : Symbol(foo, Decl(mod2.ts, 0, 8)) - -=== /types/lib/index.d.ts === -interface Lib { x } ->Lib : Symbol(Lib, Decl(index.d.ts, 0, 0)) ->x : Symbol(Lib.x, Decl(index.d.ts, 0, 15)) - -=== /mod1.ts === -export function foo(): Lib { return {x: 1} } ->foo : Symbol(foo, Decl(mod1.ts, 0, 0)) ->Lib : Symbol(Lib, Decl(index.d.ts, 0, 0)) ->x : Symbol(x, Decl(mod1.ts, 0, 37)) - diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.trace.json b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.trace.json deleted file mode 100644 index 3f7b1d3736..0000000000 --- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.trace.json +++ /dev/null @@ -1,13 +0,0 @@ -======== Resolving module './mod1' from '/mod2.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/mod1', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/mod1.ts' exists - use it as a name resolution result. -======== Module name './mod1' was successfully resolved to '/mod1.ts'. ======== -======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ======== -Resolving with primary search path '/types'. -File '/types/lib.d.ts' does not exist. -File '/types/lib/package.json' does not exist. -File '/types/lib/index.d.ts' exists - use it as a name resolution result. -Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'. -======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ======== diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.types b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.types deleted file mode 100644 index 83f1a103db..0000000000 --- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives11.types +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/compiler/typeReferenceDirectives11.ts] //// - -=== /mod2.ts === -import {foo} from "./mod1"; ->foo : () => Lib - -export const bar = foo(); ->bar : Lib ->foo() : Lib ->foo : () => Lib - -=== /types/lib/index.d.ts === -interface Lib { x } ->x : any - -=== /mod1.ts === -export function foo(): Lib { return {x: 1} } ->foo : () => Lib ->{x: 1} : { x: number; } ->x : number ->1 : 1 - diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.errors.txt b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.errors.txt deleted file mode 100644 index e2f5348459..0000000000 --- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.errors.txt +++ /dev/null @@ -1,35 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /mod2.ts (0 errors) ==== - import { Cls } from "./main"; - import "./mod1"; - - export const cls = Cls; - export const foo = new Cls().foo(); - export const bar = Cls.bar(); - -==== /types/lib/index.d.ts (0 errors) ==== - interface Lib { x } - -==== /main.ts (0 errors) ==== - export class Cls { - x - } - -==== /mod1.ts (0 errors) ==== - /// - - import {Cls} from "./main"; - Cls.prototype.foo = function() { return undefined; } - - declare module "./main" { - interface Cls { - foo(): Lib; - } - namespace Cls { - function bar(): Lib; - } - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols deleted file mode 100644 index 0eb38dab99..0000000000 --- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.symbols +++ /dev/null @@ -1,70 +0,0 @@ -//// [tests/cases/compiler/typeReferenceDirectives12.ts] //// - -=== /mod2.ts === -import { Cls } from "./main"; ->Cls : Symbol(Cls, Decl(mod2.ts, 0, 8)) - -import "./mod1"; - -export const cls = Cls; ->cls : Symbol(cls, Decl(mod2.ts, 3, 12)) ->Cls : Symbol(Cls, Decl(mod2.ts, 0, 8)) - -export const foo = new Cls().foo(); ->foo : Symbol(foo, Decl(mod2.ts, 4, 12)) ->new Cls().foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19)) ->Cls : Symbol(Cls, Decl(mod2.ts, 0, 8)) ->foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19)) - -export const bar = Cls.bar(); ->bar : Symbol(bar, Decl(mod2.ts, 5, 12)) ->Cls.bar : Symbol(Cls.bar, Decl(mod1.ts, 9, 19)) ->Cls : Symbol(Cls, Decl(mod2.ts, 0, 8)) ->bar : Symbol(Cls.bar, Decl(mod1.ts, 9, 19)) - -=== /types/lib/index.d.ts === -interface Lib { x } ->Lib : Symbol(Lib, Decl(index.d.ts, 0, 0)) ->x : Symbol(Lib.x, Decl(index.d.ts, 0, 15)) - -=== /main.ts === -export class Cls { ->Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5)) - - x ->x : Symbol(Cls.x, Decl(main.ts, 0, 18)) -} - -=== /mod1.ts === -/// - -import {Cls} from "./main"; ->Cls : Symbol(Cls, Decl(mod1.ts, 2, 8)) - -Cls.prototype.foo = function() { return undefined; } ->Cls.prototype.foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19)) ->Cls.prototype : Symbol(Cls.prototype) ->Cls : Symbol(Cls, Decl(mod1.ts, 2, 8)) ->prototype : Symbol(Cls.prototype) ->foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19)) ->undefined : Symbol(undefined) - -declare module "./main" { ->"./main" : Symbol("/main", Decl(main.ts, 0, 0), Decl(mod1.ts, 3, 52)) - - interface Cls { ->Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5)) - - foo(): Lib; ->foo : Symbol(Cls.foo, Decl(mod1.ts, 6, 19)) ->Lib : Symbol(Lib, Decl(index.d.ts, 0, 0)) - } - namespace Cls { ->Cls : Symbol(Cls, Decl(main.ts, 0, 0), Decl(mod1.ts, 5, 25), Decl(mod1.ts, 8, 5)) - - function bar(): Lib; ->bar : Symbol(bar, Decl(mod1.ts, 9, 19)) ->Lib : Symbol(Lib, Decl(index.d.ts, 0, 0)) - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.trace.json b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.trace.json deleted file mode 100644 index 87b47e2ca4..0000000000 --- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.trace.json +++ /dev/null @@ -1,38 +0,0 @@ -======== Resolving module './main' from '/mod2.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/main', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/main.ts' exists - use it as a name resolution result. -======== Module name './main' was successfully resolved to '/main.ts'. ======== -======== Resolving module './mod1' from '/mod2.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/mod1', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/mod1.ts' exists - use it as a name resolution result. -======== Module name './mod1' was successfully resolved to '/mod1.ts'. ======== -======== Resolving type reference directive 'lib', containing file '/mod1.ts', root directory '/types'. ======== -Resolving with primary search path '/types'. -File '/types/lib.d.ts' does not exist. -File '/types/lib/package.json' does not exist. -File '/types/lib/index.d.ts' exists - use it as a name resolution result. -Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'. -======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ======== -======== Resolving module './main' from '/mod1.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/main', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/main.ts' exists - use it as a name resolution result. -======== Module name './main' was successfully resolved to '/main.ts'. ======== -======== Resolving module './main' from '/mod1.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -Loading module as file / folder, candidate module location '/main', target file types: TypeScript, JavaScript, Declaration, JSON. -File '/main.ts' exists - use it as a name resolution result. -======== Module name './main' was successfully resolved to '/main.ts'. ======== -======== Resolving type reference directive 'lib', containing file '/__inferred type names__.ts', root directory '/types'. ======== -Resolving with primary search path '/types'. -File '/types/lib.d.ts' does not exist according to earlier cached lookups. -File '/types/lib/package.json' does not exist according to earlier cached lookups. -File '/types/lib/index.d.ts' exists - use it as a name resolution result. -Resolving real path for '/types/lib/index.d.ts', result '/types/lib/index.d.ts'. -======== Type reference directive 'lib' was successfully resolved to '/types/lib/index.d.ts', primary: true. ======== diff --git a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types b/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types deleted file mode 100644 index 13ed09d5f9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/typeReferenceDirectives12.types +++ /dev/null @@ -1,70 +0,0 @@ -//// [tests/cases/compiler/typeReferenceDirectives12.ts] //// - -=== /mod2.ts === -import { Cls } from "./main"; ->Cls : typeof Cls - -import "./mod1"; - -export const cls = Cls; ->cls : typeof Cls ->Cls : typeof Cls - -export const foo = new Cls().foo(); ->foo : Lib ->new Cls().foo() : Lib ->new Cls().foo : () => Lib ->new Cls() : Cls ->Cls : typeof Cls ->foo : () => Lib - -export const bar = Cls.bar(); ->bar : Lib ->Cls.bar() : Lib ->Cls.bar : () => Lib ->Cls : typeof Cls ->bar : () => Lib - -=== /types/lib/index.d.ts === -interface Lib { x } ->x : any - -=== /main.ts === -export class Cls { ->Cls : Cls - - x ->x : any -} - -=== /mod1.ts === -/// - -import {Cls} from "./main"; ->Cls : typeof Cls - -Cls.prototype.foo = function() { return undefined; } ->Cls.prototype.foo = function() { return undefined; } : () => any ->Cls.prototype.foo : () => Lib ->Cls.prototype : Cls ->Cls : typeof Cls ->prototype : Cls ->foo : () => Lib ->function() { return undefined; } : () => any ->undefined : undefined - -declare module "./main" { ->"./main" : typeof import("/main") - - interface Cls { - foo(): Lib; ->foo : () => Lib - } - namespace Cls { ->Cls : typeof Cls - - function bar(): Lib; ->bar : () => Lib - } -} - diff --git a/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.errors.txt b/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.errors.txt new file mode 100644 index 0000000000..76f4d379db --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.errors.txt @@ -0,0 +1,28 @@ +world.ts(4,1): error TS2693: 'HelloInterface' only refers to a type, but is being used as a value here. +world.ts(5,1): error TS2708: Cannot use namespace 'HelloNamespace' as a value. + + +==== world.ts (2 errors) ==== + import HelloInterface = require("./helloInterface"); + import HelloNamespace = require("./helloNamespace"); + + HelloInterface.world; + ~~~~~~~~~~~~~~ +!!! error TS2693: 'HelloInterface' only refers to a type, but is being used as a value here. + HelloNamespace.world; + ~~~~~~~~~~~~~~ +!!! error TS2708: Cannot use namespace 'HelloNamespace' as a value. +==== helloInterface.ts (0 errors) ==== + interface HelloInterface { + world: any; + } + + export = HelloInterface; + +==== helloNamespace.ts (0 errors) ==== + namespace HelloNamespace { + export type world = any; + } + + export = HelloNamespace; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.js b/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.js new file mode 100644 index 0000000000..4e69754c6e --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.js @@ -0,0 +1,34 @@ +//// [tests/cases/compiler/typeUsedAsValueError2.ts] //// + +//// [helloInterface.ts] +interface HelloInterface { + world: any; +} + +export = HelloInterface; + +//// [helloNamespace.ts] +namespace HelloNamespace { + export type world = any; +} + +export = HelloNamespace; + +//// [world.ts] +import HelloInterface = require("./helloInterface"); +import HelloNamespace = require("./helloNamespace"); + +HelloInterface.world; +HelloNamespace.world; + +//// [helloInterface.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//// [helloNamespace.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +//// [world.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +HelloInterface.world; +HelloNamespace.world; diff --git a/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.symbols b/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.symbols new file mode 100644 index 0000000000..2675ab57ab --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.symbols @@ -0,0 +1,33 @@ +//// [tests/cases/compiler/typeUsedAsValueError2.ts] //// + +=== world.ts === +import HelloInterface = require("./helloInterface"); +>HelloInterface : Symbol(HelloInterface, Decl(world.ts, 0, 0)) + +import HelloNamespace = require("./helloNamespace"); +>HelloNamespace : Symbol(HelloNamespace, Decl(world.ts, 0, 52)) + +HelloInterface.world; +HelloNamespace.world; +=== helloInterface.ts === +interface HelloInterface { +>HelloInterface : Symbol(HelloInterface, Decl(helloInterface.ts, 0, 0)) + + world: any; +>world : Symbol(HelloInterface.world, Decl(helloInterface.ts, 0, 26)) +} + +export = HelloInterface; +>HelloInterface : Symbol(HelloInterface, Decl(helloInterface.ts, 0, 0)) + +=== helloNamespace.ts === +namespace HelloNamespace { +>HelloNamespace : Symbol(HelloNamespace, Decl(helloNamespace.ts, 0, 0)) + + export type world = any; +>world : Symbol(world, Decl(helloNamespace.ts, 0, 26)) +} + +export = HelloNamespace; +>HelloNamespace : Symbol(HelloNamespace, Decl(helloNamespace.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.types b/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.types new file mode 100644 index 0000000000..b904333f88 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/typeUsedAsValueError2.types @@ -0,0 +1,37 @@ +//// [tests/cases/compiler/typeUsedAsValueError2.ts] //// + +=== world.ts === +import HelloInterface = require("./helloInterface"); +>HelloInterface : any + +import HelloNamespace = require("./helloNamespace"); +>HelloNamespace : any + +HelloInterface.world; +>HelloInterface.world : any +>HelloInterface : any +>world : any + +HelloNamespace.world; +>HelloNamespace.world : any +>HelloNamespace : any +>world : any + +=== helloInterface.ts === +interface HelloInterface { + world: any; +>world : any +} + +export = HelloInterface; +>HelloInterface : HelloInterface + +=== helloNamespace.ts === +namespace HelloNamespace { + export type world = any; +>world : any +} + +export = HelloNamespace; +>HelloNamespace : any + diff --git a/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.errors.txt b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.errors.txt new file mode 100644 index 0000000000..2960755565 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.errors.txt @@ -0,0 +1,29 @@ +undeclaredModuleError.ts(1,21): error TS2307: Cannot find module 'fs' or its corresponding type declarations. +undeclaredModuleError.ts(8,29): error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: fs.Stats, name: string) => boolean'. + Type 'void' is not assignable to type 'boolean'. +undeclaredModuleError.ts(11,41): error TS2304: Cannot find name 'IDoNotExist'. + + +==== undeclaredModuleError.ts (3 errors) ==== + import fs = require('fs'); + ~~~~ +!!! error TS2307: Cannot find module 'fs' or its corresponding type declarations. + function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void ) {} + + function join(...paths: string[]) {} + + function instrumentFile(covFileDir: string, covFileName: string, originalFilePath: string) { + fs.readFile(originalFilePath, () => { + readdir(covFileDir, () => { + ~~~~~~~ +!!! error TS2345: Argument of type '() => void' is not assignable to parameter of type '(stat: fs.Stats, name: string) => boolean'. +!!! error TS2345: Type 'void' is not assignable to type 'boolean'. + } , (error: Error, files: {}[]) => { + files.forEach((file) => { + var fullPath = join(IDoNotExist); + ~~~~~~~~~~~ +!!! error TS2304: Cannot find name 'IDoNotExist'. + } ); + } ); + } ); + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.js b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.js new file mode 100644 index 0000000000..1ae60cc8f4 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.js @@ -0,0 +1,35 @@ +//// [tests/cases/compiler/undeclaredModuleError.ts] //// + +//// [undeclaredModuleError.ts] +import fs = require('fs'); +function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void ) {} + +function join(...paths: string[]) {} + +function instrumentFile(covFileDir: string, covFileName: string, originalFilePath: string) { + fs.readFile(originalFilePath, () => { + readdir(covFileDir, () => { + } , (error: Error, files: {}[]) => { + files.forEach((file) => { + var fullPath = join(IDoNotExist); + } ); + } ); + } ); +} + +//// [undeclaredModuleError.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const fs = require("fs"); +function readdir(path, accept, callback) { } +function join(...paths) { } +function instrumentFile(covFileDir, covFileName, originalFilePath) { + fs.readFile(originalFilePath, () => { + readdir(covFileDir, () => { + }, (error, files) => { + files.forEach((file) => { + var fullPath = join(IDoNotExist); + }); + }); + }); +} diff --git a/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.js.diff b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.js.diff new file mode 100644 index 0000000000..9866ffc5f5 --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.js.diff @@ -0,0 +1,11 @@ +--- old.undeclaredModuleError.js ++++ new.undeclaredModuleError.js +@@= skipped -19, +19 lines =@@ + //// [undeclaredModuleError.js] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-var fs = require("fs"); ++const fs = require("fs"); + function readdir(path, accept, callback) { } + function join(...paths) { } + function instrumentFile(covFileDir, covFileName, originalFilePath) { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.symbols b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.symbols new file mode 100644 index 0000000000..d4cbbddd7f --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.symbols @@ -0,0 +1,60 @@ +//// [tests/cases/compiler/undeclaredModuleError.ts] //// + +=== undeclaredModuleError.ts === +import fs = require('fs'); +>fs : Symbol(fs, Decl(undeclaredModuleError.ts, 0, 0)) + +function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void ) {} +>readdir : Symbol(readdir, Decl(undeclaredModuleError.ts, 0, 26)) +>path : Symbol(path, Decl(undeclaredModuleError.ts, 1, 17)) +>accept : Symbol(accept, Decl(undeclaredModuleError.ts, 1, 30)) +>stat : Symbol(stat, Decl(undeclaredModuleError.ts, 1, 40)) +>fs : Symbol(fs, Decl(undeclaredModuleError.ts, 0, 0)) +>Stats : Symbol(fs.Stats) +>name : Symbol(name, Decl(undeclaredModuleError.ts, 1, 55)) +>callback : Symbol(callback, Decl(undeclaredModuleError.ts, 1, 81)) +>error : Symbol(error, Decl(undeclaredModuleError.ts, 1, 93)) +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>results : Symbol(results, Decl(undeclaredModuleError.ts, 1, 106)) +>name : Symbol(name, Decl(undeclaredModuleError.ts, 1, 117)) +>stat : Symbol(stat, Decl(undeclaredModuleError.ts, 1, 131)) +>fs : Symbol(fs, Decl(undeclaredModuleError.ts, 0, 0)) +>Stats : Symbol(fs.Stats) + +function join(...paths: string[]) {} +>join : Symbol(join, Decl(undeclaredModuleError.ts, 1, 165)) +>paths : Symbol(paths, Decl(undeclaredModuleError.ts, 3, 14)) + +function instrumentFile(covFileDir: string, covFileName: string, originalFilePath: string) { +>instrumentFile : Symbol(instrumentFile, Decl(undeclaredModuleError.ts, 3, 36)) +>covFileDir : Symbol(covFileDir, Decl(undeclaredModuleError.ts, 5, 24)) +>covFileName : Symbol(covFileName, Decl(undeclaredModuleError.ts, 5, 43)) +>originalFilePath : Symbol(originalFilePath, Decl(undeclaredModuleError.ts, 5, 64)) + + fs.readFile(originalFilePath, () => { +>fs : Symbol(fs, Decl(undeclaredModuleError.ts, 0, 0)) +>originalFilePath : Symbol(originalFilePath, Decl(undeclaredModuleError.ts, 5, 64)) + + readdir(covFileDir, () => { +>readdir : Symbol(readdir, Decl(undeclaredModuleError.ts, 0, 26)) +>covFileDir : Symbol(covFileDir, Decl(undeclaredModuleError.ts, 5, 24)) + + } , (error: Error, files: {}[]) => { +>error : Symbol(error, Decl(undeclaredModuleError.ts, 8, 13)) +>Error : Symbol(Error, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) +>files : Symbol(files, Decl(undeclaredModuleError.ts, 8, 26)) + + files.forEach((file) => { +>files.forEach : Symbol(Array.forEach, Decl(lib.es5.d.ts, --, --)) +>files : Symbol(files, Decl(undeclaredModuleError.ts, 8, 26)) +>forEach : Symbol(Array.forEach, Decl(lib.es5.d.ts, --, --)) +>file : Symbol(file, Decl(undeclaredModuleError.ts, 9, 31)) + + var fullPath = join(IDoNotExist); +>fullPath : Symbol(fullPath, Decl(undeclaredModuleError.ts, 10, 23)) +>join : Symbol(join, Decl(undeclaredModuleError.ts, 1, 165)) + + } ); + } ); + } ); +} diff --git a/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.types b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.types new file mode 100644 index 0000000000..c64f33031d --- /dev/null +++ b/testdata/baselines/reference/submodule/compiler/undeclaredModuleError.types @@ -0,0 +1,67 @@ +//// [tests/cases/compiler/undeclaredModuleError.ts] //// + +=== undeclaredModuleError.ts === +import fs = require('fs'); +>fs : any + +function readdir(path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void ) {} +>readdir : (path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void) => void +>path : string +>accept : (stat: fs.Stats, name: string) => boolean +>stat : fs.Stats +>fs : any +>name : string +>callback : (error: Error, results: { name: string; stat: fs.Stats; }[]) => void +>error : Error +>results : { name: string; stat: fs.Stats; }[] +>name : string +>stat : fs.Stats +>fs : any + +function join(...paths: string[]) {} +>join : (...paths: string[]) => void +>paths : string[] + +function instrumentFile(covFileDir: string, covFileName: string, originalFilePath: string) { +>instrumentFile : (covFileDir: string, covFileName: string, originalFilePath: string) => void +>covFileDir : string +>covFileName : string +>originalFilePath : string + + fs.readFile(originalFilePath, () => { +>fs.readFile(originalFilePath, () => { readdir(covFileDir, () => { } , (error: Error, files: {}[]) => { files.forEach((file) => { var fullPath = join(IDoNotExist); } ); } ); } ) : any +>fs.readFile : any +>fs : any +>readFile : any +>originalFilePath : string +>() => { readdir(covFileDir, () => { } , (error: Error, files: {}[]) => { files.forEach((file) => { var fullPath = join(IDoNotExist); } ); } ); } : () => void + + readdir(covFileDir, () => { +>readdir(covFileDir, () => { } , (error: Error, files: {}[]) => { files.forEach((file) => { var fullPath = join(IDoNotExist); } ); } ) : void +>readdir : (path: string, accept: (stat: fs.Stats, name: string) => boolean, callback: (error: Error, results: { name: string; stat: fs.Stats; }[]) => void) => void +>covFileDir : string +>() => { } : () => void + + } , (error: Error, files: {}[]) => { +>(error: Error, files: {}[]) => { files.forEach((file) => { var fullPath = join(IDoNotExist); } ); } : (error: Error, files: {}[]) => void +>error : Error +>files : {}[] + + files.forEach((file) => { +>files.forEach((file) => { var fullPath = join(IDoNotExist); } ) : void +>files.forEach : (callbackfn: (value: {}, index: number, array: {}[]) => void, thisArg?: any) => void +>files : {}[] +>forEach : (callbackfn: (value: {}, index: number, array: {}[]) => void, thisArg?: any) => void +>(file) => { var fullPath = join(IDoNotExist); } : (file: {}) => void +>file : {} + + var fullPath = join(IDoNotExist); +>fullPath : void +>join(IDoNotExist) : void +>join : (...paths: string[]) => void +>IDoNotExist : any + + } ); + } ); + } ); +} diff --git a/testdata/baselines/reference/submodule/compiler/unusedImports11.js b/testdata/baselines/reference/submodule/compiler/unusedImports11.js index 5980488861..78e1093d2b 100644 --- a/testdata/baselines/reference/submodule/compiler/unusedImports11.js +++ b/testdata/baselines/reference/submodule/compiler/unusedImports11.js @@ -27,10 +27,43 @@ exports.Member = Member; exports.default = Member; //// [a.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); const b_1 = require("./b"); -const b_2 = require("./b"); -const ns = require("./b"); +const b_2 = __importStar(require("./b")); +const ns = __importStar(require("./b")); const r = require("./b"); new b_1.Member(); new b_2.default(); diff --git a/testdata/baselines/reference/submodule/compiler/unusedImports11.js.diff b/testdata/baselines/reference/submodule/compiler/unusedImports11.js.diff index 1835269fb2..a3893c6a99 100644 --- a/testdata/baselines/reference/submodule/compiler/unusedImports11.js.diff +++ b/testdata/baselines/reference/submodule/compiler/unusedImports11.js.diff @@ -1,16 +1,16 @@ --- old.unusedImports11.js +++ new.unusedImports11.js -@@= skipped -27, +27 lines =@@ - //// [a.js] - "use strict"; +@@= skipped -60, +60 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); -var b_1 = require("./b"); --var b_2 = require("./b"); --var ns = require("./b"); +-var b_2 = __importStar(require("./b")); +-var ns = __importStar(require("./b")); -var r = require("./b"); +const b_1 = require("./b"); -+const b_2 = require("./b"); -+const ns = require("./b"); ++const b_2 = __importStar(require("./b")); ++const ns = __importStar(require("./b")); +const r = require("./b"); new b_1.Member(); new b_2.default(); diff --git a/testdata/baselines/reference/submodule/compiler/unusedImports11.types b/testdata/baselines/reference/submodule/compiler/unusedImports11.types index 0cea17b77c..5f9de51f37 100644 --- a/testdata/baselines/reference/submodule/compiler/unusedImports11.types +++ b/testdata/baselines/reference/submodule/compiler/unusedImports11.types @@ -13,7 +13,7 @@ import * as ns from './b'; >ns : typeof ns import r = require("./b"); ->r : typeof ns +>r : typeof r new Member(); >new Member() : Member @@ -36,7 +36,7 @@ new ns.Member(); new r.Member(); >new r.Member() : Member >r.Member : typeof Member ->r : typeof ns +>r : typeof r >Member : typeof Member === b.ts === diff --git a/testdata/baselines/reference/submodule/compiler/unusedImports12.types b/testdata/baselines/reference/submodule/compiler/unusedImports12.types index 8a43ebda90..3381cb2cdd 100644 --- a/testdata/baselines/reference/submodule/compiler/unusedImports12.types +++ b/testdata/baselines/reference/submodule/compiler/unusedImports12.types @@ -13,7 +13,7 @@ import * as ns from './b'; >ns : typeof ns import r = require("./b"); ->r : typeof ns +>r : typeof r === b.ts === export class Member {} diff --git a/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.js b/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.js index 5daba2569c..f3dc3eaf2b 100644 --- a/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.js +++ b/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.js @@ -26,10 +26,46 @@ exports.b = 0; exports.default = 0; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); a_1.default; -const a_2 = require("./a"); +const a_2 = __importDefault(require("./a")); a_2.default; -const ns3 = require("./a"); +const ns3 = __importStar(require("./a")); ns3; diff --git a/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.js.diff b/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.js.diff index 26b1fdf401..5cba8c13b0 100644 --- a/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.js.diff +++ b/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.js.diff @@ -1,15 +1,15 @@ --- old.unusedImports_entireImportDeclaration.js +++ new.unusedImports_entireImportDeclaration.js -@@= skipped -26, +26 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -62, +62 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var a_1 = require("./a"); -+const a_1 = require("./a"); +-var a_1 = __importDefault(require("./a")); ++const a_1 = __importDefault(require("./a")); a_1.default; --var a_2 = require("./a"); -+const a_2 = require("./a"); +-var a_2 = __importDefault(require("./a")); ++const a_2 = __importDefault(require("./a")); a_2.default; --var ns3 = require("./a"); -+const ns3 = require("./a"); +-var ns3 = __importStar(require("./a")); ++const ns3 = __importStar(require("./a")); ns3; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.types b/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.types index 8154041670..921ac72372 100644 --- a/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.types +++ b/testdata/baselines/reference/submodule/compiler/unusedImports_entireImportDeclaration.types @@ -35,15 +35,15 @@ d3; import d4, * as ns2 from "./a"; >d4 : 0 ->ns2 : typeof ns +>ns2 : typeof ns2 d4; >d4 : 0 import d5, * as ns3 from "./a"; >d5 : 0 ->ns3 : typeof ns +>ns3 : typeof ns3 ns3; ->ns3 : typeof ns +>ns3 : typeof ns3 diff --git a/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.errors.txt b/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.errors.txt deleted file mode 100644 index dd1e3a68ff..0000000000 --- a/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.errors.txt +++ /dev/null @@ -1,23 +0,0 @@ -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== A.ts (0 errors) ==== - namespace ts { - export function printVersion():void { - log("Version: " + sys.version); // the call of sys.version is deferred, should not report an error. - } - - export function log(info:string):void { - - } - } - -==== B.ts (0 errors) ==== - namespace ts { - - export let sys:{version:string} = {version: "2.0.5"}; - - } - - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.symbols b/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.symbols deleted file mode 100644 index 1cc4b7e369..0000000000 --- a/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.symbols +++ /dev/null @@ -1,35 +0,0 @@ -//// [tests/cases/compiler/useBeforeDeclaration.ts] //// - -=== A.ts === -namespace ts { ->ts : Symbol(ts, Decl(A.ts, 0, 0), Decl(B.ts, 0, 0)) - - export function printVersion():void { ->printVersion : Symbol(printVersion, Decl(A.ts, 0, 14)) - - log("Version: " + sys.version); // the call of sys.version is deferred, should not report an error. ->log : Symbol(log, Decl(A.ts, 3, 5)) ->sys.version : Symbol(version, Decl(B.ts, 2, 20)) ->sys : Symbol(sys, Decl(B.ts, 2, 14)) ->version : Symbol(version, Decl(B.ts, 2, 20)) - } - - export function log(info:string):void { ->log : Symbol(log, Decl(A.ts, 3, 5)) ->info : Symbol(info, Decl(A.ts, 5, 24)) - - } -} - -=== B.ts === -namespace ts { ->ts : Symbol(ts, Decl(A.ts, 0, 0), Decl(B.ts, 0, 0)) - - export let sys:{version:string} = {version: "2.0.5"}; ->sys : Symbol(sys, Decl(B.ts, 2, 14)) ->version : Symbol(version, Decl(B.ts, 2, 20)) ->version : Symbol(version, Decl(B.ts, 2, 39)) - -} - - diff --git a/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.types b/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.types deleted file mode 100644 index 7856710cc9..0000000000 --- a/testdata/baselines/reference/submodule/compiler/useBeforeDeclaration.types +++ /dev/null @@ -1,40 +0,0 @@ -//// [tests/cases/compiler/useBeforeDeclaration.ts] //// - -=== A.ts === -namespace ts { ->ts : typeof ts - - export function printVersion():void { ->printVersion : () => void - - log("Version: " + sys.version); // the call of sys.version is deferred, should not report an error. ->log("Version: " + sys.version) : void ->log : (info: string) => void ->"Version: " + sys.version : string ->"Version: " : "Version: " ->sys.version : string ->sys : { version: string; } ->version : string - } - - export function log(info:string):void { ->log : (info: string) => void ->info : string - - } -} - -=== B.ts === -namespace ts { ->ts : typeof ts - - export let sys:{version:string} = {version: "2.0.5"}; ->sys : { version: string; } ->version : string ->{version: "2.0.5"} : { version: string; } ->version : string ->"2.0.5" : "2.0.5" - -} - - diff --git a/testdata/baselines/reference/submodule/conformance/allowImportingTsExtensions(moduleresolution=classic).errors.txt b/testdata/baselines/reference/submodule/conformance/allowImportingTsExtensions(moduleresolution=classic).errors.txt deleted file mode 100644 index 755f0d6eeb..0000000000 --- a/testdata/baselines/reference/submodule/conformance/allowImportingTsExtensions(moduleresolution=classic).errors.txt +++ /dev/null @@ -1,32 +0,0 @@ -/c.ts(1,16): error TS2307: Cannot find module './thisfiledoesnotexist.ts' or its corresponding type declarations. - - -==== /ts.ts (0 errors) ==== - export {}; - -==== /tsx.tsx (0 errors) ==== - export {}; - -==== /dts.d.ts (0 errors) ==== - export {}; - -==== /b.ts (0 errors) ==== - import {} from "./ts.js"; - import {} from "./ts.ts"; - import type {} from "./ts.d.ts"; - - import {} from "./tsx.js"; - import {} from "./tsx.jsx"; - import {} from "./tsx.ts"; - import {} from "./tsx.tsx"; - import type {} from "./tsx.d.ts"; - - import {} from "./dts.js"; - import {} from "./dts.ts"; - import type {} from "./dts.d.ts"; - -==== /c.ts (1 errors) ==== - import {} from "./thisfiledoesnotexist.ts"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2307: Cannot find module './thisfiledoesnotexist.ts' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/allowImportingTsExtensions(moduleresolution=classic).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/allowImportingTsExtensions(moduleresolution=classic).errors.txt.diff deleted file mode 100644 index 70441494b3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/allowImportingTsExtensions(moduleresolution=classic).errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.allowImportingTsExtensions(moduleresolution=classic).errors.txt -+++ new.allowImportingTsExtensions(moduleresolution=classic).errors.txt -@@= skipped -0, +0 lines =@@ --/c.ts(1,16): error TS2792: Cannot find module './thisfiledoesnotexist.ts'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+/c.ts(1,16): error TS2307: Cannot find module './thisfiledoesnotexist.ts' or its corresponding type declarations. - - - ==== /ts.ts (0 errors) ==== -@@= skipped -27, +27 lines =@@ - ==== /c.ts (1 errors) ==== - import {} from "./thisfiledoesnotexist.ts"; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~ --!!! error TS2792: Cannot find module './thisfiledoesnotexist.ts'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module './thisfiledoesnotexist.ts' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/ambientDeclarationsPatterns.js b/testdata/baselines/reference/submodule/conformance/ambientDeclarationsPatterns.js index 211c8d2715..3344d96b11 100644 --- a/testdata/baselines/reference/submodule/conformance/ambientDeclarationsPatterns.js +++ b/testdata/baselines/reference/submodule/conformance/ambientDeclarationsPatterns.js @@ -34,6 +34,9 @@ foo(fileText); //// [user.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); /// const foobarbaz_1 = require("foobarbaz"); @@ -41,5 +44,5 @@ const foobarbaz_1 = require("foobarbaz"); const foosball_1 = require("foosball"); (0, foobarbaz_1.foo)(foosball_1.foos); // Works with relative file name -const file_text_1 = require("./file!text"); +const file_text_1 = __importDefault(require("./file!text")); (0, foobarbaz_1.foo)(file_text_1.default); diff --git a/testdata/baselines/reference/submodule/conformance/ambientDeclarationsPatterns.js.diff b/testdata/baselines/reference/submodule/conformance/ambientDeclarationsPatterns.js.diff index 0eae008366..1827386202 100644 --- a/testdata/baselines/reference/submodule/conformance/ambientDeclarationsPatterns.js.diff +++ b/testdata/baselines/reference/submodule/conformance/ambientDeclarationsPatterns.js.diff @@ -1,7 +1,7 @@ --- old.ambientDeclarationsPatterns.js +++ new.ambientDeclarationsPatterns.js -@@= skipped -35, +35 lines =@@ - "use strict"; +@@= skipped -38, +38 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); /// -var foobarbaz_1 = require("foobarbaz"); @@ -11,6 +11,6 @@ +const foosball_1 = require("foosball"); (0, foobarbaz_1.foo)(foosball_1.foos); // Works with relative file name --var file_text_1 = require("./file!text"); -+const file_text_1 = require("./file!text"); +-var file_text_1 = __importDefault(require("./file!text")); ++const file_text_1 = __importDefault(require("./file!text")); (0, foobarbaz_1.foo)(file_text_1.default); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt b/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt new file mode 100644 index 0000000000..dc26b6b386 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.errors.txt @@ -0,0 +1,10 @@ +ambientExternalModuleInsideNonAmbientExternalModule.ts(1,1): error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible. +ambientExternalModuleInsideNonAmbientExternalModule.ts(1,23): error TS2664: Invalid module name in augmentation, module 'M' cannot be found. + + +==== ambientExternalModuleInsideNonAmbientExternalModule.ts (2 errors) ==== + export declare module "M" { } + ~~~~~~ +!!! error TS2668: 'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible. + ~~~ +!!! error TS2664: Invalid module name in augmentation, module 'M' cannot be found. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.js b/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.js new file mode 100644 index 0000000000..e32c911b48 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.js @@ -0,0 +1,8 @@ +//// [tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts] //// + +//// [ambientExternalModuleInsideNonAmbientExternalModule.ts] +export declare module "M" { } + +//// [ambientExternalModuleInsideNonAmbientExternalModule.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.symbols b/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.symbols new file mode 100644 index 0000000000..0730dd9219 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.symbols @@ -0,0 +1,6 @@ +//// [tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts] //// + +=== ambientExternalModuleInsideNonAmbientExternalModule.ts === +export declare module "M" { } +>"M" : Symbol("M", Decl(ambientExternalModuleInsideNonAmbientExternalModule.ts, 0, 0)) + diff --git a/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.types b/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.types new file mode 100644 index 0000000000..4afe7f6368 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/ambientExternalModuleInsideNonAmbientExternalModule.types @@ -0,0 +1,6 @@ +//// [tests/cases/conformance/ambient/ambientExternalModuleInsideNonAmbientExternalModule.ts] //// + +=== ambientExternalModuleInsideNonAmbientExternalModule.ts === +export declare module "M" { } +>"M" : any + diff --git a/testdata/baselines/reference/submodule/conformance/ambientShorthand.js b/testdata/baselines/reference/submodule/conformance/ambientShorthand.js index fae8024bcd..e0fdb6a7dc 100644 --- a/testdata/baselines/reference/submodule/conformance/ambientShorthand.js +++ b/testdata/baselines/reference/submodule/conformance/ambientShorthand.js @@ -15,9 +15,42 @@ foo(bar, baz, boom); //// [user.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const jquery_1 = require("jquery"); -const baz = require("fs"); +const jquery_1 = __importStar(require("jquery")); +const baz = __importStar(require("fs")); const boom = require("jquery"); (0, jquery_1.default)(jquery_1.bar, baz, boom); diff --git a/testdata/baselines/reference/submodule/conformance/ambientShorthand.js.diff b/testdata/baselines/reference/submodule/conformance/ambientShorthand.js.diff index 290edfeeae..341c70f947 100644 --- a/testdata/baselines/reference/submodule/conformance/ambientShorthand.js.diff +++ b/testdata/baselines/reference/submodule/conformance/ambientShorthand.js.diff @@ -1,13 +1,13 @@ --- old.ambientShorthand.js +++ new.ambientShorthand.js -@@= skipped -16, +16 lines =@@ - "use strict"; +@@= skipped -49, +49 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var jquery_1 = require("jquery"); --var baz = require("fs"); +-var jquery_1 = __importStar(require("jquery")); +-var baz = __importStar(require("fs")); -var boom = require("jquery"); -+const jquery_1 = require("jquery"); -+const baz = require("fs"); ++const jquery_1 = __importStar(require("jquery")); ++const baz = __importStar(require("fs")); +const boom = require("jquery"); (0, jquery_1.default)(jquery_1.bar, baz, boom); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/ambientShorthand_reExport.js b/testdata/baselines/reference/submodule/conformance/ambientShorthand_reExport.js index e8776fed0c..9503b9b933 100644 --- a/testdata/baselines/reference/submodule/conformance/ambientShorthand_reExport.js +++ b/testdata/baselines/reference/submodule/conformance/ambientShorthand_reExport.js @@ -42,8 +42,41 @@ Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("jquery"), exports); //// [reExportUser.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); const reExportX_1 = require("./reExportX"); -const $ = require("./reExportAll"); +const $ = __importStar(require("./reExportAll")); // '$' is not callable, it is an object. (0, reExportX_1.x)($); diff --git a/testdata/baselines/reference/submodule/conformance/ambientShorthand_reExport.js.diff b/testdata/baselines/reference/submodule/conformance/ambientShorthand_reExport.js.diff index c32e4e0fd4..efd4bf49fc 100644 --- a/testdata/baselines/reference/submodule/conformance/ambientShorthand_reExport.js.diff +++ b/testdata/baselines/reference/submodule/conformance/ambientShorthand_reExport.js.diff @@ -9,13 +9,13 @@ Object.defineProperty(exports, "x", { enumerable: true, get: function () { return jquery_1.x; } }); //// [reExportAll.js] "use strict"; -@@= skipped -23, +23 lines =@@ - //// [reExportUser.js] - "use strict"; +@@= skipped -56, +56 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); -var reExportX_1 = require("./reExportX"); --var $ = require("./reExportAll"); +-var $ = __importStar(require("./reExportAll")); +const reExportX_1 = require("./reExportX"); -+const $ = require("./reExportAll"); ++const $ = __importStar(require("./reExportAll")); // '$' is not callable, it is an object. (0, reExportX_1.x)($); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js index d01954f66b..3c4b1a08c3 100644 --- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js +++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js @@ -34,6 +34,39 @@ const importStarTestA: typeC.otherType = "expect error about otherType"; //// [arbitraryModuleNamespaceIdentifiers_module.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports[""] = exports[""] = exports[""] = void 0; const someValue = "someValue"; @@ -46,7 +79,7 @@ Object.defineProperty(exports, "", { enumerable: true, get: function () { ret const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module"); if (arbitraryModuleNamespaceIdentifiers_module_3[""] !== "someValue") throw "should be someValue"; -exports[""] = require("./arbitraryModuleNamespaceIdentifiers_module"); +exports[""] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module")); const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module"); if (arbitraryModuleNamespaceIdentifiers_module_4[""][""] !== "someValue") throw "should be someValue"; diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js.diff index 22418ddc61..41cd60693f 100644 --- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js.diff +++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js.diff @@ -1,6 +1,6 @@ --- old.arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js +++ new.arbitraryModuleNamespaceIdentifiers_module(module=commonjs).js -@@= skipped -40, +40 lines =@@ +@@= skipped -73, +73 lines =@@ const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module"); if (arbitraryModuleNamespaceIdentifiers_module_1[""] !== "someValue") throw "should be someValue"; diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt.diff index b9f07a8d9e..2c4c6a5af8 100644 --- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt.diff +++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt.diff @@ -1,6 +1,7 @@ --- old.arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt +++ new.arbitraryModuleNamespaceIdentifiers_module(module=none).errors.txt @@= skipped -0, +0 lines =@@ +-error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. +arbitraryModuleNamespaceIdentifiers_module.ts(4,23): error TS18057: String literal import and export names are not supported when the '--module' flag is set to 'es2015' or 'es2020'. +arbitraryModuleNamespaceIdentifiers_module.ts(5,10): error TS18057: String literal import and export names are not supported when the '--module' flag is set to 'es2015' or 'es2020'. +arbitraryModuleNamespaceIdentifiers_module.ts(8,10): error TS18057: String literal import and export names are not supported when the '--module' flag is set to 'es2015' or 'es2020'. @@ -20,6 +21,7 @@ arbitraryModuleNamespaceIdentifiers_module.ts(29,7): error TS2322: Type '"expect error about otherType"' is not assignable to type '"otherType"'. +-!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -==== arbitraryModuleNamespaceIdentifiers_module.ts (3 errors) ==== +==== arbitraryModuleNamespaceIdentifiers_module.ts (17 errors) ==== const someValue = "someValue"; diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=none).js.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=none).js.diff index 00999f6f71..c5f7688041 100644 --- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=none).js.diff +++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=none).js.diff @@ -5,6 +5,39 @@ //// [arbitraryModuleNamespaceIdentifiers_module.js] -"use strict"; +-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { +- if (k2 === undefined) k2 = k; +- var desc = Object.getOwnPropertyDescriptor(m, k); +- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { +- desc = { enumerable: true, get: function() { return m[k]; } }; +- } +- Object.defineProperty(o, k2, desc); +-}) : (function(o, m, k, k2) { +- if (k2 === undefined) k2 = k; +- o[k2] = m[k]; +-})); +-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { +- Object.defineProperty(o, "default", { enumerable: true, value: v }); +-}) : function(o, v) { +- o["default"] = v; +-}); +-var __importStar = (this && this.__importStar) || (function () { +- var ownKeys = function(o) { +- ownKeys = Object.getOwnPropertyNames || function (o) { +- var ar = []; +- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; +- return ar; +- }; +- return ownKeys(o); +- }; +- return function (mod) { +- if (mod && mod.__esModule) return mod; +- var result = {}; +- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); +- __setModuleDefault(result, mod); +- return result; +- }; +-})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports[""] = exports[""] = exports[""] = void 0; const someValue = "someValue"; @@ -17,7 +50,7 @@ -const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module"); -if (arbitraryModuleNamespaceIdentifiers_module_3[""] !== "someValue") - throw "should be someValue"; --exports[""] = require("./arbitraryModuleNamespaceIdentifiers_module"); +-exports[""] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module")); -const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module"); -if (arbitraryModuleNamespaceIdentifiers_module_4[""][""] !== "someValue") - throw "should be someValue"; diff --git a/testdata/baselines/reference/submodule/conformance/asyncAwaitIsolatedModules_es2017.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/asyncAwaitIsolatedModules_es2017.errors.txt.diff deleted file mode 100644 index b84b370d05..0000000000 --- a/testdata/baselines/reference/submodule/conformance/asyncAwaitIsolatedModules_es2017.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.asyncAwaitIsolatedModules_es2017.errors.txt -+++ new.asyncAwaitIsolatedModules_es2017.errors.txt -@@= skipped -0, +0 lines =@@ --asyncAwaitIsolatedModules_es2017.ts(1,27): error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+asyncAwaitIsolatedModules_es2017.ts(1,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations. - - - ==== asyncAwaitIsolatedModules_es2017.ts (1 errors) ==== - import { MyPromise } from "missing"; - ~~~~~~~~~ --!!! error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations. - - declare var p: Promise; - declare var mp: MyPromise; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/asyncAwaitIsolatedModules_es6.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/asyncAwaitIsolatedModules_es6.errors.txt.diff deleted file mode 100644 index 9ee16a4ed7..0000000000 --- a/testdata/baselines/reference/submodule/conformance/asyncAwaitIsolatedModules_es6.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.asyncAwaitIsolatedModules_es6.errors.txt -+++ new.asyncAwaitIsolatedModules_es6.errors.txt -@@= skipped -0, +0 lines =@@ --asyncAwaitIsolatedModules_es6.ts(1,27): error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+asyncAwaitIsolatedModules_es6.ts(1,27): error TS2307: Cannot find module 'missing' or its corresponding type declarations. - - - ==== asyncAwaitIsolatedModules_es6.ts (1 errors) ==== - import { MyPromise } from "missing"; - ~~~~~~~~~ --!!! error TS2792: Cannot find module 'missing'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'missing' or its corresponding type declarations. - - declare var p: Promise; - declare var mp: MyPromise; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/autoAccessorDisallowedModifiers(target=es2017).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/autoAccessorDisallowedModifiers(target=es2017).errors.txt.diff deleted file mode 100644 index 40e6336c60..0000000000 --- a/testdata/baselines/reference/submodule/conformance/autoAccessorDisallowedModifiers(target=es2017).errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.autoAccessorDisallowedModifiers(target=es2017).errors.txt -+++ new.autoAccessorDisallowedModifiers(target=es2017).errors.txt -@@= skipped -23, +23 lines =@@ - autoAccessorDisallowedModifiers.ts(33,1): error TS1275: 'accessor' modifier can only appear on a property declaration. - autoAccessorDisallowedModifiers.ts(34,1): error TS1275: 'accessor' modifier can only appear on a property declaration. - autoAccessorDisallowedModifiers.ts(35,1): error TS1275: 'accessor' modifier can only appear on a property declaration. --autoAccessorDisallowedModifiers.ts(35,25): error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+autoAccessorDisallowedModifiers.ts(35,25): error TS2307: Cannot find module 'x' or its corresponding type declarations. - autoAccessorDisallowedModifiers.ts(36,1): error TS1275: 'accessor' modifier can only appear on a property declaration. - autoAccessorDisallowedModifiers.ts(37,1): error TS1275: 'accessor' modifier can only appear on a property declaration. - autoAccessorDisallowedModifiers.ts(38,1): error TS1275: 'accessor' modifier can only appear on a property declaration. -@@= skipped -95, +95 lines =@@ - ~~~~~~~~ - !!! error TS1275: 'accessor' modifier can only appear on a property declaration. - ~~~ --!!! error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'x' or its corresponding type declarations. - accessor export { V1 }; - ~~~~~~~~ - !!! error TS1275: 'accessor' modifier can only appear on a property declaration. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/autoAccessorDisallowedModifiers(target=esnext).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/autoAccessorDisallowedModifiers(target=esnext).errors.txt.diff deleted file mode 100644 index 5993f8df85..0000000000 --- a/testdata/baselines/reference/submodule/conformance/autoAccessorDisallowedModifiers(target=esnext).errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.autoAccessorDisallowedModifiers(target=esnext).errors.txt -+++ new.autoAccessorDisallowedModifiers(target=esnext).errors.txt -@@= skipped -23, +23 lines =@@ - autoAccessorDisallowedModifiers.ts(33,1): error TS1275: 'accessor' modifier can only appear on a property declaration. - autoAccessorDisallowedModifiers.ts(34,1): error TS1275: 'accessor' modifier can only appear on a property declaration. - autoAccessorDisallowedModifiers.ts(35,1): error TS1275: 'accessor' modifier can only appear on a property declaration. --autoAccessorDisallowedModifiers.ts(35,25): error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+autoAccessorDisallowedModifiers.ts(35,25): error TS2307: Cannot find module 'x' or its corresponding type declarations. - autoAccessorDisallowedModifiers.ts(36,1): error TS1275: 'accessor' modifier can only appear on a property declaration. - autoAccessorDisallowedModifiers.ts(37,1): error TS1275: 'accessor' modifier can only appear on a property declaration. - autoAccessorDisallowedModifiers.ts(38,1): error TS1275: 'accessor' modifier can only appear on a property declaration. -@@= skipped -95, +95 lines =@@ - ~~~~~~~~ - !!! error TS1275: 'accessor' modifier can only appear on a property declaration. - ~~~ --!!! error TS2792: Cannot find module 'x'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'x' or its corresponding type declarations. - accessor export { V1 }; - ~~~~~~~~ - !!! error TS1275: 'accessor' modifier can only appear on a property declaration. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/chained2.js b/testdata/baselines/reference/submodule/conformance/chained2.js index 5dfe2c8d1a..d68d24e019 100644 --- a/testdata/baselines/reference/submodule/conformance/chained2.js +++ b/testdata/baselines/reference/submodule/conformance/chained2.js @@ -32,14 +32,50 @@ class A { Object.defineProperty(exports, "__esModule", { value: true }); //// [c.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; -const types = require("./b"); +const types = __importStar(require("./b")); exports.default = types; //// [d.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const c_1 = require("./c"); +const c_1 = __importDefault(require("./c")); new c_1.default.A(); new c_1.default.B(); const a = {}; diff --git a/testdata/baselines/reference/submodule/conformance/chained2.js.diff b/testdata/baselines/reference/submodule/conformance/chained2.js.diff index 14f994cbda..e736344345 100644 --- a/testdata/baselines/reference/submodule/conformance/chained2.js.diff +++ b/testdata/baselines/reference/submodule/conformance/chained2.js.diff @@ -8,18 +8,21 @@ } //// [b.js] "use strict"; -@@= skipped -8, +9 lines =@@ - "use strict"; +@@= skipped -41, +42 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; --var types = require("./b"); -+const types = require("./b"); +-var types = __importStar(require("./b")); ++const types = __importStar(require("./b")); exports.default = types; //// [d.js] "use strict"; +@@= skipped -8, +8 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var c_1 = require("./c"); -+const c_1 = require("./c"); +-var c_1 = __importDefault(require("./c")); ++const c_1 = __importDefault(require("./c")); new c_1.default.A(); new c_1.default.B(); const a = {}; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.errors.txt b/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.errors.txt deleted file mode 100644 index 1ebf96cdaf..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -error TS5055: Cannot write file 'eof.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -eof.js(2,20): error TS2304: Cannot find name 'bad'. - - -!!! error TS5055: Cannot write file 'eof.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== eof.js (1 errors) ==== - /** - * @typedef {Array} Should have error here - ~~~ -!!! error TS2304: Cannot find name 'bad'. - */ - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.symbols b/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.symbols deleted file mode 100644 index 3ee1c8ce74..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.symbols +++ /dev/null @@ -1,8 +0,0 @@ -//// [tests/cases/conformance/jsdoc/checkJsdocOnEndOfFile.ts] //// - -=== eof.js === - -/** - * @typedef {Array} Should have error here - */ - diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.types b/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.types deleted file mode 100644 index 3ee1c8ce74..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocOnEndOfFile.types +++ /dev/null @@ -1,8 +0,0 @@ -//// [tests/cases/conformance/jsdoc/checkJsdocOnEndOfFile.ts] //// - -=== eof.js === - -/** - * @typedef {Array} Should have error here - */ - diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.errors.txt b/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.errors.txt deleted file mode 100644 index d34f12577f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.errors.txt +++ /dev/null @@ -1,34 +0,0 @@ -error TS5055: Cannot write file 'returns.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -returns.js(20,12): error TS2872: This kind of expression is always truthy. - - -!!! error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== returns.js (1 errors) ==== - // @ts-check - /** - * @returns {string} This comment is not currently exposed - */ - function f() { - return "hello"; - } - - /** - * @returns {string=} This comment is not currently exposed - */ - function f1() { - return "hello world"; - } - - /** - * @returns {string|number} This comment is not currently exposed - */ - function f2() { - return 5 || "hello"; - ~ -!!! error TS2872: This kind of expression is always truthy. - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.symbols b/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.symbols deleted file mode 100644 index 787e4f4d61..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.symbols +++ /dev/null @@ -1,31 +0,0 @@ -//// [tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts] //// - -=== returns.js === -// @ts-check -/** - * @returns {string} This comment is not currently exposed - */ -function f() { ->f : Symbol(f, Decl(returns.js, 0, 0)) - - return "hello"; -} - -/** - * @returns {string=} This comment is not currently exposed - */ -function f1() { ->f1 : Symbol(f1, Decl(returns.js, 6, 1)) - - return "hello world"; -} - -/** - * @returns {string|number} This comment is not currently exposed - */ -function f2() { ->f2 : Symbol(f2, Decl(returns.js, 13, 1)) - - return 5 || "hello"; -} - diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.types b/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.types deleted file mode 100644 index 39f1932261..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag1.types +++ /dev/null @@ -1,36 +0,0 @@ -//// [tests/cases/conformance/jsdoc/checkJsdocReturnTag1.ts] //// - -=== returns.js === -// @ts-check -/** - * @returns {string} This comment is not currently exposed - */ -function f() { ->f : () => string - - return "hello"; ->"hello" : "hello" -} - -/** - * @returns {string=} This comment is not currently exposed - */ -function f1() { ->f1 : () => string - - return "hello world"; ->"hello world" : "hello world" -} - -/** - * @returns {string|number} This comment is not currently exposed - */ -function f2() { ->f2 : () => string | number - - return 5 || "hello"; ->5 || "hello" : "hello" | 5 ->5 : 5 ->"hello" : "hello" -} - diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.errors.txt b/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.errors.txt deleted file mode 100644 index 7bc102364c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.errors.txt +++ /dev/null @@ -1,35 +0,0 @@ -error TS5055: Cannot write file 'returns.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -returns.js(6,5): error TS2322: Type 'number' is not assignable to type 'string'. -returns.js(13,5): error TS2322: Type 'number | boolean' is not assignable to type 'string | number'. - Type 'boolean' is not assignable to type 'string | number'. -returns.js(13,12): error TS2872: This kind of expression is always truthy. - - -!!! error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== returns.js (3 errors) ==== - // @ts-check - /** - * @returns {string} This comment is not currently exposed - */ - function f() { - return 5; - ~~~~~~ -!!! error TS2322: Type 'number' is not assignable to type 'string'. - } - - /** - * @returns {string | number} This comment is not currently exposed - */ - function f1() { - return 5 || true; - ~~~~~~ -!!! error TS2322: Type 'number | boolean' is not assignable to type 'string | number'. -!!! error TS2322: Type 'boolean' is not assignable to type 'string | number'. - ~ -!!! error TS2872: This kind of expression is always truthy. - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.symbols b/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.symbols deleted file mode 100644 index 7dcaa09d68..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.symbols +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts] //// - -=== returns.js === -// @ts-check -/** - * @returns {string} This comment is not currently exposed - */ -function f() { ->f : Symbol(f, Decl(returns.js, 0, 0)) - - return 5; -} - -/** - * @returns {string | number} This comment is not currently exposed - */ -function f1() { ->f1 : Symbol(f1, Decl(returns.js, 6, 1)) - - return 5 || true; -} - diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.types b/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.types deleted file mode 100644 index 6ad8c3fb20..0000000000 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocReturnTag2.types +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/conformance/jsdoc/checkJsdocReturnTag2.ts] //// - -=== returns.js === -// @ts-check -/** - * @returns {string} This comment is not currently exposed - */ -function f() { ->f : () => string - - return 5; ->5 : 5 -} - -/** - * @returns {string | number} This comment is not currently exposed - */ -function f1() { ->f1 : () => string | number - - return 5 || true; ->5 || true : 5 | true ->5 : 5 ->true : true -} - diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag5.types b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag5.types index d1b3e48372..c71a45abee 100644 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag5.types +++ b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag5.types @@ -46,7 +46,7 @@ var k = function (x) { return x } /** @typedef {(x: 'hi' | 'bye') => 0 | 1 | 2} Argle */ /** @type {Argle} */ function blargle(s) { ->blargle : (x: "bye" | "hi") => 0 | 1 | 2 +>blargle : (s: "bye" | "hi") => 0 | 1 | 2 >s : "bye" | "hi" return 0; @@ -57,7 +57,7 @@ function blargle(s) { var zeroonetwo = blargle('hi') >zeroonetwo : 0 | 1 | 2 >blargle('hi') : 0 | 1 | 2 ->blargle : (x: "bye" | "hi") => 0 | 1 | 2 +>blargle : (s: "bye" | "hi") => 0 | 1 | 2 >'hi' : "hi" /** @typedef {{(s: string): 0 | 1; (b: boolean): 2 | 3 }} Gioconda */ diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag6.types b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag6.types index 016eaa98db..0d78ca717a 100644 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag6.types +++ b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag6.types @@ -18,7 +18,7 @@ var g = function (prop) { /** @type {(a: number) => number} */ function add1(a, b) { return a + b; } ->add1 : (a: number) => number +>add1 : (a: number, b: any) => number >a : number >b : any >a + b : any @@ -37,7 +37,7 @@ function add2(a, b) { return a + b; } // TODO: Should be an error since signature doesn't match. /** @type {(a: number, b: number, c: number) => number} */ function add3(a, b) { return a + b; } ->add3 : (a: number, b: number, c: number) => number +>add3 : (a: number, b: number) => number >a : number >b : number >a + b : number @@ -49,7 +49,7 @@ function add3(a, b) { return a + b; } /** @type {() => void} */ function funcWithMoreParameters(more) {} // error ->funcWithMoreParameters : () => void +>funcWithMoreParameters : (more: any) => void >more : any /** @type {() => void} */ diff --git a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag7.types b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag7.types index 6899db3795..25ffbdd7c0 100644 --- a/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag7.types +++ b/testdata/baselines/reference/submodule/conformance/checkJsdocTypeTag7.types @@ -16,6 +16,6 @@ class C { /** @type {(optional?) => void} */ methodWithOptionalParameters() {} ->methodWithOptionalParameters : (optional?: any) => void +>methodWithOptionalParameters : () => void } diff --git a/testdata/baselines/reference/submodule/conformance/checkJsxGenericTagHasCorrectInferences.js b/testdata/baselines/reference/submodule/conformance/checkJsxGenericTagHasCorrectInferences.js index ce88126d00..ddab218ac4 100644 --- a/testdata/baselines/reference/submodule/conformance/checkJsxGenericTagHasCorrectInferences.js +++ b/testdata/baselines/reference/submodule/conformance/checkJsxGenericTagHasCorrectInferences.js @@ -17,8 +17,41 @@ let d = a.x} />; / //// [file.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const React = require("react"); +const React = __importStar(require("react")); let a = a}/>; // No error let b = a}/>; // No error - Values should be reinstantiated with `number` (since `object` is a default, not a constraint) let c = ({ x: a.x })}/>; // No Error diff --git a/testdata/baselines/reference/submodule/conformance/checkJsxGenericTagHasCorrectInferences.js.diff b/testdata/baselines/reference/submodule/conformance/checkJsxGenericTagHasCorrectInferences.js.diff index 0130da3f9e..2ab7e9944a 100644 --- a/testdata/baselines/reference/submodule/conformance/checkJsxGenericTagHasCorrectInferences.js.diff +++ b/testdata/baselines/reference/submodule/conformance/checkJsxGenericTagHasCorrectInferences.js.diff @@ -1,11 +1,11 @@ --- old.checkJsxGenericTagHasCorrectInferences.js +++ new.checkJsxGenericTagHasCorrectInferences.js -@@= skipped -17, +17 lines =@@ - //// [file.jsx] - "use strict"; +@@= skipped -50, +50 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); let a = a}/>; // No error let b = a}/>; // No error - Values should be reinstantiated with `number` (since `object` is a default, not a constraint) let c = ({ x: a.x })}/>; // No Error \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/checkJsxSubtleSkipContextSensitiveBug.js b/testdata/baselines/reference/submodule/conformance/checkJsxSubtleSkipContextSensitiveBug.js index 714b52ad4a..b3ede930a7 100644 --- a/testdata/baselines/reference/submodule/conformance/checkJsxSubtleSkipContextSensitiveBug.js +++ b/testdata/baselines/reference/submodule/conformance/checkJsxSubtleSkipContextSensitiveBug.js @@ -28,9 +28,42 @@ const loader = -const React = require("react"); +const React = __importStar(require("react")); class AsyncLoader extends React.Component { render() { return null; } } diff --git a/testdata/baselines/reference/submodule/conformance/checkJsxSubtleSkipContextSensitiveBug.js.diff b/testdata/baselines/reference/submodule/conformance/checkJsxSubtleSkipContextSensitiveBug.js.diff index 6737a2ecb9..ddb3295d03 100644 --- a/testdata/baselines/reference/submodule/conformance/checkJsxSubtleSkipContextSensitiveBug.js.diff +++ b/testdata/baselines/reference/submodule/conformance/checkJsxSubtleSkipContextSensitiveBug.js.diff @@ -1,9 +1,9 @@ --- old.checkJsxSubtleSkipContextSensitiveBug.js +++ new.checkJsxSubtleSkipContextSensitiveBug.js -@@= skipped -27, +27 lines =@@ - - //// [checkJsxSubtleSkipContextSensitiveBug.js] - "use strict"; +@@= skipped -60, +60 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -15,8 +15,8 @@ -}; Object.defineProperty(exports, "__esModule", { value: true }); /// --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); class AsyncLoader extends React.Component { render() { return null; } } diff --git a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).errors.txt b/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).errors.txt deleted file mode 100644 index 29cf4ce60b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -error TS5055: Cannot write file 'computedPropertyNames52.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'computedPropertyNames52.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== computedPropertyNames52.js (0 errors) ==== - const array = []; - for (let i = 0; i < 10; ++i) { - array.push(class C { - [i] = () => C; - static [i] = 100; - }) - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).symbols b/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).symbols deleted file mode 100644 index 469929e760..0000000000 --- a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).symbols +++ /dev/null @@ -1,29 +0,0 @@ -//// [tests/cases/conformance/es6/computedProperties/computedPropertyNames52.ts] //// - -=== computedPropertyNames52.js === -const array = []; ->array : Symbol(array, Decl(computedPropertyNames52.js, 0, 5)) - -for (let i = 0; i < 10; ++i) { ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) - - array.push(class C { ->array.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) ->array : Symbol(array, Decl(computedPropertyNames52.js, 0, 5)) ->push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) ->C : Symbol(C, Decl(computedPropertyNames52.js, 2, 15)) - - [i] = () => C; ->[i] : Symbol(C[i], Decl(computedPropertyNames52.js, 2, 24)) ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) ->C : Symbol(C, Decl(computedPropertyNames52.js, 2, 15)) - - static [i] = 100; ->[i] : Symbol(C[i], Decl(computedPropertyNames52.js, 3, 22)) ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) - - }) -} - diff --git a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).types b/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).types deleted file mode 100644 index 258e63430a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es2015).types +++ /dev/null @@ -1,38 +0,0 @@ -//// [tests/cases/conformance/es6/computedProperties/computedPropertyNames52.ts] //// - -=== computedPropertyNames52.js === -const array = []; ->array : any[] ->[] : undefined[] - -for (let i = 0; i < 10; ++i) { ->i : number ->0 : 0 ->i < 10 : boolean ->i : number ->10 : 10 ->++i : number ->i : number - - array.push(class C { ->array.push(class C { [i] = () => C; static [i] = 100; }) : number ->array.push : (...items: any[]) => number ->array : any[] ->push : (...items: any[]) => number ->class C { [i] = () => C; static [i] = 100; } : typeof C ->C : typeof C - - [i] = () => C; ->[i] : () => typeof C ->i : number ->() => C : () => typeof C ->C : typeof C - - static [i] = 100; ->[i] : number ->i : number ->100 : 100 - - }) -} - diff --git a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).errors.txt b/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).errors.txt deleted file mode 100644 index 29cf4ce60b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -error TS5055: Cannot write file 'computedPropertyNames52.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'computedPropertyNames52.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== computedPropertyNames52.js (0 errors) ==== - const array = []; - for (let i = 0; i < 10; ++i) { - array.push(class C { - [i] = () => C; - static [i] = 100; - }) - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).symbols b/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).symbols deleted file mode 100644 index 469929e760..0000000000 --- a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).symbols +++ /dev/null @@ -1,29 +0,0 @@ -//// [tests/cases/conformance/es6/computedProperties/computedPropertyNames52.ts] //// - -=== computedPropertyNames52.js === -const array = []; ->array : Symbol(array, Decl(computedPropertyNames52.js, 0, 5)) - -for (let i = 0; i < 10; ++i) { ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) - - array.push(class C { ->array.push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) ->array : Symbol(array, Decl(computedPropertyNames52.js, 0, 5)) ->push : Symbol(Array.push, Decl(lib.es5.d.ts, --, --)) ->C : Symbol(C, Decl(computedPropertyNames52.js, 2, 15)) - - [i] = () => C; ->[i] : Symbol(C[i], Decl(computedPropertyNames52.js, 2, 24)) ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) ->C : Symbol(C, Decl(computedPropertyNames52.js, 2, 15)) - - static [i] = 100; ->[i] : Symbol(C[i], Decl(computedPropertyNames52.js, 3, 22)) ->i : Symbol(i, Decl(computedPropertyNames52.js, 1, 8)) - - }) -} - diff --git a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).types b/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).types deleted file mode 100644 index 258e63430a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/computedPropertyNames52(target=es5).types +++ /dev/null @@ -1,38 +0,0 @@ -//// [tests/cases/conformance/es6/computedProperties/computedPropertyNames52.ts] //// - -=== computedPropertyNames52.js === -const array = []; ->array : any[] ->[] : undefined[] - -for (let i = 0; i < 10; ++i) { ->i : number ->0 : 0 ->i < 10 : boolean ->i : number ->10 : 10 ->++i : number ->i : number - - array.push(class C { ->array.push(class C { [i] = () => C; static [i] = 100; }) : number ->array.push : (...items: any[]) => number ->array : any[] ->push : (...items: any[]) => number ->class C { [i] = () => C; static [i] = 100; } : typeof C ->C : typeof C - - [i] = () => C; ->[i] : () => typeof C ->i : number ->() => C : () => typeof C ->C : typeof C - - static [i] = 100; ->[i] : number ->i : number ->100 : 100 - - }) -} - diff --git a/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt new file mode 100644 index 0000000000..93bce755b0 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt @@ -0,0 +1,90 @@ +file.tsx(27,64): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. +file.tsx(28,24): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'onClick' does not exist on type 'IntrinsicAttributes & LinkProps'. +file.tsx(29,43): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. +file.tsx(30,36): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. +file.tsx(33,65): error TS2322: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. + Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. +file.tsx(36,44): error TS2322: Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. + + +==== file.tsx (6 errors) ==== + import React = require('react') + + export interface ClickableProps { + children?: string; + className?: string; + } + + export interface ButtonProps extends ClickableProps { + onClick: (k: "left" | "right") => void; + } + + export interface LinkProps extends ClickableProps { + goTo: "home" | "contact"; + } + + export function MainButton(buttonProps: ButtonProps): JSX.Element; + export function MainButton(linkProps: LinkProps): JSX.Element; + export function MainButton(props: ButtonProps | LinkProps): JSX.Element { + const linkProps = props as LinkProps; + if(linkProps.goTo) { + return this._buildMainLink(props); + } + + return this._buildMainButton(props); + } + + const b0 = {console.log(k)}}} extra />; // k has type "left" | "right" + ~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. +!!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. +!!! related TS2771 file.tsx:17:17: The last overload is declared here. + const b2 = {console.log(k)}} extra />; // k has type "left" | "right" + ~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. +!!! error TS2769: Property 'onClick' does not exist on type 'IntrinsicAttributes & LinkProps'. +!!! related TS2771 file.tsx:17:17: The last overload is declared here. + const b3 = ; // goTo has type"home" | "contact" + ~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. +!!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. +!!! related TS2771 file.tsx:17:17: The last overload is declared here. + const b4 = ; // goTo has type "home" | "contact" + ~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. +!!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. +!!! related TS2771 file.tsx:17:17: The last overload is declared here. + + export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined } + const c1 = {console.log(k)}}} extra />; // k has type any + ~~~~~ +!!! error TS2322: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +!!! error TS2322: Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. + + export function NoOverload1(linkProps: LinkProps): JSX.Element { return undefined } + const d1 = ; // goTo has type "home" | "contact" + ~~~~~ +!!! error TS2322: Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. +!!! error TS2322: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt.diff new file mode 100644 index 0000000000..18cc4efdd1 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt.diff @@ -0,0 +1,88 @@ +--- old.contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt ++++ new.contextuallyTypedStringLiteralsInJsxAttributes02.errors.txt +@@= skipped -0, +0 lines =@@ + file.tsx(27,64): error TS2769: No overload matches this call. +- Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. +- Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +- Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. +- Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. ++ The last overload gave the following error. + Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. +-file.tsx(28,13): error TS2769: No overload matches this call. +- Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. +- Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +- Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. +- Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. ++file.tsx(28,24): error TS2769: No overload matches this call. ++ The last overload gave the following error. + Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'onClick' does not exist on type 'IntrinsicAttributes & LinkProps'. + file.tsx(29,43): error TS2769: No overload matches this call. +- Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. +- Type '{ goTo: string; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +- Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. +- Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. ++ The last overload gave the following error. + Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. +-file.tsx(30,13): error TS2769: No overload matches this call. +- Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. +- Type '{ goTo: string; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +- Property 'goTo' does not exist on type 'IntrinsicAttributes & ButtonProps'. +- Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. ++file.tsx(30,36): error TS2769: No overload matches this call. ++ The last overload gave the following error. + Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. + file.tsx(33,65): error TS2322: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +@@= skipped -61, +49 lines =@@ + const b0 = {console.log(k)}}} extra />; // k has type "left" | "right" + ~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. +-!!! error TS2769: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + !!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. ++!!! related TS2771 file.tsx:17:17: The last overload is declared here. + const b2 = {console.log(k)}} extra />; // k has type "left" | "right" +- ~~~~~~~~~~ ++ ~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. +-!!! error TS2769: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ onClick: (k: "left" | "right") => void; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + !!! error TS2769: Property 'onClick' does not exist on type 'IntrinsicAttributes & LinkProps'. ++!!! related TS2771 file.tsx:17:17: The last overload is declared here. + const b3 = ; // goTo has type"home" | "contact" + ~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. +-!!! error TS2769: Type '{ goTo: string; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + !!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. ++!!! related TS2771 file.tsx:17:17: The last overload is declared here. + const b4 = ; // goTo has type "home" | "contact" +- ~~~~~~~~~~ ++ ~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(buttonProps: ButtonProps): Element', gave the following error. +-!!! error TS2769: Type '{ goTo: string; extra: true; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Property 'goTo' does not exist on type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Overload 2 of 2, '(linkProps: LinkProps): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ goTo: "home"; extra: true; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. + !!! error TS2769: Property 'extra' does not exist on type 'IntrinsicAttributes & LinkProps'. ++!!! related TS2771 file.tsx:17:17: The last overload is declared here. + + export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined } + const c1 = {console.log(k)}}} extra />; // k has type any \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.js b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.js new file mode 100644 index 0000000000..e8f9c13c87 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.js @@ -0,0 +1,63 @@ +//// [tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx] //// + +//// [file.tsx] +import React = require('react') + +export interface ClickableProps { + children?: string; + className?: string; +} + +export interface ButtonProps extends ClickableProps { + onClick: (k: "left" | "right") => void; +} + +export interface LinkProps extends ClickableProps { + goTo: "home" | "contact"; +} + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +export function MainButton(linkProps: LinkProps): JSX.Element; +export function MainButton(props: ButtonProps | LinkProps): JSX.Element { + const linkProps = props as LinkProps; + if(linkProps.goTo) { + return this._buildMainLink(props); + } + + return this._buildMainButton(props); +} + +const b0 = {console.log(k)}}} extra />; // k has type "left" | "right" +const b2 = {console.log(k)}} extra />; // k has type "left" | "right" +const b3 = ; // goTo has type"home" | "contact" +const b4 = ; // goTo has type "home" | "contact" + +export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined } +const c1 = {console.log(k)}}} extra />; // k has type any + +export function NoOverload1(linkProps: LinkProps): JSX.Element { return undefined } +const d1 = ; // goTo has type "home" | "contact" + + +//// [file.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MainButton = MainButton; +exports.NoOverload = NoOverload; +exports.NoOverload1 = NoOverload1; +const React = require("react"); +function MainButton(props) { + const linkProps = props; + if (linkProps.goTo) { + return this._buildMainLink(props); + } + return this._buildMainButton(props); +} +const b0 = { console.log(k); } }} extra/>; // k has type "left" | "right" +const b2 = { console.log(k); }} extra/>; // k has type "left" | "right" +const b3 = ; // goTo has type"home" | "contact" +const b4 = ; // goTo has type "home" | "contact" +function NoOverload(buttonProps) { return undefined; } +const c1 = { console.log(k); } }} extra/>; // k has type any +function NoOverload1(linkProps) { return undefined; } +const d1 = ; // goTo has type "home" | "contact" diff --git a/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.js.diff b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.js.diff new file mode 100644 index 0000000000..781946ee07 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.js.diff @@ -0,0 +1,11 @@ +--- old.contextuallyTypedStringLiteralsInJsxAttributes02.js ++++ new.contextuallyTypedStringLiteralsInJsxAttributes02.js +@@= skipped -44, +44 lines =@@ + exports.MainButton = MainButton; + exports.NoOverload = NoOverload; + exports.NoOverload1 = NoOverload1; +-var React = require("react"); ++const React = require("react"); + function MainButton(props) { + const linkProps = props; + if (linkProps.goTo) { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.symbols b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.symbols new file mode 100644 index 0000000000..207e3bb681 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.symbols @@ -0,0 +1,140 @@ +//// [tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx] //// + +=== file.tsx === +import React = require('react') +>React : Symbol(React, Decl(file.tsx, 0, 0)) + +export interface ClickableProps { +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + children?: string; +>children : Symbol(ClickableProps.children, Decl(file.tsx, 2, 33)) + + className?: string; +>className : Symbol(ClickableProps.className, Decl(file.tsx, 3, 22)) +} + +export interface ButtonProps extends ClickableProps { +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + onClick: (k: "left" | "right") => void; +>onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 7, 53)) +>k : Symbol(k, Decl(file.tsx, 8, 14)) +} + +export interface LinkProps extends ClickableProps { +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + goTo: "home" | "contact"; +>goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 11, 51)) +} + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +>MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62)) +>buttonProps : Symbol(buttonProps, Decl(file.tsx, 15, 27)) +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +export function MainButton(linkProps: LinkProps): JSX.Element; +>MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62)) +>linkProps : Symbol(linkProps, Decl(file.tsx, 16, 27)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +export function MainButton(props: ButtonProps | LinkProps): JSX.Element { +>MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62)) +>props : Symbol(props, Decl(file.tsx, 17, 27)) +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + + const linkProps = props as LinkProps; +>linkProps : Symbol(linkProps, Decl(file.tsx, 18, 9)) +>props : Symbol(props, Decl(file.tsx, 17, 27)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) + + if(linkProps.goTo) { +>linkProps.goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 11, 51)) +>linkProps : Symbol(linkProps, Decl(file.tsx, 18, 9)) +>goTo : Symbol(LinkProps.goTo, Decl(file.tsx, 11, 51)) + + return this._buildMainLink(props); +>props : Symbol(props, Decl(file.tsx, 17, 27)) + } + + return this._buildMainButton(props); +>props : Symbol(props, Decl(file.tsx, 17, 27)) +} + +const b0 = {console.log(k)}}} extra />; // k has type "left" | "right" +>b0 : Symbol(b0, Decl(file.tsx, 26, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62)) +>onClick : Symbol(onClick, Decl(file.tsx, 26, 28)) +>k : Symbol(k, Decl(file.tsx, 26, 38)) +>console.log : Symbol(Console.log, Decl(lib.d.ts, --, --)) +>console : Symbol(console, Decl(lib.d.ts, --, --)) +>log : Symbol(Console.log, Decl(lib.d.ts, --, --)) +>k : Symbol(k, Decl(file.tsx, 26, 38)) +>extra : Symbol(extra, Decl(file.tsx, 26, 62)) + +const b2 = {console.log(k)}} extra />; // k has type "left" | "right" +>b2 : Symbol(b2, Decl(file.tsx, 27, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62)) +>onClick : Symbol(onClick, Decl(file.tsx, 27, 22)) +>k : Symbol(k, Decl(file.tsx, 27, 33)) +>console.log : Symbol(Console.log, Decl(lib.d.ts, --, --)) +>console : Symbol(console, Decl(lib.d.ts, --, --)) +>log : Symbol(Console.log, Decl(lib.d.ts, --, --)) +>k : Symbol(k, Decl(file.tsx, 27, 33)) +>extra : Symbol(extra, Decl(file.tsx, 27, 54)) + +const b3 = ; // goTo has type"home" | "contact" +>b3 : Symbol(b3, Decl(file.tsx, 28, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62)) +>goTo : Symbol(goTo, Decl(file.tsx, 28, 28)) +>extra : Symbol(extra, Decl(file.tsx, 28, 41)) + +const b4 = ; // goTo has type "home" | "contact" +>b4 : Symbol(b4, Decl(file.tsx, 29, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 13, 1), Decl(file.tsx, 15, 66), Decl(file.tsx, 16, 62)) +>goTo : Symbol(goTo, Decl(file.tsx, 29, 22)) +>extra : Symbol(extra, Decl(file.tsx, 29, 34)) + +export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined } +>NoOverload : Symbol(NoOverload, Decl(file.tsx, 29, 44)) +>buttonProps : Symbol(buttonProps, Decl(file.tsx, 31, 27)) +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) +>undefined : Symbol(undefined) + +const c1 = {console.log(k)}}} extra />; // k has type any +>c1 : Symbol(c1, Decl(file.tsx, 32, 5)) +>NoOverload : Symbol(NoOverload, Decl(file.tsx, 29, 44)) +>onClick : Symbol(onClick, Decl(file.tsx, 32, 29)) +>k : Symbol(k, Decl(file.tsx, 32, 39)) +>console.log : Symbol(Console.log, Decl(lib.d.ts, --, --)) +>console : Symbol(console, Decl(lib.d.ts, --, --)) +>log : Symbol(Console.log, Decl(lib.d.ts, --, --)) +>k : Symbol(k, Decl(file.tsx, 32, 39)) +>extra : Symbol(extra, Decl(file.tsx, 32, 63)) + +export function NoOverload1(linkProps: LinkProps): JSX.Element { return undefined } +>NoOverload1 : Symbol(NoOverload1, Decl(file.tsx, 32, 73)) +>linkProps : Symbol(linkProps, Decl(file.tsx, 34, 28)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) +>undefined : Symbol(undefined) + +const d1 = ; // goTo has type "home" | "contact" +>d1 : Symbol(d1, Decl(file.tsx, 35, 5)) +>NoOverload1 : Symbol(NoOverload1, Decl(file.tsx, 32, 73)) +>goTo : Symbol(goTo, Decl(file.tsx, 35, 29)) +>extra : Symbol(extra, Decl(file.tsx, 35, 42)) + diff --git a/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.types b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.types new file mode 100644 index 0000000000..ec63c3361e --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/contextuallyTypedStringLiteralsInJsxAttributes02.types @@ -0,0 +1,147 @@ +//// [tests/cases/conformance/types/contextualTypes/jsxAttributes/contextuallyTypedStringLiteralsInJsxAttributes02.tsx] //// + +=== file.tsx === +import React = require('react') +>React : typeof React + +export interface ClickableProps { + children?: string; +>children : string + + className?: string; +>className : string +} + +export interface ButtonProps extends ClickableProps { + onClick: (k: "left" | "right") => void; +>onClick : (k: "left" | "right") => void +>k : "left" | "right" +} + +export interface LinkProps extends ClickableProps { + goTo: "home" | "contact"; +>goTo : "contact" | "home" +} + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; } +>buttonProps : ButtonProps +>JSX : any + +export function MainButton(linkProps: LinkProps): JSX.Element; +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; } +>linkProps : LinkProps +>JSX : any + +export function MainButton(props: ButtonProps | LinkProps): JSX.Element { +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; } +>props : ButtonProps | LinkProps +>JSX : any + + const linkProps = props as LinkProps; +>linkProps : LinkProps +>props as LinkProps : LinkProps +>props : ButtonProps | LinkProps + + if(linkProps.goTo) { +>linkProps.goTo : "contact" | "home" +>linkProps : LinkProps +>goTo : "contact" | "home" + + return this._buildMainLink(props); +>this._buildMainLink(props) : any +>this._buildMainLink : any +>this : any +>_buildMainLink : any +>props : ButtonProps | LinkProps + } + + return this._buildMainButton(props); +>this._buildMainButton(props) : any +>this._buildMainButton : any +>this : any +>_buildMainButton : any +>props : ButtonProps | LinkProps +} + +const b0 = {console.log(k)}}} extra />; // k has type "left" | "right" +>b0 : JSX.Element +> {console.log(k)}}} extra /> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; } +>{onClick: (k) => {console.log(k)}} : { onClick: (k: "left" | "right") => void; } +>onClick : (k: "left" | "right") => void +>(k) => {console.log(k)} : (k: "left" | "right") => void +>k : "left" | "right" +>console.log(k) : void +>console.log : (message?: any, ...optionalParams: any[]) => void +>console : Console +>log : (message?: any, ...optionalParams: any[]) => void +>k : "left" | "right" +>extra : true + +const b2 = {console.log(k)}} extra />; // k has type "left" | "right" +>b2 : JSX.Element +>{console.log(k)}} extra /> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; } +>onClick : (k: "left" | "right") => void +>(k)=>{console.log(k)} : (k: "left" | "right") => void +>k : "left" | "right" +>console.log(k) : void +>console.log : (message?: any, ...optionalParams: any[]) => void +>console : Console +>log : (message?: any, ...optionalParams: any[]) => void +>k : "left" | "right" +>extra : true + +const b3 = ; // goTo has type"home" | "contact" +>b3 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; } +>{goTo:"home"} : { goTo: "home"; } +>goTo : "home" +>"home" : "home" +>extra : true + +const b4 = ; // goTo has type "home" | "contact" +>b4 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; } +>goTo : "home" +>extra : true + +export function NoOverload(buttonProps: ButtonProps): JSX.Element { return undefined } +>NoOverload : (buttonProps: ButtonProps) => JSX.Element +>buttonProps : ButtonProps +>JSX : any +>undefined : undefined + +const c1 = {console.log(k)}}} extra />; // k has type any +>c1 : JSX.Element +> {console.log(k)}}} extra /> : JSX.Element +>NoOverload : (buttonProps: ButtonProps) => JSX.Element +>{onClick: (k) => {console.log(k)}} : { onClick: (k: "left" | "right") => void; } +>onClick : (k: "left" | "right") => void +>(k) => {console.log(k)} : (k: "left" | "right") => void +>k : "left" | "right" +>console.log(k) : void +>console.log : (message?: any, ...optionalParams: any[]) => void +>console : Console +>log : (message?: any, ...optionalParams: any[]) => void +>k : "left" | "right" +>extra : true + +export function NoOverload1(linkProps: LinkProps): JSX.Element { return undefined } +>NoOverload1 : (linkProps: LinkProps) => JSX.Element +>linkProps : LinkProps +>JSX : any +>undefined : undefined + +const d1 = ; // goTo has type "home" | "contact" +>d1 : JSX.Element +> : JSX.Element +>NoOverload1 : (linkProps: LinkProps) => JSX.Element +>{goTo:"home"} : { goTo: "home"; } +>goTo : "home" +>"home" : "home" +>extra : true + diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=false).js b/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=false).js index 094646b239..9e50a85742 100644 --- a/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=false).js +++ b/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=false).js @@ -11,6 +11,9 @@ export default val; //// [main.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const data_json_1 = require("./data.json"); +const data_json_1 = __importDefault(require("./data.json")); let x = data_json_1.default; diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=false).js.diff b/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=false).js.diff index 7785c01680..74e4eda0b3 100644 --- a/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=false).js.diff +++ b/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=false).js.diff @@ -1,9 +1,9 @@ --- old.declarationFileForJsonImport(resolvejsonmodule=false).js +++ new.declarationFileForJsonImport(resolvejsonmodule=false).js -@@= skipped -11, +11 lines =@@ - //// [main.js] - "use strict"; +@@= skipped -14, +14 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var data_json_1 = require("./data.json"); -+const data_json_1 = require("./data.json"); +-var data_json_1 = __importDefault(require("./data.json")); ++const data_json_1 = __importDefault(require("./data.json")); let x = data_json_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=true).js b/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=true).js index 094646b239..9e50a85742 100644 --- a/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=true).js +++ b/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=true).js @@ -11,6 +11,9 @@ export default val; //// [main.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const data_json_1 = require("./data.json"); +const data_json_1 = __importDefault(require("./data.json")); let x = data_json_1.default; diff --git a/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=true).js.diff b/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=true).js.diff index ee11508f2f..034ad0eca5 100644 --- a/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=true).js.diff +++ b/testdata/baselines/reference/submodule/conformance/declarationFileForJsonImport(resolvejsonmodule=true).js.diff @@ -1,9 +1,9 @@ --- old.declarationFileForJsonImport(resolvejsonmodule=true).js +++ new.declarationFileForJsonImport(resolvejsonmodule=true).js -@@= skipped -11, +11 lines =@@ - //// [main.js] - "use strict"; +@@= skipped -14, +14 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var data_json_1 = require("./data.json"); -+const data_json_1 = require("./data.json"); +-var data_json_1 = __importDefault(require("./data.json")); ++const data_json_1 = __importDefault(require("./data.json")); let x = data_json_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/decoratedClassFromExternalModule.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/decoratedClassFromExternalModule.errors.txt.diff deleted file mode 100644 index 6f3d1d96fd..0000000000 --- a/testdata/baselines/reference/submodule/conformance/decoratedClassFromExternalModule.errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.decoratedClassFromExternalModule.errors.txt -+++ new.decoratedClassFromExternalModule.errors.txt -@@= skipped -0, +0 lines =@@ -- -+undecorated.ts(1,23): error TS2307: Cannot find module 'decorated' or its corresponding type declarations. -+ -+ -+==== decorated.ts (0 errors) ==== -+ function decorate(target: any) { } -+ -+ @decorate -+ export default class Decorated { } -+ -+==== undecorated.ts (1 errors) ==== -+ import Decorated from 'decorated'; -+ ~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'decorated' or its corresponding type declarations. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/decoratedClassFromExternalModule.types.diff b/testdata/baselines/reference/submodule/conformance/decoratedClassFromExternalModule.types.diff deleted file mode 100644 index 07ac649274..0000000000 --- a/testdata/baselines/reference/submodule/conformance/decoratedClassFromExternalModule.types.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- old.decoratedClassFromExternalModule.types -+++ new.decoratedClassFromExternalModule.types -@@= skipped -12, +12 lines =@@ - - === undecorated.ts === - import Decorated from 'decorated'; -->Decorated : typeof Decorated -+>Decorated : any diff --git a/testdata/baselines/reference/submodule/conformance/decoratorMetadata.js.diff b/testdata/baselines/reference/submodule/conformance/decoratorMetadata.js.diff index 5f4f72998b..2d34a137e6 100644 --- a/testdata/baselines/reference/submodule/conformance/decoratorMetadata.js.diff +++ b/testdata/baselines/reference/submodule/conformance/decoratorMetadata.js.diff @@ -12,9 +12,12 @@ -}; -var __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +-}; +-var __importDefault = (this && this.__importDefault) || function (mod) { +- return (mod && mod.__esModule) ? mod : { "default": mod }; -}; Object.defineProperty(exports, "__esModule", { value: true }); --var service_1 = require("./service"); +-var service_1 = __importDefault(require("./service")); -let MyComponent = (() => { - let MyComponent = class MyComponent { - constructor(Service) { diff --git a/testdata/baselines/reference/submodule/conformance/defaultExportInAwaitExpression02.js b/testdata/baselines/reference/submodule/conformance/defaultExportInAwaitExpression02.js index ee93757421..57c0d290d2 100644 --- a/testdata/baselines/reference/submodule/conformance/defaultExportInAwaitExpression02.js +++ b/testdata/baselines/reference/submodule/conformance/defaultExportInAwaitExpression02.js @@ -19,8 +19,11 @@ const x = new Promise((resolve, reject) => { resolve({}); }); exports.default = x; //// [b.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const a_1 = require("./a"); +const a_1 = __importDefault(require("./a")); (async function () { const value = await a_1.default; }()); diff --git a/testdata/baselines/reference/submodule/conformance/defaultExportInAwaitExpression02.js.diff b/testdata/baselines/reference/submodule/conformance/defaultExportInAwaitExpression02.js.diff index 2481f190b3..354fceaf6c 100644 --- a/testdata/baselines/reference/submodule/conformance/defaultExportInAwaitExpression02.js.diff +++ b/testdata/baselines/reference/submodule/conformance/defaultExportInAwaitExpression02.js.diff @@ -13,8 +13,11 @@ - step((generator = generator.apply(thisArg, _arguments || [])).next()); - }); -}; + var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); - const a_1 = require("./a"); + const a_1 = __importDefault(require("./a")); -(function () { - return __awaiter(this, void 0, void 0, function* () { - const value = yield a_1.default; diff --git a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge01.js b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge01.js index 36e43cf955..da58267ce1 100644 --- a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge01.js +++ b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge01.js @@ -42,8 +42,11 @@ function Decl() { })(Decl || (Decl = {})); //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("m1"); +const m1_1 = __importDefault(require("m1")); (0, m1_1.default)(); var x; var y; diff --git a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge01.js.diff b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge01.js.diff index 00d20150d5..814a926d09 100644 --- a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge01.js.diff +++ b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge01.js.diff @@ -1,11 +1,11 @@ --- old.defaultExportsCannotMerge01.js +++ new.defaultExportsCannotMerge01.js -@@= skipped -42, +42 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -45, +45 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("m1"); -+const m1_1 = require("m1"); +-var m1_1 = __importDefault(require("m1")); ++const m1_1 = __importDefault(require("m1")); (0, m1_1.default)(); var x; var y; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge02.js b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge02.js index 23ba86b0d0..32a56fbed8 100644 --- a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge02.js +++ b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge02.js @@ -32,8 +32,11 @@ class Decl { exports.default = Decl; //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("m1"); +const m1_1 = __importDefault(require("m1")); (0, m1_1.default)(); var x; var y; diff --git a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge02.js.diff b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge02.js.diff index 22b55bd702..8f01b23170 100644 --- a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge02.js.diff +++ b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge02.js.diff @@ -1,11 +1,11 @@ --- old.defaultExportsCannotMerge02.js +++ new.defaultExportsCannotMerge02.js -@@= skipped -32, +32 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -35, +35 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("m1"); -+const m1_1 = require("m1"); +-var m1_1 = __importDefault(require("m1")); ++const m1_1 = __importDefault(require("m1")); (0, m1_1.default)(); var x; var y; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge03.js b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge03.js index ff47dd210b..91aefd147d 100644 --- a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge03.js +++ b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge03.js @@ -32,8 +32,11 @@ class Decl { exports.default = Decl; //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("m1"); +const m1_1 = __importDefault(require("m1")); (0, m1_1.default)(); var x; var y; diff --git a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge03.js.diff b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge03.js.diff index 0064c5d67a..21c1332789 100644 --- a/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge03.js.diff +++ b/testdata/baselines/reference/submodule/conformance/defaultExportsCannotMerge03.js.diff @@ -1,11 +1,11 @@ --- old.defaultExportsCannotMerge03.js +++ new.defaultExportsCannotMerge03.js -@@= skipped -32, +32 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -35, +35 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("m1"); -+const m1_1 = require("m1"); +-var m1_1 = __importDefault(require("m1")); ++const m1_1 = __importDefault(require("m1")); (0, m1_1.default)(); var x; var y; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/emitModuleCommonJS(module=commonjs).js b/testdata/baselines/reference/submodule/conformance/emitModuleCommonJS(module=commonjs).js index a539507bd5..0442043886 100644 --- a/testdata/baselines/reference/submodule/conformance/emitModuleCommonJS(module=commonjs).js +++ b/testdata/baselines/reference/submodule/conformance/emitModuleCommonJS(module=commonjs).js @@ -16,6 +16,39 @@ //// [a.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) { if (typeof path === "string" && /^\.\.?\//.test(path)) { return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) { @@ -26,11 +59,44 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte }; { require(__rewriteRelativeImportExtension("" + "./foo.ts")); - Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => require(s)); + Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => __importStar(require(s))); require("./foo.js"); - Promise.resolve().then(() => require("./foo.js")); + Promise.resolve().then(() => __importStar(require("./foo.js"))); } //// [b.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) { if (typeof path === "string" && /^\.\.?\//.test(path)) { return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) { @@ -40,6 +106,6 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte return path; }; { - Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => require(s)); - Promise.resolve().then(() => require("./foo.js")); + Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => __importStar(require(s))); + Promise.resolve().then(() => __importStar(require("./foo.js"))); } diff --git a/testdata/baselines/reference/submodule/conformance/es6modulekindWithES5Target10.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/es6modulekindWithES5Target10.errors.txt.diff deleted file mode 100644 index e547f47771..0000000000 --- a/testdata/baselines/reference/submodule/conformance/es6modulekindWithES5Target10.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.es6modulekindWithES5Target10.errors.txt -+++ new.es6modulekindWithES5Target10.errors.txt -@@= skipped -0, +0 lines =@@ - es6modulekindWithES5Target10.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. --es6modulekindWithES5Target10.ts(1,20): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+es6modulekindWithES5Target10.ts(1,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations. - es6modulekindWithES5Target10.ts(6,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. - - -@@= skipped -7, +7 lines =@@ - ~~~~~~~~~~~~~~~~~~~~~~~~~~ - !!! error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - - namespace N { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/es6modulekindWithES5Target9.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/es6modulekindWithES5Target9.errors.txt.diff deleted file mode 100644 index 4562c57a73..0000000000 --- a/testdata/baselines/reference/submodule/conformance/es6modulekindWithES5Target9.errors.txt.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- old.es6modulekindWithES5Target9.errors.txt -+++ new.es6modulekindWithES5Target9.errors.txt -@@= skipped -0, +0 lines =@@ --es6modulekindWithES5Target9.ts(1,15): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --es6modulekindWithES5Target9.ts(3,17): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --es6modulekindWithES5Target9.ts(5,20): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --es6modulekindWithES5Target9.ts(13,15): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --es6modulekindWithES5Target9.ts(15,17): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+es6modulekindWithES5Target9.ts(1,15): error TS2307: Cannot find module 'mod' or its corresponding type declarations. -+es6modulekindWithES5Target9.ts(3,17): error TS2307: Cannot find module 'mod' or its corresponding type declarations. -+es6modulekindWithES5Target9.ts(5,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations. -+es6modulekindWithES5Target9.ts(13,15): error TS2307: Cannot find module 'mod' or its corresponding type declarations. -+es6modulekindWithES5Target9.ts(15,17): error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - - ==== es6modulekindWithES5Target9.ts (5 errors) ==== - import d from "mod"; - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - import {a} from "mod"; - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - import * as M from "mod"; - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - export {a}; - -@@= skipped -25, +25 lines =@@ - - export * from "mod"; - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - export {b} from "mod" - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - export default d; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt.diff deleted file mode 100644 index 0eb0724e59..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(6,1): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,1): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (2 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers -- @dec class C {} -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.js deleted file mode 100644 index 7011bb75d9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.js +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers -@dec class C {} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers -@dec -class C { -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.js.diff deleted file mode 100644 index d8b3a27d93..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.js.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.1.js -@@= skipped -14, +14 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers --let C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var C = class { -- static { _classThis = this; } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- C = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return C = _classThis; --})(); -+@dec -+class C { -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt.diff deleted file mode 100644 index 73f983a13c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(6,16): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,16): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,16): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- export default @dec class {} -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.js deleted file mode 100644 index e11bf1a11e..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.js +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -export default @dec class {} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -@dec -class default_1 { -} -exports.default = default_1; diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.js.diff deleted file mode 100644 index 849a50b7fe..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.js.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.2.js -@@= skipped -14, +14 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); --exports.default = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var default_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "default"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- default_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return default_1 = _classThis; --})(); -+// needs: __esDecorate, __runInitializers, __setFunctionName -+@dec -+class default_1 { -+} -+exports.default = default_1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt.diff deleted file mode 100644 index afd9bb7f8c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(6,1): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,1): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,1): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- @dec class C { -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- static #foo() {} -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.js deleted file mode 100644 index e933e1691e..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -@dec class C { - static #foo() {} -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -@dec -class C { - static #foo() { } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.js.diff deleted file mode 100644 index a59f4d4be8..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.js.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-classDecorator.3.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- var _C_foo; -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var C = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(this, "C"); } -- static { _C_foo = function _C_foo() { }; } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- C = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return C = _classThis; --})(); -+@dec -+class C { -+ static #foo() { } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt.diff deleted file mode 100644 index 1147c88dfa..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- class C { -- @dec accessor #x: any; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.js deleted file mode 100644 index 42eab51a70..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec accessor #x: any; -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec - accessor #x; -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.js.diff deleted file mode 100644 index 6157e076fb..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.js.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateAutoAccessor.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- let _private_x_decorators; -- let _private_x_initializers = []; -- let _private_x_extraInitializers = []; -- let _private_x_descriptor; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _private_x_decorators = [dec]; -- tslib_1.__esDecorate(this, _private_x_descriptor = { get: tslib_1.__setFunctionName(function () { return this.#x_accessor_storage; }, "#x", "get"), set: tslib_1.__setFunctionName(function (value) { this.#x_accessor_storage = value; }, "#x", "set") }, _private_x_decorators, { kind: "accessor", name: "#x", static: false, private: true, access: { has: obj => #x in obj, get: obj => obj.#x, set: (obj, value) => { obj.#x = value; } }, metadata: _metadata }, _private_x_initializers, _private_x_extraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- #x_accessor_storage = tslib_1.__runInitializers(this, _private_x_initializers, void 0); -- get #x() { return _private_x_descriptor.get.call(this); } -- set #x(value) { return _private_x_descriptor.set.call(this, value); } -- constructor() { -- tslib_1.__runInitializers(this, _private_x_extraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ accessor #x; -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt.diff deleted file mode 100644 index 1b853cf2db..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (2 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers -- class C { -- @dec #x: any; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.js deleted file mode 100644 index 38d90cda04..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers -class C { - @dec #x: any; -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers -class C { - @dec - #x; -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.js.diff deleted file mode 100644 index 324b023f4b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.js.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateField.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers --let C = (() => { -- let _private_x_decorators; -- let _private_x_initializers = []; -- let _private_x_extraInitializers = []; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _private_x_decorators = [dec]; -- tslib_1.__esDecorate(null, null, _private_x_decorators, { kind: "field", name: "#x", static: false, private: true, access: { has: obj => #x in obj, get: obj => obj.#x, set: (obj, value) => { obj.#x = value; } }, metadata: _metadata }, _private_x_initializers, _private_x_extraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- #x = tslib_1.__runInitializers(this, _private_x_initializers, void 0); -- constructor() { -- tslib_1.__runInitializers(this, _private_x_extraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ #x; -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt.diff deleted file mode 100644 index c7105cc049..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- class C { -- @dec get #foo() { return 1; } -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.js deleted file mode 100644 index 1f2056a8a4..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec get #foo() { return 1; } -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec - get #foo() { return 1; } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.js.diff deleted file mode 100644 index 1dcc52cee5..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.js.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateGetter.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- let _instanceExtraInitializers = []; -- let _private_get_foo_decorators; -- let _private_get_foo_descriptor; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _private_get_foo_decorators = [dec]; -- tslib_1.__esDecorate(this, _private_get_foo_descriptor = { get: tslib_1.__setFunctionName(function () { return 1; }, "#foo", "get") }, _private_get_foo_decorators, { kind: "getter", name: "#foo", static: false, private: true, access: { has: obj => #foo in obj, get: obj => obj.#foo }, metadata: _metadata }, null, _instanceExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- get #foo() { return _private_get_foo_descriptor.get.call(this); } -- constructor() { -- tslib_1.__runInitializers(this, _instanceExtraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ get #foo() { return 1; } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt.diff deleted file mode 100644 index bf3ea9dec5..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- class C { -- @dec #foo() {} -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.js deleted file mode 100644 index 8ad0ed68b1..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec #foo() {} -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec - #foo() { } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.js.diff deleted file mode 100644 index 37b113104d..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.js.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateMethod.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- let _instanceExtraInitializers = []; -- let _private_foo_decorators; -- let _private_foo_descriptor; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _private_foo_decorators = [dec]; -- tslib_1.__esDecorate(this, _private_foo_descriptor = { value: tslib_1.__setFunctionName(function () { }, "#foo") }, _private_foo_decorators, { kind: "method", name: "#foo", static: false, private: true, access: { has: obj => #foo in obj, get: obj => obj.#foo }, metadata: _metadata }, null, _instanceExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- get #foo() { return _private_foo_descriptor.value; } -- constructor() { -- tslib_1.__runInitializers(this, _instanceExtraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ #foo() { } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt.diff deleted file mode 100644 index 42d54b14f0..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- class C { -- @dec set #foo(value: number) { } -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.js deleted file mode 100644 index 9722e08b6d..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec set #foo(value: number) { } -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec - set #foo(value) { } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.js.diff deleted file mode 100644 index f994856c71..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.js.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-nonStaticPrivateSetter.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- let _instanceExtraInitializers = []; -- let _private_set_foo_decorators; -- let _private_set_foo_descriptor; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _private_set_foo_decorators = [dec]; -- tslib_1.__esDecorate(this, _private_set_foo_descriptor = { set: tslib_1.__setFunctionName(function (value) { }, "#foo", "set") }, _private_set_foo_decorators, { kind: "setter", name: "#foo", static: false, private: true, access: { has: obj => #foo in obj, set: (obj, value) => { obj.#foo = value; } }, metadata: _metadata }, null, _instanceExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- set #foo(value) { return _private_set_foo_descriptor.set.call(this, value); } -- constructor() { -- tslib_1.__runInitializers(this, _instanceExtraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ set #foo(value) { } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt.diff deleted file mode 100644 index 86ca363d87..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- declare var x: any; -- -- // needs: __esDecorate, __runInitializers, __propKey -- class C { -- @dec static accessor [x]: any; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.js deleted file mode 100644 index 16e1d8cd6b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.js +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; -declare var x: any; - -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec static accessor [x]: any; -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec - static accessor [x]; -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.js.diff deleted file mode 100644 index 7e27406a93..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedAutoAccessor.js -@@= skipped -17, +17 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __propKey --let C = (() => { -- var _a; -- let _static_member_decorators; -- let _static_member_initializers = []; -- let _static_member_extraInitializers = []; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(this, null, _static_member_decorators, { kind: "accessor", name: _a, static: true, private: false, access: { has: obj => _a in obj, get: obj => obj[_a], set: (obj, value) => { obj[_a] = value; } }, metadata: _metadata }, _static_member_initializers, _static_member_extraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- static #_a_accessor_storage = tslib_1.__runInitializers(this, _static_member_initializers, void 0); -- static get [(_static_member_decorators = [dec], _a = tslib_1.__propKey(x))]() { return C.#_a_accessor_storage; } -- static set [_a](value) { C.#_a_accessor_storage = value; } -- static { -- tslib_1.__runInitializers(this, _static_member_extraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ static accessor [x]; -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt.diff deleted file mode 100644 index 0f8c2ca87f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- declare var x: any; -- -- // needs: __esDecorate, __runInitializers, __propKey -- class C { -- @dec static [x]: any; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.js deleted file mode 100644 index 0bef4d0f73..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.js +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; -declare var x: any; - -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec static [x]: any; -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec - static [x]; -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.js.diff deleted file mode 100644 index 96044ea364..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.js.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedField.js -@@= skipped -17, +17 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __propKey --let C = (() => { -- var _a; -- let _static_member_decorators; -- let _static_member_initializers = []; -- let _static_member_extraInitializers = []; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, null, _static_member_decorators, { kind: "field", name: _a, static: true, private: false, access: { has: obj => _a in obj, get: obj => obj[_a], set: (obj, value) => { obj[_a] = value; } }, metadata: _metadata }, _static_member_initializers, _static_member_extraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- static [(_static_member_decorators = [dec], _a = tslib_1.__propKey(x))] = tslib_1.__runInitializers(this, _static_member_initializers, void 0); -- static { -- tslib_1.__runInitializers(this, _static_member_extraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ static [x]; -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt.diff deleted file mode 100644 index 6a5a0b6280..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- declare var x: any; -- -- // needs: __esDecorate, __runInitializers, __propKey -- class C { -- @dec static get [x]() { return 1; } -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.js deleted file mode 100644 index fa7a578380..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.js +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; -declare var x: any; - -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec static get [x]() { return 1; } -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec - static get [x]() { return 1; } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.js.diff deleted file mode 100644 index 8dde31742c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.js.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedGetter.js -@@= skipped -17, +17 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __propKey --let C = (() => { -- var _a; -- let _staticExtraInitializers = []; -- let _static_get_member_decorators; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(this, null, _static_get_member_decorators, { kind: "getter", name: _a, static: true, private: false, access: { has: obj => _a in obj, get: obj => obj[_a] }, metadata: _metadata }, null, _staticExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(this, _staticExtraInitializers); -- } -- static get [(_static_get_member_decorators = [dec], _a = tslib_1.__propKey(x))]() { return 1; } -- }; --})(); -+class C { -+ @dec -+ static get [x]() { return 1; } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt.diff deleted file mode 100644 index f867d632bb..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- declare var x: any; -- -- // needs: __esDecorate, __runInitializers, __propKey -- class C { -- @dec static [x]() {} -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.js deleted file mode 100644 index 519b504395..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.js +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; -declare var x: any; - -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec static [x]() {} -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec - static [x]() { } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.js.diff deleted file mode 100644 index 8e724becbb..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.js.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedMethod.js -@@= skipped -17, +17 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __propKey --let C = (() => { -- var _a; -- let _staticExtraInitializers = []; -- let _static_member_decorators; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(this, null, _static_member_decorators, { kind: "method", name: _a, static: true, private: false, access: { has: obj => _a in obj, get: obj => obj[_a] }, metadata: _metadata }, null, _staticExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(this, _staticExtraInitializers); -- } -- static [(_static_member_decorators = [dec], _a = tslib_1.__propKey(x))]() { } -- }; --})(); -+class C { -+ @dec -+ static [x]() { } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt.diff deleted file mode 100644 index a4337db2b1..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- declare var x: any; -- -- // needs: __esDecorate, __runInitializers, __propKey -- class C { -- @dec static set [x](value: number) { } -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.js deleted file mode 100644 index f32dba3617..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.js +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; -declare var x: any; - -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec static set [x](value: number) { } -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __propKey -class C { - @dec - static set [x](value) { } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.js.diff deleted file mode 100644 index 86cddaebc0..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.js.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticComputedSetter.js -@@= skipped -17, +17 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __propKey --let C = (() => { -- var _a; -- let _staticExtraInitializers = []; -- let _static_set_member_decorators; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(this, null, _static_set_member_decorators, { kind: "setter", name: _a, static: true, private: false, access: { has: obj => _a in obj, set: (obj, value) => { obj[_a] = value; } }, metadata: _metadata }, null, _staticExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(this, _staticExtraInitializers); -- } -- static set [(_static_set_member_decorators = [dec], _a = tslib_1.__propKey(x))](value) { } -- }; --})(); -+class C { -+ @dec -+ static set [x](value) { } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt.diff deleted file mode 100644 index 5a29bf8840..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- class C { -- @dec static accessor #x: any; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.js deleted file mode 100644 index 78aa427689..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec static accessor #x: any; -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec - static accessor #x; -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.js.diff deleted file mode 100644 index 7a409b7a4f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.js.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateAutoAccessor.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- let _static_private_x_decorators; -- let _static_private_x_initializers = []; -- let _static_private_x_extraInitializers = []; -- let _static_private_x_descriptor; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _static_private_x_decorators = [dec]; -- tslib_1.__esDecorate(this, _static_private_x_descriptor = { get: tslib_1.__setFunctionName(function () { return this.#x_accessor_storage; }, "#x", "get"), set: tslib_1.__setFunctionName(function (value) { this.#x_accessor_storage = value; }, "#x", "set") }, _static_private_x_decorators, { kind: "accessor", name: "#x", static: true, private: true, access: { has: obj => #x in obj, get: obj => obj.#x, set: (obj, value) => { obj.#x = value; } }, metadata: _metadata }, _static_private_x_initializers, _static_private_x_extraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- static #x_accessor_storage = tslib_1.__runInitializers(this, _static_private_x_initializers, void 0); -- static get #x() { return _static_private_x_descriptor.get.call(this); } -- static set #x(value) { return _static_private_x_descriptor.set.call(this, value); } -- static { -- tslib_1.__runInitializers(this, _static_private_x_extraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ static accessor #x; -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt.diff deleted file mode 100644 index fbf7dccd4f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (2 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers -- class C { -- @dec static #x: any; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.js deleted file mode 100644 index 3fffab7f86..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers -class C { - @dec static #x: any; -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers -class C { - @dec - static #x; -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.js.diff deleted file mode 100644 index 94f3419021..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.js.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateField.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers --let C = (() => { -- let _static_private_x_decorators; -- let _static_private_x_initializers = []; -- let _static_private_x_extraInitializers = []; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _static_private_x_decorators = [dec]; -- tslib_1.__esDecorate(null, null, _static_private_x_decorators, { kind: "field", name: "#x", static: true, private: true, access: { has: obj => #x in obj, get: obj => obj.#x, set: (obj, value) => { obj.#x = value; } }, metadata: _metadata }, _static_private_x_initializers, _static_private_x_extraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- } -- static #x = tslib_1.__runInitializers(this, _static_private_x_initializers, void 0); -- static { -- tslib_1.__runInitializers(this, _static_private_x_extraInitializers); -- } -- }; --})(); -+class C { -+ @dec -+ static #x; -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt.diff deleted file mode 100644 index c8c1da30c9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- class C { -- @dec static get #foo() { return 1; } -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.js deleted file mode 100644 index 1c10ca53ac..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec static get #foo() { return 1; } -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec - static get #foo() { return 1; } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.js.diff deleted file mode 100644 index efec054aad..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.js.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateGetter.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- let _staticExtraInitializers = []; -- let _static_private_get_foo_decorators; -- let _static_private_get_foo_descriptor; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _static_private_get_foo_decorators = [dec]; -- tslib_1.__esDecorate(this, _static_private_get_foo_descriptor = { get: tslib_1.__setFunctionName(function () { return 1; }, "#foo", "get") }, _static_private_get_foo_decorators, { kind: "getter", name: "#foo", static: true, private: true, access: { has: obj => #foo in obj, get: obj => obj.#foo }, metadata: _metadata }, null, _staticExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(this, _staticExtraInitializers); -- } -- static get #foo() { return _static_private_get_foo_descriptor.get.call(this); } -- }; --})(); -+class C { -+ @dec -+ static get #foo() { return 1; } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt.diff deleted file mode 100644 index f10cb5b68b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- class C { -- @dec static #foo() {} -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.js deleted file mode 100644 index e7bec5f006..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec static #foo() {} -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec - static #foo() { } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.js.diff deleted file mode 100644 index 4385752f97..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.js.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateMethod.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- let _staticExtraInitializers = []; -- let _static_private_foo_decorators; -- let _static_private_foo_descriptor; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _static_private_foo_decorators = [dec]; -- tslib_1.__esDecorate(this, _static_private_foo_descriptor = { value: tslib_1.__setFunctionName(function () { }, "#foo") }, _static_private_foo_decorators, { kind: "method", name: "#foo", static: true, private: true, access: { has: obj => #foo in obj, get: obj => obj.#foo }, metadata: _metadata }, null, _staticExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(this, _staticExtraInitializers); -- } -- static get #foo() { return _static_private_foo_descriptor.value; } -- }; --})(); -+class C { -+ @dec -+ static #foo() { } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt.diff deleted file mode 100644 index 2dff346f90..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {} -- -- declare var dec: any; -- -- // needs: __esDecorate, __runInitializers, __setFunctionName -- class C { -- @dec static set #foo(value: number) { } -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- } -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.js deleted file mode 100644 index e7dcc94668..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classDeclaration/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.ts] //// - -//// [main.ts] -export {} - -declare var dec: any; - -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec static set #foo(value: number) { } -} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// needs: __esDecorate, __runInitializers, __setFunctionName -class C { - @dec - static set #foo(value) { } -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.js.diff deleted file mode 100644 index 01d334d473..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.js.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.js -+++ new.esDecorators-classDeclaration-missingEmitHelpers-staticPrivateSetter.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // needs: __esDecorate, __runInitializers, __setFunctionName --let C = (() => { -- let _staticExtraInitializers = []; -- let _static_private_set_foo_decorators; -- let _static_private_set_foo_descriptor; -- return class C { -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- _static_private_set_foo_decorators = [dec]; -- tslib_1.__esDecorate(this, _static_private_set_foo_descriptor = { set: tslib_1.__setFunctionName(function (value) { }, "#foo", "set") }, _static_private_set_foo_decorators, { kind: "setter", name: "#foo", static: true, private: true, access: { has: obj => #foo in obj, set: (obj, value) => { obj.#foo = value; } }, metadata: _metadata }, null, _staticExtraInitializers); -- if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(this, _staticExtraInitializers); -- } -- static set #foo(value) { return _static_private_set_foo_descriptor.set.call(this, value); } -- }; --})(); -+class C { -+ @dec -+ static set #foo(value) { } -+} \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt.diff deleted file mode 100644 index 667174e2be..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.1.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(4,18): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,18): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,18): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- declare var dec: any; -- -- // uses: __esDecorate, __runInitializers, __setFunctionName -- export const C = @dec class {}; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.js deleted file mode 100644 index af786f20f8..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.js +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.ts] //// - -//// [main.ts] -declare var dec: any; - -// uses: __esDecorate, __runInitializers, __setFunctionName -export const C = @dec class {}; - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.C = void 0; -// uses: __esDecorate, __runInitializers, __setFunctionName -const C = -@dec -class { -}; -exports.C = C; diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.js.diff deleted file mode 100644 index a2818934f3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.1.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.1.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.1.js -@@= skipped -13, +13 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.C = void 0; --const tslib_1 = require("tslib"); - // uses: __esDecorate, __runInitializers, __setFunctionName --exports.C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; --})(); -+const C = -+@dec -+class { -+}; -+exports.C = C; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt.diff deleted file mode 100644 index e6fa73a801..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.10.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- var C; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- C &&= @dec class {}; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.js deleted file mode 100644 index f57e68b1b4..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -var C; - -// uses __esDecorate, __runInitializers, __setFunctionName -C &&= @dec class {}; - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var C; -// uses __esDecorate, __runInitializers, __setFunctionName -C &&= -@dec -class { -}; diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.js.diff deleted file mode 100644 index 30fb48d21c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.10.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.10.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.10.js -@@= skipped -15, +15 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - var C; - // uses __esDecorate, __runInitializers, __setFunctionName --C &&= (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; --})(); -+C &&= -+@dec -+class { -+}; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt.diff deleted file mode 100644 index 77cf96afe3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.11.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- var C; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- C ??= @dec class {}; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.js deleted file mode 100644 index 7338e6d27e..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -var C; - -// uses __esDecorate, __runInitializers, __setFunctionName -C ??= @dec class {}; - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var C; -// uses __esDecorate, __runInitializers, __setFunctionName -C ??= -@dec -class { -}; diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.js.diff deleted file mode 100644 index 49028bcaf2..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.11.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.11.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.11.js -@@= skipped -15, +15 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - var C; - // uses __esDecorate, __runInitializers, __setFunctionName --C ??= (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; --})(); -+C ??= -+@dec -+class { -+}; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt.diff deleted file mode 100644 index ba5ae363ec..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.12.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(5,16): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(5,16): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(5,16): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- function f(C = @dec class {}) {} -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.js deleted file mode 100644 index 5939e86577..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.js +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -// uses __esDecorate, __runInitializers, __setFunctionName -function f(C = @dec class {}) {} - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// uses __esDecorate, __runInitializers, __setFunctionName -function f(C = -@dec -class { -}) { } diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.js.diff deleted file mode 100644 index 8bc760724a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.12.js.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.12.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.12.js -@@= skipped -13, +13 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // uses __esDecorate, __runInitializers, __setFunctionName --function f(C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; --})()) { } -+function f(C = -+@dec -+class { -+}) { } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt.diff deleted file mode 100644 index 7acd2fde44..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.13.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(4,20): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,20): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,20): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- declare var dec: any; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- export const C = ((@dec class {})); -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.js deleted file mode 100644 index 4f21ec91bf..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.js +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.ts] //// - -//// [main.ts] -declare var dec: any; - -// uses __esDecorate, __runInitializers, __setFunctionName -export const C = ((@dec class {})); - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.C = void 0; -// uses __esDecorate, __runInitializers, __setFunctionName -exports.C = (( -@dec -class { -})); diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.js.diff deleted file mode 100644 index bbc2b14557..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.13.js.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.13.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.13.js -@@= skipped -13, +13 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.C = void 0; --const tslib_1 = require("tslib"); - // uses __esDecorate, __runInitializers, __setFunctionName --exports.C = (((() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; --})())); -+exports.C = (( -+@dec -+class { -+})); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt.diff deleted file mode 100644 index b27e2a1661..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.14.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(6,9): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,9): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,9): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,9): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (4 errors) ==== -- export {}; -- declare var dec: any; -- declare var x: any; -- -- // uses __esDecorate, __runInitializers, __setFunctionName, __propKey -- ({ [x]: @dec class {} }); -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.js deleted file mode 100644 index 7b3d9ae826..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.js +++ /dev/null @@ -1,22 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; -declare var x: any; - -// uses __esDecorate, __runInitializers, __setFunctionName, __propKey -({ [x]: @dec class {} }); - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// uses __esDecorate, __runInitializers, __setFunctionName, __propKey -({ [x]: - @dec - class { - } }); diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.js.diff deleted file mode 100644 index 643750720b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.14.js.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.14.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.14.js -@@= skipped -13, +13 lines =@@ - - //// [main.js] - "use strict"; --var _a; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // uses __esDecorate, __runInitializers, __setFunctionName, __propKey --({ [_a = tslib_1.__propKey(x)]: (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, _a); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; -- })() }); -+({ [x]: -+ @dec -+ class { -+ } }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt.diff deleted file mode 100644 index 695d8a90bc..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.15.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(5,15): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(5,15): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(5,15): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- class C { D = @dec class {} } -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.js deleted file mode 100644 index a0727e6ce4..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.js +++ /dev/null @@ -1,23 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -// uses __esDecorate, __runInitializers, __setFunctionName -class C { D = @dec class {} } - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// uses __esDecorate, __runInitializers, __setFunctionName -class C { - D = - @dec - class { - }; -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.js.diff deleted file mode 100644 index 39fc19176a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.15.js.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.15.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.15.js -@@= skipped -13, +13 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // uses __esDecorate, __runInitializers, __setFunctionName - class C { -- D = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "D"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; -- })(); -+ D = -+ @dec -+ class { -+ }; - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt.diff deleted file mode 100644 index 40b973abf2..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.16.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(6,17): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,17): error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,17): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(6,17): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (4 errors) ==== -- export {}; -- declare var dec: any; -- declare var x: any; -- -- // uses __esDecorate, __runInitializers, __setFunctionName, __propKey -- class C { [x] = @dec class {} } -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__propKey' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.js deleted file mode 100644 index 3e3f24932c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; -declare var x: any; - -// uses __esDecorate, __runInitializers, __setFunctionName, __propKey -class C { [x] = @dec class {} } - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// uses __esDecorate, __runInitializers, __setFunctionName, __propKey -class C { - [x] = - @dec - class { - }; -} diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.js.diff deleted file mode 100644 index 7c08afcdb3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.16.js.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.16.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.16.js -@@= skipped -13, +13 lines =@@ - - //// [main.js] - "use strict"; --var _a; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // uses __esDecorate, __runInitializers, __setFunctionName, __propKey - class C { -- [_a = tslib_1.__propKey(x)] = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, _a); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; -- })(); -+ [x] = -+ @dec -+ class { -+ }; - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt.diff deleted file mode 100644 index 1930c4104a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.17.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(8,13): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,13): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(8,13): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- declare var x: any; -- -- var C; -- -- // uses __esDecorate, __runInitializers, __setFunctionName, __propKey -- ({ [x]: C = @dec class {} } = {}); -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.js deleted file mode 100644 index cfc18b8081..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.js +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; -declare var x: any; - -var C; - -// uses __esDecorate, __runInitializers, __setFunctionName, __propKey -({ [x]: C = @dec class {} } = {}); - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var C; -// uses __esDecorate, __runInitializers, __setFunctionName, __propKey -({ [x]: C = - @dec - class { - } } = {}); diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.js.diff deleted file mode 100644 index 1c56735f1e..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.17.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.17.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.17.js -@@= skipped -16, +16 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - var C; - // uses __esDecorate, __runInitializers, __setFunctionName, __propKey --({ [x]: C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; -- })() } = {}); -+({ [x]: C = -+ @dec -+ class { -+ } } = {}); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt.diff deleted file mode 100644 index 44206ec9c6..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.2.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(4,18): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,18): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (2 errors) ==== -- declare var dec: any; -- -- // uses: __esDecorate, __runInitializers -- export const C = @dec class C {}; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.js deleted file mode 100644 index fd39627eb0..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.js +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.ts] //// - -//// [main.ts] -declare var dec: any; - -// uses: __esDecorate, __runInitializers -export const C = @dec class C {}; - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.C = void 0; -// uses: __esDecorate, __runInitializers -exports.C = -@dec -class C { -}; diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.js.diff deleted file mode 100644 index adea1cc512..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.2.js.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.2.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.2.js -@@= skipped -13, +13 lines =@@ - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.C = void 0; --const tslib_1 = require("tslib"); - // uses: __esDecorate, __runInitializers --exports.C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var C = class { -- static { _classThis = this; } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- C = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return C = _classThis; --})(); -+exports.C = -+@dec -+class C { -+}; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt.diff deleted file mode 100644 index 76fbf80b65..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.3.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(4,17): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,17): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(4,17): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- declare var dec: any; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- export default (@dec class {}); -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.js deleted file mode 100644 index 1c8e6c3568..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.js +++ /dev/null @@ -1,20 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.ts] //// - -//// [main.ts] -declare var dec: any; - -// uses __esDecorate, __runInitializers, __setFunctionName -export default (@dec class {}); - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// uses __esDecorate, __runInitializers, __setFunctionName -exports.default = ( -@dec -class { -}); diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.js.diff deleted file mode 100644 index 4bc78eb65a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.3.js.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.3.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.3.js -@@= skipped -12, +12 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // uses __esDecorate, __runInitializers, __setFunctionName --exports.default = ((() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "default"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; --})()); -+exports.default = ( -+@dec -+class { -+}); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt.diff deleted file mode 100644 index d48d0bf993..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.4.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,5): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- var C; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- C = @dec class {}; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.js deleted file mode 100644 index fb68e506d9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -var C; - -// uses __esDecorate, __runInitializers, __setFunctionName -C = @dec class {}; - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var C; -// uses __esDecorate, __runInitializers, __setFunctionName -C = -@dec -class { -}; diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.js.diff deleted file mode 100644 index 0f725cdcbb..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.4.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.4.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.4.js -@@= skipped -15, +15 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - var C; - // uses __esDecorate, __runInitializers, __setFunctionName --C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; --})(); -+C = -+@dec -+class { -+}; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt.diff deleted file mode 100644 index 0aab00116a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.5.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,6): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,6): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,6): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- var C; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- [C = @dec class {}] = []; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.js deleted file mode 100644 index 94d8f93768..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -var C; - -// uses __esDecorate, __runInitializers, __setFunctionName -[C = @dec class {}] = []; - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var C; -// uses __esDecorate, __runInitializers, __setFunctionName -[C = - @dec - class { - }] = []; diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.js.diff deleted file mode 100644 index ec29a220a1..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.5.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.5.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.5.js -@@= skipped -15, +15 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - var C; - // uses __esDecorate, __runInitializers, __setFunctionName --[C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; -- })()] = []; -+[C = -+ @dec -+ class { -+ }] = []; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt.diff deleted file mode 100644 index 7308dbc0bc..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.6.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(5,7): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(5,7): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(5,7): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- ({ C: @dec class {} }); -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.js deleted file mode 100644 index fe3d2736aa..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.js +++ /dev/null @@ -1,21 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -// uses __esDecorate, __runInitializers, __setFunctionName -({ C: @dec class {} }); - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -// uses __esDecorate, __runInitializers, __setFunctionName -({ C: - @dec - class { - } }); diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.js.diff deleted file mode 100644 index 972939239c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.6.js.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.6.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.6.js -@@= skipped -13, +13 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // uses __esDecorate, __runInitializers, __setFunctionName --({ C: (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; -- })() }); -+({ C: -+ @dec -+ class { -+ } }); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt.diff deleted file mode 100644 index 163c81c274..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.7.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,11): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,11): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,11): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- var C; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- ({ C: C = @dec class {} } = {}); -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.js deleted file mode 100644 index cad801c5a3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -var C; - -// uses __esDecorate, __runInitializers, __setFunctionName -({ C: C = @dec class {} } = {}); - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var C; -// uses __esDecorate, __runInitializers, __setFunctionName -({ C: C = - @dec - class { - } } = {}); diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.js.diff deleted file mode 100644 index fc9c27a30b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.7.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.7.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.7.js -@@= skipped -15, +15 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - var C; - // uses __esDecorate, __runInitializers, __setFunctionName --({ C: C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; -- })() } = {}); -+({ C: C = -+ @dec -+ class { -+ } } = {}); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt.diff deleted file mode 100644 index 4071d94b44..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.8.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,8): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,8): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,8): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- var C; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- ({ C = @dec class {} } = {}); -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.js deleted file mode 100644 index 74be852839..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -var C; - -// uses __esDecorate, __runInitializers, __setFunctionName -({ C = @dec class {} } = {}); - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var C; -// uses __esDecorate, __runInitializers, __setFunctionName -({ C = - @dec - class { - } } = {}); diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.js.diff deleted file mode 100644 index 87eccb38c3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.8.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.8.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.8.js -@@= skipped -15, +15 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - var C; - // uses __esDecorate, __runInitializers, __setFunctionName --({ C = (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; -- })() } = {}); -+({ C = -+ @dec -+ class { -+ } } = {}); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt.diff deleted file mode 100644 index eca308e459..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.9.errors.txt -@@= skipped -0, +0 lines =@@ --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. --main.ts(7,7): error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- -- --==== main.ts (3 errors) ==== -- export {}; -- declare var dec: any; -- -- var C; -- -- // uses __esDecorate, __runInitializers, __setFunctionName -- C ||= @dec class {}; -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__esDecorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__runInitializers' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- ~~~~ --!!! error TS2343: This syntax requires an imported helper named '__setFunctionName' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'. -- --==== tslib.d.ts (0 errors) ==== -- export {} -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.js b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.js deleted file mode 100644 index b714581b86..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.js +++ /dev/null @@ -1,24 +0,0 @@ -//// [tests/cases/conformance/esDecorators/classExpression/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.ts] //// - -//// [main.ts] -export {}; -declare var dec: any; - -var C; - -// uses __esDecorate, __runInitializers, __setFunctionName -C ||= @dec class {}; - -//// [tslib.d.ts] -export {} - - -//// [main.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -var C; -// uses __esDecorate, __runInitializers, __setFunctionName -C ||= -@dec -class { -}; diff --git a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.js.diff b/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.js.diff deleted file mode 100644 index e9f6073ee6..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esDecorators-classExpression-missingEmitHelpers-classDecorator.9.js.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.esDecorators-classExpression-missingEmitHelpers-classDecorator.9.js -+++ new.esDecorators-classExpression-missingEmitHelpers-classDecorator.9.js -@@= skipped -15, +15 lines =@@ - //// [main.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - var C; - // uses __esDecorate, __runInitializers, __setFunctionName --C ||= (() => { -- let _classDecorators = [dec]; -- let _classDescriptor; -- let _classExtraInitializers = []; -- let _classThis; -- var class_1 = class { -- static { _classThis = this; } -- static { tslib_1.__setFunctionName(_classThis, "C"); } -- static { -- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0; -- tslib_1.__esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers); -- class_1 = _classThis = _classDescriptor.value; -- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata }); -- tslib_1.__runInitializers(_classThis, _classExtraInitializers); -- } -- }; -- return class_1 = _classThis; --})(); -+C ||= -+@dec -+class { -+}; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).errors.txt b/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).errors.txt deleted file mode 100644 index ad250e2728..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).errors.txt +++ /dev/null @@ -1,43 +0,0 @@ -/importer-cjs.cjs(2,5): error TS2351: This expression is not constructable. - Type 'String' has no construct signatures. -/importer-cts.cts(2,5): error TS2351: This expression is not constructable. - Type 'String' has no construct signatures. -/importer-cts.cts(4,8): error TS1259: Module '"/exporter"' can only be default-imported using the 'esModuleInterop' flag -/importer-cts.cts(8,5): error TS2351: This expression is not constructable. - Type 'String' has no construct signatures. -/importer-cts.cts(10,10): error TS2614: Module '"./exporter.mjs"' has no exported member 'Oops'. Did you mean to use 'import Oops from "./exporter.mjs"' instead? - - -==== /importer-cjs.cjs (1 errors) ==== - const Foo = require("./exporter.mjs"); - new Foo(); - ~~~ -!!! error TS2351: This expression is not constructable. -!!! error TS2351: Type 'String' has no construct signatures. - -==== /importer-cts.cts (4 errors) ==== - import Foo = require("./exporter.mjs"); - new Foo(); - ~~~ -!!! error TS2351: This expression is not constructable. -!!! error TS2351: Type 'String' has no construct signatures. - - import Foo2 from "./exporter.mjs"; - ~~~~ -!!! error TS1259: Module '"/exporter"' can only be default-imported using the 'esModuleInterop' flag - new Foo2(); - - import * as Foo3 from "./exporter.mjs"; - new Foo3(); - ~~~~ -!!! error TS2351: This expression is not constructable. -!!! error TS2351: Type 'String' has no construct signatures. - - import { Oops } from "./exporter.mjs"; - ~~~~ -!!! error TS2614: Module '"./exporter.mjs"' has no exported member 'Oops'. Did you mean to use 'import Oops from "./exporter.mjs"' instead? - -==== /exporter.mts (0 errors) ==== - export default class Foo {} - const oops = "oops"; - export { oops as "module.exports" }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).symbols b/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).symbols deleted file mode 100644 index 4bb8d4d0df..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).symbols +++ /dev/null @@ -1,44 +0,0 @@ -//// [tests/cases/conformance/node/esmModuleExports2.ts] //// - -=== /importer-cjs.cjs === -const Foo = require("./exporter.mjs"); ->Foo : Symbol(Foo, Decl(importer-cjs.cjs, 0, 5)) ->require : Symbol(require) ->"./exporter.mjs" : Symbol("/exporter", Decl(exporter.mts, 0, 0)) - -new Foo(); ->Foo : Symbol(Foo, Decl(importer-cjs.cjs, 0, 5)) - -=== /importer-cts.cts === -import Foo = require("./exporter.mjs"); ->Foo : Symbol(Foo, Decl(importer-cts.cts, 0, 0)) - -new Foo(); ->Foo : Symbol(Foo, Decl(importer-cts.cts, 0, 0)) - -import Foo2 from "./exporter.mjs"; ->Foo2 : Symbol(Foo2, Decl(importer-cts.cts, 3, 6)) - -new Foo2(); ->Foo2 : Symbol(Foo2, Decl(importer-cts.cts, 3, 6)) - -import * as Foo3 from "./exporter.mjs"; ->Foo3 : Symbol(Foo3, Decl(importer-cts.cts, 6, 6)) - -new Foo3(); ->Foo3 : Symbol(Foo3, Decl(importer-cts.cts, 6, 6)) - -import { Oops } from "./exporter.mjs"; ->Oops : Symbol(Oops, Decl(importer-cts.cts, 9, 8)) - -=== /exporter.mts === -export default class Foo {} ->Foo : Symbol(Foo, Decl(exporter.mts, 0, 0)) - -const oops = "oops"; ->oops : Symbol(oops, Decl(exporter.mts, 1, 5)) - -export { oops as "module.exports" }; ->oops : Symbol(oops, Decl(exporter.mts, 1, 5)) ->"module.exports" : Symbol("module.exports", Decl(exporter.mts, 2, 8)) - diff --git a/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).types b/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).types deleted file mode 100644 index 6db56832f2..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esmModuleExports2(esmoduleinterop=false).types +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/conformance/node/esmModuleExports2.ts] //// - -=== /importer-cjs.cjs === -const Foo = require("./exporter.mjs"); ->Foo : "oops" ->require("./exporter.mjs") : typeof import("/exporter", { with: { "resolution-mode": "import" } }) ->require : any ->"./exporter.mjs" : "./exporter.mjs" - -new Foo(); ->new Foo() : any ->Foo : "oops" - -=== /importer-cts.cts === -import Foo = require("./exporter.mjs"); ->Foo : "oops" - -new Foo(); ->new Foo() : any ->Foo : "oops" - -import Foo2 from "./exporter.mjs"; ->Foo2 : any - -new Foo2(); ->new Foo2() : any ->Foo2 : any - -import * as Foo3 from "./exporter.mjs"; ->Foo3 : "oops" - -new Foo3(); ->new Foo3() : any ->Foo3 : "oops" - -import { Oops } from "./exporter.mjs"; ->Oops : any - -=== /exporter.mts === -export default class Foo {} ->Foo : Foo - -const oops = "oops"; ->oops : "oops" ->"oops" : "oops" - -export { oops as "module.exports" }; ->oops : "oops" ->"module.exports" : "oops" - diff --git a/testdata/baselines/reference/submodule/conformance/esnextmodulekindWithES5Target10.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esnextmodulekindWithES5Target10.errors.txt.diff deleted file mode 100644 index ab81f21865..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esnextmodulekindWithES5Target10.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.esnextmodulekindWithES5Target10.errors.txt -+++ new.esnextmodulekindWithES5Target10.errors.txt -@@= skipped -0, +0 lines =@@ - esnextmodulekindWithES5Target10.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. --esnextmodulekindWithES5Target10.ts(1,20): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+esnextmodulekindWithES5Target10.ts(1,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations. - esnextmodulekindWithES5Target10.ts(6,1): error TS1203: Export assignment cannot be used when targeting ECMAScript modules. Consider using 'export default' or another module format instead. - - -@@= skipped -7, +7 lines =@@ - ~~~~~~~~~~~~~~~~~~~~~~~~~~ - !!! error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - - namespace N { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/esnextmodulekindWithES5Target9.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/esnextmodulekindWithES5Target9.errors.txt.diff deleted file mode 100644 index d93400a25f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/esnextmodulekindWithES5Target9.errors.txt.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- old.esnextmodulekindWithES5Target9.errors.txt -+++ new.esnextmodulekindWithES5Target9.errors.txt -@@= skipped -0, +0 lines =@@ --esnextmodulekindWithES5Target9.ts(1,15): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --esnextmodulekindWithES5Target9.ts(3,17): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --esnextmodulekindWithES5Target9.ts(5,20): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --esnextmodulekindWithES5Target9.ts(13,15): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --esnextmodulekindWithES5Target9.ts(15,17): error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+esnextmodulekindWithES5Target9.ts(1,15): error TS2307: Cannot find module 'mod' or its corresponding type declarations. -+esnextmodulekindWithES5Target9.ts(3,17): error TS2307: Cannot find module 'mod' or its corresponding type declarations. -+esnextmodulekindWithES5Target9.ts(5,20): error TS2307: Cannot find module 'mod' or its corresponding type declarations. -+esnextmodulekindWithES5Target9.ts(13,15): error TS2307: Cannot find module 'mod' or its corresponding type declarations. -+esnextmodulekindWithES5Target9.ts(15,17): error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - - ==== esnextmodulekindWithES5Target9.ts (5 errors) ==== - import d from "mod"; - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - import {a} from "mod"; - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - import * as M from "mod"; - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - export {a}; - -@@= skipped -25, +25 lines =@@ - - export * from "mod"; - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - export {b} from "mod" - ~~~~~ --!!! error TS2792: Cannot find module 'mod'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module 'mod' or its corresponding type declarations. - - export default d; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportAndImport-es5.js b/testdata/baselines/reference/submodule/conformance/exportAndImport-es5.js index c9894913ed..bfff9d0087 100644 --- a/testdata/baselines/reference/submodule/conformance/exportAndImport-es5.js +++ b/testdata/baselines/reference/submodule/conformance/exportAndImport-es5.js @@ -19,9 +19,12 @@ function f1() { } //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f2; -const m1_1 = require("./m1"); +const m1_1 = __importDefault(require("./m1")); function f2() { (0, m1_1.default)(); } diff --git a/testdata/baselines/reference/submodule/conformance/exportAndImport-es5.js.diff b/testdata/baselines/reference/submodule/conformance/exportAndImport-es5.js.diff index 4beb463771..42d042f541 100644 --- a/testdata/baselines/reference/submodule/conformance/exportAndImport-es5.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportAndImport-es5.js.diff @@ -1,11 +1,11 @@ --- old.exportAndImport-es5.js +++ new.exportAndImport-es5.js -@@= skipped -20, +20 lines =@@ - "use strict"; +@@= skipped -23, +23 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = f2; --var m1_1 = require("./m1"); -+const m1_1 = require("./m1"); +-var m1_1 = __importDefault(require("./m1")); ++const m1_1 = __importDefault(require("./m1")); function f2() { (0, m1_1.default)(); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).js b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).js index 2e4cfe93fc..fd17045c09 100644 --- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).js +++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).js @@ -23,15 +23,81 @@ exports.a = 1; exports.b = 2; //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.ns = void 0; -exports.ns = require("./0"); +exports.ns = __importStar(require("./0")); ns.a; ns.b; //// [2.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const foo = require("./1"); +const foo = __importStar(require("./1")); foo.ns.a; foo.ns.b; diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).js.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).js.diff index 8d09dcdef6..73e165dc7c 100644 --- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportAsNamespace1(module=commonjs).js.diff @@ -1,10 +1,10 @@ --- old.exportAsNamespace1(module=commonjs).js +++ new.exportAsNamespace1(module=commonjs).js -@@= skipped -30, +30 lines =@@ - //// [2.js] - "use strict"; +@@= skipped -96, +96 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var foo = require("./1"); -+const foo = require("./1"); +-var foo = __importStar(require("./1")); ++const foo = __importStar(require("./1")); foo.ns.a; foo.ns.b; diff --git a/testdata/baselines/reference/submodule/conformance/exportAsNamespace_nonExistent.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/exportAsNamespace_nonExistent.errors.txt.diff deleted file mode 100644 index 10e334e986..0000000000 --- a/testdata/baselines/reference/submodule/conformance/exportAsNamespace_nonExistent.errors.txt.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- old.exportAsNamespace_nonExistent.errors.txt -+++ new.exportAsNamespace_nonExistent.errors.txt -@@= skipped -0, +0 lines =@@ --exportAsNamespace_nonExistent.ts(1,21): error TS2792: Cannot find module './nonexistent'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+exportAsNamespace_nonExistent.ts(1,21): error TS2307: Cannot find module './nonexistent' or its corresponding type declarations. - - - ==== exportAsNamespace_nonExistent.ts (1 errors) ==== - export * as ns from './nonexistent'; // Error - ~~~~~~~~~~~~~~~ --!!! error TS2792: Cannot find module './nonexistent'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2307: Cannot find module './nonexistent' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.errors.txt b/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.errors.txt new file mode 100644 index 0000000000..c4c85ea569 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.errors.txt @@ -0,0 +1,16 @@ +foo_0.ts(10,1): error TS2309: An export assignment cannot be used in a module with other exported elements. + + +==== foo_0.ts (1 errors) ==== + export enum E1 { + A,B,C + } + + class C1 { + + } + + // Invalid, as there is already an exported member. + export = C1; + ~~~~~~~~~~~~ +!!! error TS2309: An export assignment cannot be used in a module with other exported elements. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.js b/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.js new file mode 100644 index 0000000000..b94c4d9a72 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.js @@ -0,0 +1,26 @@ +//// [tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts] //// + +//// [foo_0.ts] +export enum E1 { + A,B,C +} + +class C1 { + +} + +// Invalid, as there is already an exported member. +export = C1; + +//// [foo_0.js] +"use strict"; +exports.E1 = void 0; +var E1; +(function (E1) { + E1[E1["A"] = 0] = "A"; + E1[E1["B"] = 1] = "B"; + E1[E1["C"] = 2] = "C"; +})(E1 || (exports.E1 = E1 = {})); +class C1 { +} +module.exports = C1; diff --git a/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.symbols b/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.symbols new file mode 100644 index 0000000000..46b1bc699c --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.symbols @@ -0,0 +1,21 @@ +//// [tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts] //// + +=== foo_0.ts === +export enum E1 { +>E1 : Symbol(E1, Decl(foo_0.ts, 0, 0)) + + A,B,C +>A : Symbol(E1.A, Decl(foo_0.ts, 0, 16)) +>B : Symbol(E1.B, Decl(foo_0.ts, 1, 3)) +>C : Symbol(E1.C, Decl(foo_0.ts, 1, 5)) +} + +class C1 { +>C1 : Symbol(C1, Decl(foo_0.ts, 2, 1)) + +} + +// Invalid, as there is already an exported member. +export = C1; +>C1 : Symbol(C1, Decl(foo_0.ts, 2, 1)) + diff --git a/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.types b/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.types new file mode 100644 index 0000000000..36f85e2c38 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/exportAssignmentAndDeclaration.types @@ -0,0 +1,21 @@ +//// [tests/cases/conformance/externalModules/exportAssignmentAndDeclaration.ts] //// + +=== foo_0.ts === +export enum E1 { +>E1 : E1 + + A,B,C +>A : E1.A +>B : E1.B +>C : E1.C +} + +class C1 { +>C1 : C1 + +} + +// Invalid, as there is already an exported member. +export = C1; +>C1 : C1 + diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace11.js b/testdata/baselines/reference/submodule/conformance/exportNamespace11.js index df682d2129..f9b72f6c31 100644 --- a/testdata/baselines/reference/submodule/conformance/exportNamespace11.js +++ b/testdata/baselines/reference/submodule/conformance/exportNamespace11.js @@ -22,6 +22,39 @@ exports.Ghost = Ghost; Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const intermediate = require("./intermediate"); +const intermediate = __importStar(require("./intermediate")); const ghost = new intermediate.Ghost(); diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace11.js.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace11.js.diff index 599293969e..af1dc8d76c 100644 --- a/testdata/baselines/reference/submodule/conformance/exportNamespace11.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportNamespace11.js.diff @@ -1,9 +1,9 @@ --- old.exportNamespace11.js +++ new.exportNamespace11.js -@@= skipped -22, +22 lines =@@ - //// [main.js] - "use strict"; +@@= skipped -55, +55 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var intermediate = require("./intermediate"); -+const intermediate = require("./intermediate"); +-var intermediate = __importStar(require("./intermediate")); ++const intermediate = __importStar(require("./intermediate")); const ghost = new intermediate.Ghost(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace12.js b/testdata/baselines/reference/submodule/conformance/exportNamespace12.js index 3b60d6bde4..0df59025b3 100644 --- a/testdata/baselines/reference/submodule/conformance/exportNamespace12.js +++ b/testdata/baselines/reference/submodule/conformance/exportNamespace12.js @@ -22,7 +22,40 @@ exports.c = 10; Object.defineProperty(exports, "__esModule", { value: true }); //// [main.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const types = require("./types"); +const types = __importStar(require("./types")); console.log(c); // Fails as expected, import is still allowed though. console.log(types.c); // Expected an error here. diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace12.js.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace12.js.diff index 0833077693..2a4de09302 100644 --- a/testdata/baselines/reference/submodule/conformance/exportNamespace12.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportNamespace12.js.diff @@ -1,10 +1,10 @@ --- old.exportNamespace12.js +++ new.exportNamespace12.js -@@= skipped -22, +22 lines =@@ - //// [main.js] - "use strict"; +@@= skipped -55, +55 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var types = require("./types"); -+const types = require("./types"); +-var types = __importStar(require("./types")); ++const types = __importStar(require("./types")); console.log(c); // Fails as expected, import is still allowed though. console.log(types.c); // Expected an error here. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace2.js b/testdata/baselines/reference/submodule/conformance/exportNamespace2.js index 37d143c0ee..32c5f69d2f 100644 --- a/testdata/baselines/reference/submodule/conformance/exportNamespace2.js +++ b/testdata/baselines/reference/submodule/conformance/exportNamespace2.js @@ -24,9 +24,42 @@ class A { exports.A = A; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; -exports.a = require("./a"); +exports.a = __importStar(require("./a")); //// [c.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace3.js b/testdata/baselines/reference/submodule/conformance/exportNamespace3.js index 3990e0a97b..c0937e2717 100644 --- a/testdata/baselines/reference/submodule/conformance/exportNamespace3.js +++ b/testdata/baselines/reference/submodule/conformance/exportNamespace3.js @@ -26,9 +26,42 @@ exports.A = A; Object.defineProperty(exports, "__esModule", { value: true }); //// [c.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; -exports.a = require("./b"); +exports.a = __importStar(require("./b")); //// [d.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/exportNamespace3.js.diff b/testdata/baselines/reference/submodule/conformance/exportNamespace3.js.diff index a735cb42e1..f194b66cad 100644 --- a/testdata/baselines/reference/submodule/conformance/exportNamespace3.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportNamespace3.js.diff @@ -1,6 +1,6 @@ --- old.exportNamespace3.js +++ new.exportNamespace3.js -@@= skipped -31, +31 lines =@@ +@@= skipped -64, +64 lines =@@ //// [d.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/exportStar.js b/testdata/baselines/reference/submodule/conformance/exportStar.js index ec066010a7..f1467d3ce7 100644 --- a/testdata/baselines/reference/submodule/conformance/exportStar.js +++ b/testdata/baselines/reference/submodule/conformance/exportStar.js @@ -72,8 +72,41 @@ __exportStar(require("./t2"), exports); __exportStar(require("./t3"), exports); //// [main.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const t4_1 = require("./t4"); +const t4_1 = __importStar(require("./t4")); t4_1.default; t4_1.x; t4_1.y; diff --git a/testdata/baselines/reference/submodule/conformance/exportStar.js.diff b/testdata/baselines/reference/submodule/conformance/exportStar.js.diff index 349dbabcbd..d3cab3a024 100644 --- a/testdata/baselines/reference/submodule/conformance/exportStar.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportStar.js.diff @@ -1,11 +1,11 @@ --- old.exportStar.js +++ new.exportStar.js -@@= skipped -72, +72 lines =@@ - //// [main.js] - "use strict"; +@@= skipped -105, +105 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var t4_1 = require("./t4"); -+const t4_1 = require("./t4"); +-var t4_1 = __importStar(require("./t4")); ++const t4_1 = __importStar(require("./t4")); t4_1.default; t4_1.x; t4_1.y; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.js b/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.js index 6de701ebb9..9c2bae4b0b 100644 --- a/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.js +++ b/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.js @@ -21,9 +21,42 @@ export type Something = S.Something Object.defineProperty(exports, "__esModule", { value: true }); //// [prelude.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Something = void 0; -exports.Something = require("./Something"); +exports.Something = __importStar(require("./Something")); //// [usage.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.js.diff b/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.js.diff index 398b8561e0..24868a23a2 100644 --- a/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportTypeMergedWithExportStarAsNamespace.js.diff @@ -1,6 +1,6 @@ --- old.exportTypeMergedWithExportStarAsNamespace.js +++ new.exportTypeMergedWithExportStarAsNamespace.js -@@= skipped -27, +27 lines =@@ +@@= skipped -60, +60 lines =@@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.myValue = void 0; diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports4-es6.js b/testdata/baselines/reference/submodule/conformance/exportsAndImports4-es6.js index baa558ec02..911828220e 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImports4-es6.js +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports4-es6.js @@ -44,26 +44,62 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; //// [t3.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.f2 = exports.f1 = exports.e2 = exports.e1 = exports.d = exports.c = exports.b = exports.a = void 0; const a = require("./t1"); exports.a = a; a.default; -const t1_1 = require("./t1"); +const t1_1 = __importDefault(require("./t1")); exports.b = t1_1.default; t1_1.default; -const c = require("./t1"); +const c = __importStar(require("./t1")); exports.c = c; c.default; -const t1_2 = require("./t1"); +const t1_2 = __importDefault(require("./t1")); Object.defineProperty(exports, "d", { enumerable: true, get: function () { return t1_2.default; } }); t1_2.default; -const t1_3 = require("./t1"), e2 = t1_3; +const t1_3 = __importStar(require("./t1")), e2 = t1_3; exports.e1 = t1_3.default; exports.e2 = e2; t1_3.default; e2.default; -const t1_4 = require("./t1"); +const t1_4 = __importDefault(require("./t1")); exports.f1 = t1_4.default; Object.defineProperty(exports, "f2", { enumerable: true, get: function () { return t1_4.default; } }); t1_4.default; diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports4-es6.types b/testdata/baselines/reference/submodule/conformance/exportsAndImports4-es6.types index f3ad69afe4..cac561f15b 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImports4-es6.types +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports4-es6.types @@ -16,11 +16,11 @@ b; >b : "hello" import * as c from "./t1"; ->c : typeof a +>c : typeof c c.default; >c.default : "hello" ->c : typeof a +>c : typeof c >default : "hello" import { default as d } from "./t1"; @@ -32,14 +32,14 @@ d; import e1, * as e2 from "./t1"; >e1 : "hello" ->e2 : typeof a +>e2 : typeof e2 e1; >e1 : "hello" e2.default; >e2.default : "hello" ->e2 : typeof a +>e2 : typeof e2 >default : "hello" import f1, { default as f2 } from "./t1"; @@ -56,10 +56,10 @@ f2; export { a, b, c, d, e1, e2, f1, f2 }; >a : typeof a >b : "hello" ->c : typeof a +>c : typeof c >d : "hello" >e1 : "hello" ->e2 : typeof a +>e2 : typeof e2 >f1 : "hello" >f2 : "hello" diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports4.js b/testdata/baselines/reference/submodule/conformance/exportsAndImports4.js index 93060c2f48..ba977815e3 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImports4.js +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports4.js @@ -44,26 +44,62 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "hello"; //// [t3.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.f2 = exports.f1 = exports.e2 = exports.e1 = exports.d = exports.c = exports.b = exports.a = void 0; const a = require("./t1"); exports.a = a; a.default; -const t1_1 = require("./t1"); +const t1_1 = __importDefault(require("./t1")); exports.b = t1_1.default; t1_1.default; -const c = require("./t1"); +const c = __importStar(require("./t1")); exports.c = c; c.default; -const t1_2 = require("./t1"); +const t1_2 = __importDefault(require("./t1")); Object.defineProperty(exports, "d", { enumerable: true, get: function () { return t1_2.default; } }); t1_2.default; -const t1_3 = require("./t1"), e2 = t1_3; +const t1_3 = __importStar(require("./t1")), e2 = t1_3; exports.e1 = t1_3.default; exports.e2 = e2; t1_3.default; e2.default; -const t1_4 = require("./t1"); +const t1_4 = __importDefault(require("./t1")); exports.f1 = t1_4.default; Object.defineProperty(exports, "f2", { enumerable: true, get: function () { return t1_4.default; } }); t1_4.default; diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports4.js.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImports4.js.diff index d524723893..7621cd1e0f 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImports4.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports4.js.diff @@ -1,33 +1,33 @@ --- old.exportsAndImports4.js +++ new.exportsAndImports4.js -@@= skipped -45, +45 lines =@@ - "use strict"; +@@= skipped -81, +81 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.f2 = exports.f1 = exports.e2 = exports.e1 = exports.d = exports.c = exports.b = exports.a = void 0; -var a = require("./t1"); +const a = require("./t1"); exports.a = a; a.default; --var t1_1 = require("./t1"); -+const t1_1 = require("./t1"); +-var t1_1 = __importDefault(require("./t1")); ++const t1_1 = __importDefault(require("./t1")); exports.b = t1_1.default; t1_1.default; --var c = require("./t1"); -+const c = require("./t1"); +-var c = __importStar(require("./t1")); ++const c = __importStar(require("./t1")); exports.c = c; c.default; --var t1_2 = require("./t1"); -+const t1_2 = require("./t1"); +-var t1_2 = __importDefault(require("./t1")); ++const t1_2 = __importDefault(require("./t1")); Object.defineProperty(exports, "d", { enumerable: true, get: function () { return t1_2.default; } }); t1_2.default; --var t1_3 = require("./t1"), e2 = t1_3; -+const t1_3 = require("./t1"), e2 = t1_3; +-var t1_3 = __importStar(require("./t1")), e2 = t1_3; ++const t1_3 = __importStar(require("./t1")), e2 = t1_3; exports.e1 = t1_3.default; exports.e2 = e2; t1_3.default; e2.default; --var t1_4 = require("./t1"); -+const t1_4 = require("./t1"); +-var t1_4 = __importDefault(require("./t1")); ++const t1_4 = __importDefault(require("./t1")); exports.f1 = t1_4.default; Object.defineProperty(exports, "f2", { enumerable: true, get: function () { return t1_4.default; } }); t1_4.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImports4.types b/testdata/baselines/reference/submodule/conformance/exportsAndImports4.types index 2cdff36cb5..fefafb825c 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImports4.types +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImports4.types @@ -16,11 +16,11 @@ b; >b : "hello" import * as c from "./t1"; ->c : typeof a +>c : typeof c c.default; >c.default : "hello" ->c : typeof a +>c : typeof c >default : "hello" import { default as d } from "./t1"; @@ -32,14 +32,14 @@ d; import e1, * as e2 from "./t1"; >e1 : "hello" ->e2 : typeof a +>e2 : typeof e2 e1; >e1 : "hello" e2.default; >e2.default : "hello" ->e2 : typeof a +>e2 : typeof e2 >default : "hello" import f1, { default as f2 } from "./t1"; @@ -56,10 +56,10 @@ f2; export { a, b, c, d, e1, e2, f1, f2 }; >a : typeof a >b : "hello" ->c : typeof a +>c : typeof c >d : "hello" >e1 : "hello" ->e2 : typeof a +>e2 : typeof e2 >f1 : "hello" >f2 : "hello" diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithContextualKeywordNames02.js b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithContextualKeywordNames02.js index 2012a4f47a..852a6808ee 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithContextualKeywordNames02.js +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithContextualKeywordNames02.js @@ -25,8 +25,41 @@ exports.return = as; exports.as = as; //// [t2.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const as = require("./t1"); +const as = __importStar(require("./t1")); var x = as.as; var y = as.return; //// [t3.js] diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithContextualKeywordNames02.js.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithContextualKeywordNames02.js.diff index f74cedde69..9e3d60b55a 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithContextualKeywordNames02.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithContextualKeywordNames02.js.diff @@ -1,11 +1,11 @@ --- old.exportsAndImportsWithContextualKeywordNames02.js +++ new.exportsAndImportsWithContextualKeywordNames02.js -@@= skipped -25, +25 lines =@@ - //// [t2.js] - "use strict"; +@@= skipped -58, +58 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var as = require("./t1"); -+const as = require("./t1"); +-var as = __importStar(require("./t1")); ++const as = __importStar(require("./t1")); var x = as.as; var y = as.return; //// [t3.js] \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores1.js b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores1.js index e6e36ef2e7..5b7342a63f 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores1.js +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores1.js @@ -24,6 +24,9 @@ exports.default = R = { }; //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("./m1"); +const m1_1 = __importDefault(require("./m1")); const { __, _, ___ } = m1_1.default; diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores1.js.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores1.js.diff index 1d85a01527..53c3a42fd2 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores1.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores1.js.diff @@ -1,9 +1,9 @@ --- old.exportsAndImportsWithUnderscores1.js +++ new.exportsAndImportsWithUnderscores1.js -@@= skipped -24, +24 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -27, +27 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("./m1"); -+const m1_1 = require("./m1"); +-var m1_1 = __importDefault(require("./m1")); ++const m1_1 = __importDefault(require("./m1")); const { __, _, ___ } = m1_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores2.js b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores2.js index 48b5fa4882..f7df10ca64 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores2.js +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores2.js @@ -22,6 +22,9 @@ exports.default = R = { }; //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("./m1"); +const m1_1 = __importDefault(require("./m1")); const { __esmodule, __proto__ } = m1_1.default; diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores2.js.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores2.js.diff index bce81c3b2f..28ea7e5ae3 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores2.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores2.js.diff @@ -1,9 +1,9 @@ --- old.exportsAndImportsWithUnderscores2.js +++ new.exportsAndImportsWithUnderscores2.js -@@= skipped -22, +22 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -25, +25 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("./m1"); -+const m1_1 = require("./m1"); +-var m1_1 = __importDefault(require("./m1")); ++const m1_1 = __importDefault(require("./m1")); const { __esmodule, __proto__ } = m1_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores3.js b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores3.js index f6d2f77f67..88ea6d372a 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores3.js +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores3.js @@ -24,6 +24,9 @@ exports.default = R = { }; //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("./m1"); +const m1_1 = __importDefault(require("./m1")); const { ___, ___hello, _hi } = m1_1.default; diff --git a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores3.js.diff b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores3.js.diff index 3703bfc624..15fb77a3fe 100644 --- a/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores3.js.diff +++ b/testdata/baselines/reference/submodule/conformance/exportsAndImportsWithUnderscores3.js.diff @@ -1,9 +1,9 @@ --- old.exportsAndImportsWithUnderscores3.js +++ new.exportsAndImportsWithUnderscores3.js -@@= skipped -24, +24 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -27, +27 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("./m1"); -+const m1_1 = require("./m1"); +-var m1_1 = __importDefault(require("./m1")); ++const m1_1 = __importDefault(require("./m1")); const { ___, ___hello, _hi } = m1_1.default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/extensionLoadingPriority(moduleresolution=classic).symbols b/testdata/baselines/reference/submodule/conformance/extensionLoadingPriority(moduleresolution=classic).symbols deleted file mode 100644 index 065ed64eca..0000000000 --- a/testdata/baselines/reference/submodule/conformance/extensionLoadingPriority(moduleresolution=classic).symbols +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/extensionLoadingPriority.ts] //// - -=== /project/a.js === - -export default "a.js"; - -=== /project/a.js.js === - -export default "a.js.js"; - -=== /project/dir/index.ts === - -export default "dir/index.ts"; - -=== /project/dir.js === - -export default "dir.js"; - -=== /project/b.ts === -import a from "./a.js"; ->a : Symbol(a, Decl(b.ts, 0, 6)) - -import dir from "./dir"; ->dir : Symbol(dir, Decl(b.ts, 1, 6)) - diff --git a/testdata/baselines/reference/submodule/conformance/extensionLoadingPriority(moduleresolution=classic).types b/testdata/baselines/reference/submodule/conformance/extensionLoadingPriority(moduleresolution=classic).types deleted file mode 100644 index a4a16f8cd5..0000000000 --- a/testdata/baselines/reference/submodule/conformance/extensionLoadingPriority(moduleresolution=classic).types +++ /dev/null @@ -1,25 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/extensionLoadingPriority.ts] //// - -=== /project/a.js === - -export default "a.js"; - -=== /project/a.js.js === - -export default "a.js.js"; - -=== /project/dir/index.ts === - -export default "dir/index.ts"; - -=== /project/dir.js === - -export default "dir.js"; - -=== /project/b.ts === -import a from "./a.js"; ->a : "a.js" - -import dir from "./dir"; ->dir : "dir.js" - diff --git a/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.errors.txt b/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.errors.txt deleted file mode 100644 index 8b64bc49e9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.errors.txt +++ /dev/null @@ -1,32 +0,0 @@ -error TS5055: Cannot write file 'genericSetterInClassTypeJsDoc.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'genericSetterInClassTypeJsDoc.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== genericSetterInClassTypeJsDoc.js (0 errors) ==== - /** - * @template T - */ - class Box { - #value; - - /** @param {T} initialValue */ - constructor(initialValue) { - this.#value = initialValue; - } - - /** @type {T} */ - get value() { - return this.#value; - } - - set value(value) { - this.#value = value; - } - } - - new Box(3).value = 3; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.symbols b/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.symbols deleted file mode 100644 index d837a7df57..0000000000 --- a/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.symbols +++ /dev/null @@ -1,47 +0,0 @@ -//// [tests/cases/conformance/classes/members/classTypes/genericSetterInClassTypeJsDoc.ts] //// - -=== genericSetterInClassTypeJsDoc.js === -/** - * @template T - */ - class Box { ->Box : Symbol(Box, Decl(genericSetterInClassTypeJsDoc.js, 0, 0)) - - #value; ->#value : Symbol(Box.#value, Decl(genericSetterInClassTypeJsDoc.js, 3, 12)) - - /** @param {T} initialValue */ - constructor(initialValue) { ->initialValue : Symbol(initialValue, Decl(genericSetterInClassTypeJsDoc.js, 7, 16)) - - this.#value = initialValue; ->this.#value : Symbol(Box.#value, Decl(genericSetterInClassTypeJsDoc.js, 3, 12)) ->this : Symbol(Box, Decl(genericSetterInClassTypeJsDoc.js, 0, 0)) ->initialValue : Symbol(initialValue, Decl(genericSetterInClassTypeJsDoc.js, 7, 16)) - } - - /** @type {T} */ - get value() { ->value : Symbol(Box.value, Decl(genericSetterInClassTypeJsDoc.js, 9, 5), Decl(genericSetterInClassTypeJsDoc.js, 14, 5)) - - return this.#value; ->this.#value : Symbol(Box.#value, Decl(genericSetterInClassTypeJsDoc.js, 3, 12)) ->this : Symbol(Box, Decl(genericSetterInClassTypeJsDoc.js, 0, 0)) - } - - set value(value) { ->value : Symbol(Box.value, Decl(genericSetterInClassTypeJsDoc.js, 9, 5), Decl(genericSetterInClassTypeJsDoc.js, 14, 5)) ->value : Symbol(value, Decl(genericSetterInClassTypeJsDoc.js, 16, 14)) - - this.#value = value; ->this.#value : Symbol(Box.#value, Decl(genericSetterInClassTypeJsDoc.js, 3, 12)) ->this : Symbol(Box, Decl(genericSetterInClassTypeJsDoc.js, 0, 0)) ->value : Symbol(value, Decl(genericSetterInClassTypeJsDoc.js, 16, 14)) - } -} - -new Box(3).value = 3; ->new Box(3).value : Symbol(Box.value, Decl(genericSetterInClassTypeJsDoc.js, 9, 5), Decl(genericSetterInClassTypeJsDoc.js, 14, 5)) ->Box : Symbol(Box, Decl(genericSetterInClassTypeJsDoc.js, 0, 0)) ->value : Symbol(Box.value, Decl(genericSetterInClassTypeJsDoc.js, 9, 5), Decl(genericSetterInClassTypeJsDoc.js, 14, 5)) - diff --git a/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.types b/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.types deleted file mode 100644 index 0ebdb3058f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/genericSetterInClassTypeJsDoc.types +++ /dev/null @@ -1,53 +0,0 @@ -//// [tests/cases/conformance/classes/members/classTypes/genericSetterInClassTypeJsDoc.ts] //// - -=== genericSetterInClassTypeJsDoc.js === -/** - * @template T - */ - class Box { ->Box : Box - - #value; ->#value : any - - /** @param {T} initialValue */ - constructor(initialValue) { ->initialValue : T - - this.#value = initialValue; ->this.#value = initialValue : T ->this.#value : any ->this : this ->initialValue : T - } - - /** @type {T} */ - get value() { ->value : any - - return this.#value; ->this.#value : any ->this : this - } - - set value(value) { ->value : any ->value : any - - this.#value = value; ->this.#value = value : any ->this.#value : any ->this : this ->value : any - } -} - -new Box(3).value = 3; ->new Box(3).value = 3 : 3 ->new Box(3).value : any ->new Box(3) : Box ->Box : typeof Box ->3 : 3 ->value : any ->3 : 3 - diff --git a/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.errors.txt b/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.errors.txt deleted file mode 100644 index 90d8e49796..0000000000 --- a/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.errors.txt +++ /dev/null @@ -1,51 +0,0 @@ -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -actual.ts(12,5): error TS2339: Property 'a' does not exist on type 'Window'. -actual.ts(13,5): error TS2339: Property 'b' does not exist on type 'Window'. -b.js(12,5): error TS2339: Property 'a' does not exist on type 'Window'. -b.js(13,5): error TS2339: Property 'b' does not exist on type 'Window'. - - -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== b.js (2 errors) ==== - var a = 10; - this.a; - this.b; - globalThis.a; - globalThis.b; - - // DOM access is not supported until the index signature is handled more strictly - self.a; - self.b; - window.a; - window.b; - top.a; - ~ -!!! error TS2339: Property 'a' does not exist on type 'Window'. - top.b; - ~ -!!! error TS2339: Property 'b' does not exist on type 'Window'. - -==== actual.ts (2 errors) ==== - var b = 10; - this.a; - this.b; - globalThis.a; - globalThis.b; - - // same here -- no DOM access to globalThis yet - self.a; - self.b; - window.a; - window.b; - top.a; - ~ -!!! error TS2339: Property 'a' does not exist on type 'Window'. - top.b; - ~ -!!! error TS2339: Property 'b' does not exist on type 'Window'. - - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.symbols b/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.symbols deleted file mode 100644 index aeac8862a7..0000000000 --- a/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.symbols +++ /dev/null @@ -1,105 +0,0 @@ -//// [tests/cases/conformance/es2019/globalThisVarDeclaration.ts] //// - -=== b.js === -var a = 10; ->a : Symbol(a, Decl(b.js, 0, 3)) - -this.a; ->this.a : Symbol(a, Decl(b.js, 0, 3)) ->this : Symbol(globalThis) ->a : Symbol(a, Decl(b.js, 0, 3)) - -this.b; ->this.b : Symbol(b, Decl(actual.ts, 0, 3)) ->this : Symbol(globalThis) ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -globalThis.a; ->globalThis.a : Symbol(a, Decl(b.js, 0, 3)) ->globalThis : Symbol(globalThis) ->a : Symbol(a, Decl(b.js, 0, 3)) - -globalThis.b; ->globalThis.b : Symbol(b, Decl(actual.ts, 0, 3)) ->globalThis : Symbol(globalThis) ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -// DOM access is not supported until the index signature is handled more strictly -self.a; ->self.a : Symbol(a, Decl(b.js, 0, 3)) ->self : Symbol(self, Decl(lib.dom.d.ts, --, --)) ->a : Symbol(a, Decl(b.js, 0, 3)) - -self.b; ->self.b : Symbol(b, Decl(actual.ts, 0, 3)) ->self : Symbol(self, Decl(lib.dom.d.ts, --, --)) ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -window.a; ->window.a : Symbol(a, Decl(b.js, 0, 3)) ->window : Symbol(window, Decl(lib.dom.d.ts, --, --)) ->a : Symbol(a, Decl(b.js, 0, 3)) - -window.b; ->window.b : Symbol(b, Decl(actual.ts, 0, 3)) ->window : Symbol(window, Decl(lib.dom.d.ts, --, --)) ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -top.a; ->top : Symbol(top, Decl(lib.dom.d.ts, --, --)) - -top.b; ->top : Symbol(top, Decl(lib.dom.d.ts, --, --)) - -=== actual.ts === -var b = 10; ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -this.a; ->this.a : Symbol(a, Decl(b.js, 0, 3)) ->this : Symbol(globalThis) ->a : Symbol(a, Decl(b.js, 0, 3)) - -this.b; ->this.b : Symbol(b, Decl(actual.ts, 0, 3)) ->this : Symbol(globalThis) ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -globalThis.a; ->globalThis.a : Symbol(a, Decl(b.js, 0, 3)) ->globalThis : Symbol(globalThis) ->a : Symbol(a, Decl(b.js, 0, 3)) - -globalThis.b; ->globalThis.b : Symbol(b, Decl(actual.ts, 0, 3)) ->globalThis : Symbol(globalThis) ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -// same here -- no DOM access to globalThis yet -self.a; ->self.a : Symbol(a, Decl(b.js, 0, 3)) ->self : Symbol(self, Decl(lib.dom.d.ts, --, --)) ->a : Symbol(a, Decl(b.js, 0, 3)) - -self.b; ->self.b : Symbol(b, Decl(actual.ts, 0, 3)) ->self : Symbol(self, Decl(lib.dom.d.ts, --, --)) ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -window.a; ->window.a : Symbol(a, Decl(b.js, 0, 3)) ->window : Symbol(window, Decl(lib.dom.d.ts, --, --)) ->a : Symbol(a, Decl(b.js, 0, 3)) - -window.b; ->window.b : Symbol(b, Decl(actual.ts, 0, 3)) ->window : Symbol(window, Decl(lib.dom.d.ts, --, --)) ->b : Symbol(b, Decl(actual.ts, 0, 3)) - -top.a; ->top : Symbol(top, Decl(lib.dom.d.ts, --, --)) - -top.b; ->top : Symbol(top, Decl(lib.dom.d.ts, --, --)) - - diff --git a/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.types b/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.types deleted file mode 100644 index 59787c1ecb..0000000000 --- a/testdata/baselines/reference/submodule/conformance/globalThisVarDeclaration.types +++ /dev/null @@ -1,115 +0,0 @@ -//// [tests/cases/conformance/es2019/globalThisVarDeclaration.ts] //// - -=== b.js === -var a = 10; ->a : number ->10 : 10 - -this.a; ->this.a : number ->this : typeof globalThis ->a : number - -this.b; ->this.b : number ->this : typeof globalThis ->b : number - -globalThis.a; ->globalThis.a : number ->globalThis : typeof globalThis ->a : number - -globalThis.b; ->globalThis.b : number ->globalThis : typeof globalThis ->b : number - -// DOM access is not supported until the index signature is handled more strictly -self.a; ->self.a : number ->self : Window & typeof globalThis ->a : number - -self.b; ->self.b : number ->self : Window & typeof globalThis ->b : number - -window.a; ->window.a : number ->window : Window & typeof globalThis ->a : number - -window.b; ->window.b : number ->window : Window & typeof globalThis ->b : number - -top.a; ->top.a : any ->top : Window ->a : any - -top.b; ->top.b : any ->top : Window ->b : any - -=== actual.ts === -var b = 10; ->b : number ->10 : 10 - -this.a; ->this.a : number ->this : typeof globalThis ->a : number - -this.b; ->this.b : number ->this : typeof globalThis ->b : number - -globalThis.a; ->globalThis.a : number ->globalThis : typeof globalThis ->a : number - -globalThis.b; ->globalThis.b : number ->globalThis : typeof globalThis ->b : number - -// same here -- no DOM access to globalThis yet -self.a; ->self.a : number ->self : Window & typeof globalThis ->a : number - -self.b; ->self.b : number ->self : Window & typeof globalThis ->b : number - -window.a; ->window.a : number ->window : Window & typeof globalThis ->a : number - -window.b; ->window.b : number ->window : Window & typeof globalThis ->b : number - -top.a; ->top.a : any ->top : Window ->a : any - -top.b; ->top.b : any ->top : Window ->b : any - - diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).js b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).js index 233a0a293b..a927686c34 100644 --- a/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).js +++ b/testdata/baselines/reference/submodule/conformance/importAssertion1(module=commonjs).js @@ -43,10 +43,43 @@ exports.a = 1; exports.b = 2; //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); require("./0"); const _0_1 = require("./0"); -const foo = require("./0"); +const foo = __importStar(require("./0")); _0_1.a; _0_1.b; foo.a; @@ -61,15 +94,48 @@ _0_1.b; _0_2.a; _0_2.b; //// [3.js] -const a = Promise.resolve().then(() => require('./0')); -const b = Promise.resolve().then(() => require('./0')); -const c = Promise.resolve().then(() => require('./0')); -const d = Promise.resolve().then(() => require('./0')); -const dd = Promise.resolve().then(() => require('./0')); -const e = Promise.resolve().then(() => require('./0')); -const f = Promise.resolve().then(() => require()); -const g = Promise.resolve().then(() => require('./0')); -const h = Promise.resolve().then(() => require('./0')); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +const a = Promise.resolve().then(() => __importStar(require('./0'))); +const b = Promise.resolve().then(() => __importStar(require('./0'))); +const c = Promise.resolve().then(() => __importStar(require('./0'))); +const d = Promise.resolve().then(() => __importStar(require('./0'))); +const dd = Promise.resolve().then(() => __importStar(require('./0'))); +const e = Promise.resolve().then(() => __importStar(require('./0'))); +const f = Promise.resolve().then(() => __importStar(require())); +const g = Promise.resolve().then(() => __importStar(require('./0'))); +const h = Promise.resolve().then(() => __importStar(require('./0'))); //// [0.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).js b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).js index c2bb814105..5e297e225e 100644 --- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).js +++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).js @@ -34,16 +34,38 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi if (k2 === undefined) k2 = k; o[k2] = m[k]; })); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.ns = exports.b = exports.a = void 0; const _0_1 = require("./0"); Object.defineProperty(exports, "a", { enumerable: true, get: function () { return _0_1.a; } }); Object.defineProperty(exports, "b", { enumerable: true, get: function () { return _0_1.b; } }); __exportStar(require("./0"), exports); -exports.ns = require("./0"); +exports.ns = __importStar(require("./0")); //// [2.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).js.diff b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).js.diff index 609c7752d1..2ce5f03357 100644 --- a/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).js.diff +++ b/testdata/baselines/reference/submodule/conformance/importAssertion2(module=commonjs).js.diff @@ -1,7 +1,7 @@ --- old.importAssertion2(module=commonjs).js +++ new.importAssertion2(module=commonjs).js -@@= skipped -38, +38 lines =@@ - }; +@@= skipped -60, +60 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.ns = exports.b = exports.a = void 0; -var _0_1 = require("./0"); diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).js b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).js index efa8ccd637..3825f530c3 100644 --- a/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).js +++ b/testdata/baselines/reference/submodule/conformance/importAttributes1(module=commonjs).js @@ -40,10 +40,43 @@ exports.a = 1; exports.b = 2; //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); require("./0"); const _0_1 = require("./0"); -const foo = require("./0"); +const foo = __importStar(require("./0")); _0_1.a; _0_1.b; foo.a; @@ -58,15 +91,48 @@ _0_1.b; _0_2.a; _0_2.b; //// [3.js] -const a = Promise.resolve().then(() => require('./0')); -const b = Promise.resolve().then(() => require('./0')); -const c = Promise.resolve().then(() => require('./0')); -const d = Promise.resolve().then(() => require('./0')); -const dd = Promise.resolve().then(() => require('./0')); -const e = Promise.resolve().then(() => require('./0')); -const f = Promise.resolve().then(() => require()); -const g = Promise.resolve().then(() => require('./0')); -const h = Promise.resolve().then(() => require('./0')); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +const a = Promise.resolve().then(() => __importStar(require('./0'))); +const b = Promise.resolve().then(() => __importStar(require('./0'))); +const c = Promise.resolve().then(() => __importStar(require('./0'))); +const d = Promise.resolve().then(() => __importStar(require('./0'))); +const dd = Promise.resolve().then(() => __importStar(require('./0'))); +const e = Promise.resolve().then(() => __importStar(require('./0'))); +const f = Promise.resolve().then(() => __importStar(require())); +const g = Promise.resolve().then(() => __importStar(require('./0'))); +const h = Promise.resolve().then(() => __importStar(require('./0'))); //// [0.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).js b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).js index 1b973b8eea..2cc9e7b2bc 100644 --- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).js +++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).js @@ -34,16 +34,38 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi if (k2 === undefined) k2 = k; o[k2] = m[k]; })); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.ns = exports.b = exports.a = void 0; const _0_1 = require("./0"); Object.defineProperty(exports, "a", { enumerable: true, get: function () { return _0_1.a; } }); Object.defineProperty(exports, "b", { enumerable: true, get: function () { return _0_1.b; } }); __exportStar(require("./0"), exports); -exports.ns = require("./0"); +exports.ns = __importStar(require("./0")); //// [2.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).js.diff b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).js.diff index 9dd8dbeed9..68850ba5d1 100644 --- a/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).js.diff +++ b/testdata/baselines/reference/submodule/conformance/importAttributes2(module=commonjs).js.diff @@ -1,7 +1,7 @@ --- old.importAttributes2(module=commonjs).js +++ new.importAttributes2(module=commonjs).js -@@= skipped -38, +38 lines =@@ - }; +@@= skipped -60, +60 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.ns = exports.b = exports.a = void 0; -var _0_1 = require("./0"); diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes9.symbols b/testdata/baselines/reference/submodule/conformance/importAttributes9.symbols index 6f84663538..020d80aca5 100644 --- a/testdata/baselines/reference/submodule/conformance/importAttributes9.symbols +++ b/testdata/baselines/reference/submodule/conformance/importAttributes9.symbols @@ -26,7 +26,7 @@ async function f() { >f : Symbol(f, Decl(b.ts, 7, 8)) await import("./a", { ->"./a" : Symbol(ns, Decl(a.ts, 0, 0)) +>"./a" : Symbol("a", Decl(a.ts, 0, 0)) with: { >with : Symbol(with, Decl(b.ts, 10, 25)) diff --git a/testdata/baselines/reference/submodule/conformance/importAttributes9.types b/testdata/baselines/reference/submodule/conformance/importAttributes9.types index cdcc9554ec..6839173214 100644 --- a/testdata/baselines/reference/submodule/conformance/importAttributes9.types +++ b/testdata/baselines/reference/submodule/conformance/importAttributes9.types @@ -26,8 +26,8 @@ async function f() { >f : () => Promise await import("./a", { ->await import("./a", { with: { type: "not-json", }, }) : typeof ns ->import("./a", { with: { type: "not-json", }, }) : Promise +>await import("./a", { with: { type: "not-json", }, }) : typeof import("a") +>import("./a", { with: { type: "not-json", }, }) : Promise >"./a" : "./a" >{ with: { type: "not-json", }, } : { with: { type: "not-json"; }; } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.js index 54e5acc876..d58f32985f 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.js @@ -32,32 +32,65 @@ export const l = async () => { //// [test.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.l = exports.cl2 = exports.obj = exports.cl1 = void 0; exports.fn = fn; async function fn() { - const req = await Promise.resolve().then(() => require('./test')); // ONE + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // ONE } class cl1 { async m() { - const req = await Promise.resolve().then(() => require('./test')); // TWO + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // TWO } } exports.cl1 = cl1; exports.obj = { m: async () => { - const req = await Promise.resolve().then(() => require('./test')); // THREE + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // THREE } }; class cl2 { p = { m: async () => { - const req = await Promise.resolve().then(() => require('./test')); // FOUR + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // FOUR } }; } exports.cl2 = cl2; const l = async () => { - const req = await Promise.resolve().then(() => require('./test')); // FIVE + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // FIVE }; exports.l = l; diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.js.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.js.diff index 0a129fc685..78f1c190e8 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES5CJS.js.diff @@ -1,9 +1,9 @@ --- old.importCallExpressionAsyncES5CJS.js +++ new.importCallExpressionAsyncES5CJS.js -@@= skipped -31, +31 lines =@@ - - //// [test.js] - "use strict"; +@@= skipped -64, +64 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -18,48 +18,48 @@ exports.fn = fn; -function fn() { - return __awaiter(this, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(function () { return require('./test'); }); // ONE +- const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // ONE - }); +async function fn() { -+ const req = await Promise.resolve().then(() => require('./test')); // ONE ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // ONE } class cl1 { - m() { - return __awaiter(this, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(function () { return require('./test'); }); // TWO +- const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // TWO - }); + async m() { -+ const req = await Promise.resolve().then(() => require('./test')); // TWO ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // TWO } } exports.cl1 = cl1; exports.obj = { - m: () => __awaiter(void 0, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(function () { return require('./test'); }); // THREE +- const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // THREE - }) + m: async () => { -+ const req = await Promise.resolve().then(() => require('./test')); // THREE ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // THREE + } }; class cl2 { - constructor() { - this.p = { - m: () => __awaiter(this, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(function () { return require('./test'); }); // FOUR +- const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // FOUR - }) - }; - } + p = { + m: async () => { -+ const req = await Promise.resolve().then(() => require('./test')); // FOUR ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // FOUR + } + }; } exports.cl2 = cl2; -const l = () => __awaiter(void 0, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(function () { return require('./test'); }); // FIVE +- const req = yield Promise.resolve().then(function () { return __importStar(require('./test')); }); // FIVE -}); +const l = async () => { -+ const req = await Promise.resolve().then(() => require('./test')); // FIVE ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // FIVE +}; exports.l = l; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.js index 12bf77b3de..f59a98734a 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.js @@ -32,32 +32,65 @@ export const l = async () => { //// [test.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.l = exports.cl2 = exports.obj = exports.cl1 = void 0; exports.fn = fn; async function fn() { - const req = await Promise.resolve().then(() => require('./test')); // ONE + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // ONE } class cl1 { async m() { - const req = await Promise.resolve().then(() => require('./test')); // TWO + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // TWO } } exports.cl1 = cl1; exports.obj = { m: async () => { - const req = await Promise.resolve().then(() => require('./test')); // THREE + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // THREE } }; class cl2 { p = { m: async () => { - const req = await Promise.resolve().then(() => require('./test')); // FOUR + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // FOUR } }; } exports.cl2 = cl2; const l = async () => { - const req = await Promise.resolve().then(() => require('./test')); // FIVE + const req = await Promise.resolve().then(() => __importStar(require('./test'))); // FIVE }; exports.l = l; diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.js.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.js.diff index 6202e08b6c..6eaa9ded97 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionAsyncES6CJS.js.diff @@ -1,9 +1,9 @@ --- old.importCallExpressionAsyncES6CJS.js +++ new.importCallExpressionAsyncES6CJS.js -@@= skipped -31, +31 lines =@@ - - //// [test.js] - "use strict"; +@@= skipped -64, +64 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -18,48 +18,48 @@ exports.fn = fn; -function fn() { - return __awaiter(this, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(() => require('./test')); // ONE +- const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // ONE - }); +async function fn() { -+ const req = await Promise.resolve().then(() => require('./test')); // ONE ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // ONE } class cl1 { - m() { - return __awaiter(this, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(() => require('./test')); // TWO +- const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // TWO - }); + async m() { -+ const req = await Promise.resolve().then(() => require('./test')); // TWO ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // TWO } } exports.cl1 = cl1; exports.obj = { - m: () => __awaiter(void 0, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(() => require('./test')); // THREE +- const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // THREE - }) + m: async () => { -+ const req = await Promise.resolve().then(() => require('./test')); // THREE ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // THREE + } }; class cl2 { - constructor() { - this.p = { - m: () => __awaiter(this, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(() => require('./test')); // FOUR +- const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // FOUR - }) - }; - } + p = { + m: async () => { -+ const req = await Promise.resolve().then(() => require('./test')); // FOUR ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // FOUR + } + }; } exports.cl2 = cl2; -const l = () => __awaiter(void 0, void 0, void 0, function* () { -- const req = yield Promise.resolve().then(() => require('./test')); // FIVE +- const req = yield Promise.resolve().then(() => __importStar(require('./test'))); // FIVE -}); +const l = async () => { -+ const req = await Promise.resolve().then(() => require('./test')); // FIVE ++ const req = await Promise.resolve().then(() => __importStar(require('./test'))); // FIVE +}; exports.l = l; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionCheckReturntype1.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionCheckReturntype1.js index 9b1fd4e1fd..df38054020 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionCheckReturntype1.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionCheckReturntype1.js @@ -31,7 +31,40 @@ class C { exports.C = C; //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -let p1 = Promise.resolve().then(() => require("./defaultPath")); -let p2 = Promise.resolve().then(() => require("./defaultPath")); -let p3 = Promise.resolve().then(() => require("./defaultPath")); +let p1 = Promise.resolve().then(() => __importStar(require("./defaultPath"))); +let p2 = Promise.resolve().then(() => __importStar(require("./defaultPath"))); +let p3 = Promise.resolve().then(() => __importStar(require("./defaultPath"))); diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit1.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit1.js index ba9d6efaa9..ff4c5a3080 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit1.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionDeclarationEmit1.js @@ -17,12 +17,45 @@ function returnDynamicLoad(path: string) { } //// [importCallExpressionDeclarationEmit1.js] -Promise.resolve(`${getSpecifier()}`).then(s => require(s)); -var p0 = Promise.resolve(`${`${directory}\\${moduleFile}`}`).then(s => require(s)); -var p1 = Promise.resolve(`${getSpecifier()}`).then(s => require(s)); -const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => require(s)); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s))); +var p0 = Promise.resolve(`${`${directory}\\${moduleFile}`}`).then(s => __importStar(require(s))); +var p1 = Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s))); +const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => __importStar(require(s))); function returnDynamicLoad(path) { - return Promise.resolve(`${path}`).then(s => require(s)); + return Promise.resolve(`${path}`).then(s => __importStar(require(s))); } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.js index 7e3df79e65..cc8acc19a3 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.js @@ -35,25 +35,58 @@ exports.foo = foo; function foo() { return "foo"; } //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.D = exports.p2 = void 0; -Promise.resolve().then(() => require("./0")); -var p1 = Promise.resolve().then(() => require("./0")); +Promise.resolve().then(() => __importStar(require("./0"))); +var p1 = Promise.resolve().then(() => __importStar(require("./0"))); p1.then(zero => { return zero.foo(); }); -exports.p2 = Promise.resolve().then(() => require("./0")); +exports.p2 = Promise.resolve().then(() => __importStar(require("./0"))); function foo() { - const p2 = Promise.resolve().then(() => require("./0")); + const p2 = Promise.resolve().then(() => __importStar(require("./0"))); } class C { method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); } } class D { method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); } } exports.D = D; diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.js.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.js.diff index f1e7f9b610..e7278e9fe5 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES5CJS.js.diff @@ -1,32 +1,32 @@ --- old.importCallExpressionES5CJS.js +++ new.importCallExpressionES5CJS.js -@@= skipped -36, +36 lines =@@ - "use strict"; +@@= skipped -69, +69 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.D = exports.p2 = void 0; --Promise.resolve().then(function () { return require("./0"); }); --var p1 = Promise.resolve().then(function () { return require("./0"); }); -+Promise.resolve().then(() => require("./0")); -+var p1 = Promise.resolve().then(() => require("./0")); +-Promise.resolve().then(function () { return __importStar(require("./0")); }); +-var p1 = Promise.resolve().then(function () { return __importStar(require("./0")); }); ++Promise.resolve().then(() => __importStar(require("./0"))); ++var p1 = Promise.resolve().then(() => __importStar(require("./0"))); p1.then(zero => { return zero.foo(); }); --exports.p2 = Promise.resolve().then(function () { return require("./0"); }); -+exports.p2 = Promise.resolve().then(() => require("./0")); +-exports.p2 = Promise.resolve().then(function () { return __importStar(require("./0")); }); ++exports.p2 = Promise.resolve().then(() => __importStar(require("./0"))); function foo() { -- const p2 = Promise.resolve().then(function () { return require("./0"); }); -+ const p2 = Promise.resolve().then(() => require("./0")); +- const p2 = Promise.resolve().then(function () { return __importStar(require("./0")); }); ++ const p2 = Promise.resolve().then(() => __importStar(require("./0"))); } class C { method() { -- const loadAsync = Promise.resolve().then(function () { return require("./0"); }); -+ const loadAsync = Promise.resolve().then(() => require("./0")); +- const loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); }); ++ const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); } } class D { method() { -- const loadAsync = Promise.resolve().then(function () { return require("./0"); }); -+ const loadAsync = Promise.resolve().then(() => require("./0")); +- const loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); }); ++ const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); } } exports.D = D; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.js index 89ed898d92..7065853de2 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionES6CJS.js @@ -35,25 +35,58 @@ exports.foo = foo; function foo() { return "foo"; } //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.D = exports.p2 = void 0; -Promise.resolve().then(() => require("./0")); -var p1 = Promise.resolve().then(() => require("./0")); +Promise.resolve().then(() => __importStar(require("./0"))); +var p1 = Promise.resolve().then(() => __importStar(require("./0"))); p1.then(zero => { return zero.foo(); }); -exports.p2 = Promise.resolve().then(() => require("./0")); +exports.p2 = Promise.resolve().then(() => __importStar(require("./0"))); function foo() { - const p2 = Promise.resolve().then(() => require("./0")); + const p2 = Promise.resolve().then(() => __importStar(require("./0"))); } class C { method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); } } class D { method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); } } exports.D = D; diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionGrammarError.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionGrammarError.js index 0952ed1c7f..d05efe316a 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionGrammarError.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionGrammarError.js @@ -12,8 +12,41 @@ const p2 = import(); const p4 = import("pathToModule", "secondModule"); //// [importCallExpressionGrammarError.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); var a = ["./0"]; -Promise.resolve(`${...["PathModule"]}`).then(s => require(s)); -var p1 = Promise.resolve(`${...a}`).then(s => require(s)); -const p2 = Promise.resolve().then(() => require()); -const p4 = Promise.resolve().then(() => require("pathToModule")); +Promise.resolve(`${...["PathModule"]}`).then(s => __importStar(require(s))); +var p1 = Promise.resolve(`${...a}`).then(s => __importStar(require(s))); +const p2 = Promise.resolve().then(() => __importStar(require())); +const p4 = Promise.resolve().then(() => __importStar(require("pathToModule"))); diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.js index 35be51f4c7..aa00938a45 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS1.js @@ -23,14 +23,47 @@ exports.foo = foo; function foo() { return "foo"; } //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.p2 = void 0; -Promise.resolve().then(() => require("./0")); -var p1 = Promise.resolve().then(() => require("./0")); +Promise.resolve().then(() => __importStar(require("./0"))); +var p1 = Promise.resolve().then(() => __importStar(require("./0"))); p1.then(zero => { return zero.foo(); }); -exports.p2 = Promise.resolve().then(() => require("./0")); +exports.p2 = Promise.resolve().then(() => __importStar(require("./0"))); function foo() { - const p2 = Promise.resolve().then(() => require("./0")); + const p2 = Promise.resolve().then(() => __importStar(require("./0"))); } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.js index b0efcae619..0c6ab6027f 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS2.js @@ -29,12 +29,45 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.backup = backup; function backup() { return "backup"; } //// [2.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); async function compute(promise) { let j = await promise; if (!j) { - j = await Promise.resolve().then(() => require("./1")); + j = await Promise.resolve().then(() => __importStar(require("./1"))); return j.backup(); } return j.foo(); } -compute(Promise.resolve().then(() => require("./0"))); +compute(Promise.resolve().then(() => __importStar(require("./0")))); diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.js index fde871e6e1..ea5abc43ea 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS3.js @@ -25,6 +25,39 @@ class B { } exports.B = B; //// [2.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); // We use Promise for now as there is no way to specify shape of module object function foo(x) { x.then(value => { @@ -32,4 +65,4 @@ function foo(x) { b.print(); }); } -foo(Promise.resolve().then(() => require("./0"))); +foo(Promise.resolve().then(() => __importStar(require("./0")))); diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.js index 823fd6b4b9..f5c1f01cf0 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS4.js @@ -22,8 +22,41 @@ class B { } exports.B = B; //// [2.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); async function foo() { - class C extends (await Promise.resolve().then(() => require("./0"))).B { + class C extends (await Promise.resolve().then(() => __importStar(require("./0")))).B { } var c = new C(); c.print(); diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.js index 72b2f8ed88..9dabd4e7dc 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.js @@ -57,30 +57,63 @@ exports.backup = backup; function backup() { return "backup"; } //// [2.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.D = void 0; class C { - myModule = Promise.resolve().then(() => require("./0")); + myModule = Promise.resolve().then(() => __importStar(require("./0"))); method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); this.myModule.then(Zero => { console.log(Zero.foo()); }, async err => { console.log(err); - let one = await Promise.resolve().then(() => require("./1")); + let one = await Promise.resolve().then(() => __importStar(require("./1"))); console.log(one.backup()); }); } } class D { - myModule = Promise.resolve().then(() => require("./0")); + myModule = Promise.resolve().then(() => __importStar(require("./0"))); method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); this.myModule.then(Zero => { console.log(Zero.foo()); }, async err => { console.log(err); - let one = await Promise.resolve().then(() => require("./1")); + let one = await Promise.resolve().then(() => __importStar(require("./1"))); console.log(one.backup()); }); } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.js.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.js.diff index 8c87a99e06..b0173ef2a1 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInCJS5.js.diff @@ -1,36 +1,36 @@ --- old.importCallExpressionInCJS5.js +++ new.importCallExpressionInCJS5.js -@@= skipped -59, +59 lines =@@ +@@= skipped -92, +92 lines =@@ Object.defineProperty(exports, "__esModule", { value: true }); exports.D = void 0; class C { - constructor() { -- this.myModule = Promise.resolve().then(() => require("./0")); +- this.myModule = Promise.resolve().then(() => __importStar(require("./0"))); - } -+ myModule = Promise.resolve().then(() => require("./0")); ++ myModule = Promise.resolve().then(() => __importStar(require("./0"))); method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); this.myModule.then(Zero => { console.log(Zero.foo()); - }, async (err) => { + }, async err => { console.log(err); - let one = await Promise.resolve().then(() => require("./1")); + let one = await Promise.resolve().then(() => __importStar(require("./1"))); console.log(one.backup()); @@= skipped -15, +13 lines =@@ } } class D { - constructor() { -- this.myModule = Promise.resolve().then(() => require("./0")); +- this.myModule = Promise.resolve().then(() => __importStar(require("./0"))); - } -+ myModule = Promise.resolve().then(() => require("./0")); ++ myModule = Promise.resolve().then(() => __importStar(require("./0"))); method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); this.myModule.then(Zero => { console.log(Zero.foo()); - }, async (err) => { + }, async err => { console.log(err); - let one = await Promise.resolve().then(() => require("./1")); + let one = await Promise.resolve().then(() => __importStar(require("./1"))); console.log(one.backup()); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.js index 72e3a0ec0a..7670be1a36 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInExportEqualsCJS.js @@ -13,6 +13,39 @@ export = async function() { module.exports = 42; //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); module.exports = async function () { - const something = await Promise.resolve().then(() => require("./something")); + const something = await Promise.resolve().then(() => __importStar(require("./something"))); }; diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.js index 170dbf5cfc..4387900106 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext1.js @@ -13,5 +13,38 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.foo = foo; function foo() { return "foo"; } //// [1.js] -var p1 = Promise.resolve().then(() => require("./0")); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +var p1 = Promise.resolve().then(() => __importStar(require("./0"))); function arguments() { } // this is allow as the file doesn't have implicit "use strict" diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.js index 67b309ca0d..1bf061c072 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionInScriptContext2.js @@ -15,5 +15,38 @@ exports.foo = foo; function foo() { return "foo"; } //// [1.js] "use strict"; -var p1 = Promise.resolve().then(() => require("./0")); +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +var p1 = Promise.resolve().then(() => __importStar(require("./0"))); function arguments() { } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.js index 45a971ca8b..fd117caeb4 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.js @@ -13,6 +13,39 @@ async function foo() { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "./foo"; //// [index.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); async function foo() { - return await Promise.resolve(`${(await Promise.resolve().then(() => require("./foo"))).default}`).then(s => require(s)); + return await Promise.resolve(`${(await Promise.resolve().then(() => __importStar(require("./foo")))).default}`).then(s => __importStar(require(s))); } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.js.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.js.diff index eb47500c8b..70d6b3119e 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS.js.diff @@ -1,9 +1,9 @@ --- old.importCallExpressionNestedCJS.js +++ new.importCallExpressionNestedCJS.js -@@= skipped -12, +12 lines =@@ - Object.defineProperty(exports, "__esModule", { value: true }); - exports.default = "./foo"; - //// [index.js] +@@= skipped -45, +45 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -15,8 +15,8 @@ -}; -function foo() { - return __awaiter(this, void 0, void 0, function* () { -- return yield Promise.resolve(`${(yield Promise.resolve().then(() => require("./foo"))).default}`).then(s => require(s)); +- return yield Promise.resolve(`${(yield Promise.resolve().then(() => __importStar(require("./foo")))).default}`).then(s => __importStar(require(s))); - }); +async function foo() { -+ return await Promise.resolve(`${(await Promise.resolve().then(() => require("./foo"))).default}`).then(s => require(s)); ++ return await Promise.resolve(`${(await Promise.resolve().then(() => __importStar(require("./foo")))).default}`).then(s => __importStar(require(s))); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.js index ebdf7c6765..a58735d844 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.js @@ -13,6 +13,39 @@ async function foo() { Object.defineProperty(exports, "__esModule", { value: true }); exports.default = "./foo"; //// [index.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); async function foo() { - return await Promise.resolve(`${(await Promise.resolve().then(() => require("./foo"))).default}`).then(s => require(s)); + return await Promise.resolve(`${(await Promise.resolve().then(() => __importStar(require("./foo")))).default}`).then(s => __importStar(require(s))); } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.js.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.js.diff index 310ba1b52a..0a6d9987d1 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNestedCJS2.js.diff @@ -1,9 +1,9 @@ --- old.importCallExpressionNestedCJS2.js +++ new.importCallExpressionNestedCJS2.js -@@= skipped -12, +12 lines =@@ - Object.defineProperty(exports, "__esModule", { value: true }); - exports.default = "./foo"; - //// [index.js] +@@= skipped -45, +45 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -15,8 +15,8 @@ -}; -function foo() { - return __awaiter(this, void 0, void 0, function* () { -- return yield Promise.resolve("".concat((yield Promise.resolve().then(function () { return require("./foo"); })).default)).then(function (s) { return require(s); }); +- return yield Promise.resolve("".concat((yield Promise.resolve().then(function () { return __importStar(require("./foo")); })).default)).then(function (s) { return __importStar(require(s)); }); - }); +async function foo() { -+ return await Promise.resolve(`${(await Promise.resolve().then(() => require("./foo"))).default}`).then(s => require(s)); ++ return await Promise.resolve(`${(await Promise.resolve().then(() => __importStar(require("./foo")))).default}`).then(s => __importStar(require(s))); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.js index 213040c4d3..2cc8a30781 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.js @@ -42,15 +42,48 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.backup = backup; function backup() { return "backup"; } //// [2.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); class C { - myModule = Promise.resolve().then(() => require("./0")); + myModule = Promise.resolve().then(() => __importStar(require("./0"))); method() { - const loadAsync = Promise.resolve().then(() => require("./0")); + const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); this.myModule.then(Zero => { console.log(Zero.foo()); }, async err => { console.log(err); - let one = await Promise.resolve().then(() => require("./1")); + let one = await Promise.resolve().then(() => __importStar(require("./1"))); console.log(one.backup()); }); } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.js.diff b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.js.diff index e67958e7f9..815dd7d89f 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionNoModuleKindSpecified.js.diff @@ -1,9 +1,9 @@ --- old.importCallExpressionNoModuleKindSpecified.js +++ new.importCallExpressionNoModuleKindSpecified.js -@@= skipped -41, +41 lines =@@ - exports.backup = backup; - function backup() { return "backup"; } - //// [2.js] +@@= skipped -74, +74 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -15,19 +15,19 @@ -}; class C { - constructor() { -- this.myModule = Promise.resolve().then(function () { return require("./0"); }); +- this.myModule = Promise.resolve().then(function () { return __importStar(require("./0")); }); - } -+ myModule = Promise.resolve().then(() => require("./0")); ++ myModule = Promise.resolve().then(() => __importStar(require("./0"))); method() { -- const loadAsync = Promise.resolve().then(function () { return require("./0"); }); -+ const loadAsync = Promise.resolve().then(() => require("./0")); +- const loadAsync = Promise.resolve().then(function () { return __importStar(require("./0")); }); ++ const loadAsync = Promise.resolve().then(() => __importStar(require("./0"))); this.myModule.then(Zero => { console.log(Zero.foo()); - }, (err) => __awaiter(this, void 0, void 0, function* () { + }, async err => { console.log(err); -- let one = yield Promise.resolve().then(function () { return require("./1"); }); -+ let one = await Promise.resolve().then(() => require("./1")); +- let one = yield Promise.resolve().then(function () { return __importStar(require("./1")); }); ++ let one = await Promise.resolve().then(() => __importStar(require("./1"))); console.log(one.backup()); - })); + }); diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionReturnPromiseOfAny.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionReturnPromiseOfAny.js index 0bda2486b7..51bcdfc378 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionReturnPromiseOfAny.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionReturnPromiseOfAny.js @@ -42,21 +42,54 @@ class C { exports.C = C; //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -Promise.resolve(`${`${directory}\\${moduleFile}`}`).then(s => require(s)); -Promise.resolve(`${getSpecifier()}`).then(s => require(s)); -var p1 = Promise.resolve(`${ValidSomeCondition() ? "./0" : "externalModule"}`).then(s => require(s)); -var p1 = Promise.resolve(`${getSpecifier()}`).then(s => require(s)); -var p11 = Promise.resolve(`${getSpecifier()}`).then(s => require(s)); -const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => require(s)); +Promise.resolve(`${`${directory}\\${moduleFile}`}`).then(s => __importStar(require(s))); +Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s))); +var p1 = Promise.resolve(`${ValidSomeCondition() ? "./0" : "externalModule"}`).then(s => __importStar(require(s))); +var p1 = Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s))); +var p11 = Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s))); +const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => __importStar(require(s))); p1.then(zero => { return zero.foo(); // ok, zero is any }); let j; -var p3 = Promise.resolve(`${j = getSpecifier()}`).then(s => require(s)); +var p3 = Promise.resolve(`${j = getSpecifier()}`).then(s => __importStar(require(s))); function* loadModule(directories) { for (const directory of directories) { const path = `${directory}\\moduleFile`; - Promise.resolve(`${yield path}`).then(s => require(s)); + Promise.resolve(`${yield path}`).then(s => __importStar(require(s))); } } diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionSpecifierNotStringTypeError.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionSpecifierNotStringTypeError.js index 45c9489923..bbf0929466 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionSpecifierNotStringTypeError.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionSpecifierNotStringTypeError.js @@ -16,12 +16,45 @@ var p3 = import(["path1", "path2"]); var p4 = import(()=>"PathToModule"); //// [importCallExpressionSpecifierNotStringTypeError.js] +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); // Error specifier is not assignable to string -Promise.resolve(`${getSpecifier()}`).then(s => require(s)); -var p1 = Promise.resolve(`${getSpecifier()}`).then(s => require(s)); -const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => require(s)); +Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s))); +var p1 = Promise.resolve(`${getSpecifier()}`).then(s => __importStar(require(s))); +const p2 = Promise.resolve(`${whatToLoad ? getSpecifier() : "defaulPath"}`).then(s => __importStar(require(s))); p1.then(zero => { return zero.foo(); // ok, zero is any }); -var p3 = Promise.resolve(`${["path1", "path2"]}`).then(s => require(s)); -var p4 = Promise.resolve(`${() => "PathToModule"}`).then(s => require(s)); +var p3 = Promise.resolve(`${["path1", "path2"]}`).then(s => __importStar(require(s))); +var p4 = Promise.resolve(`${() => "PathToModule"}`).then(s => __importStar(require(s))); diff --git a/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.js b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.js index a2804c5825..fe70a0b01f 100644 --- a/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.js +++ b/testdata/baselines/reference/submodule/conformance/importCallExpressionWithTypeArgument.js @@ -15,5 +15,38 @@ exports.foo = foo; function foo() { return "foo"; } //// [1.js] "use strict"; -var p1 = Promise.resolve().then(() => require("./0")); // error -var p2 = Promise.resolve().then(() => require("./0")); // error +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +var p1 = Promise.resolve().then(() => __importStar(require("./0"))); // error +var p2 = Promise.resolve().then(() => __importStar(require("./0"))); // error diff --git a/testdata/baselines/reference/submodule/conformance/importDefaultBindingDefer.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/importDefaultBindingDefer.errors.txt.diff deleted file mode 100644 index 02b7c1f1ce..0000000000 --- a/testdata/baselines/reference/submodule/conformance/importDefaultBindingDefer.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.importDefaultBindingDefer.errors.txt -+++ new.importDefaultBindingDefer.errors.txt -@@= skipped -0, +0 lines =@@ -- -+b.ts(1,19): error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ -+ -+==== a.ts (0 errors) ==== -+ export default function defer() { -+ console.log("defer from a"); -+ } -+ -+==== b.ts (1 errors) ==== -+ import defer from "a"; -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ -+ defer(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importDefaultBindingDefer.types.diff b/testdata/baselines/reference/submodule/conformance/importDefaultBindingDefer.types.diff deleted file mode 100644 index 189f41e500..0000000000 --- a/testdata/baselines/reference/submodule/conformance/importDefaultBindingDefer.types.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.importDefaultBindingDefer.types -+++ new.importDefaultBindingDefer.types -@@= skipped -13, +13 lines =@@ - - === b.ts === - import defer from "a"; -->defer : () => void -+>defer : any - - defer(); -->defer() : void -->defer : () => void -+>defer() : any -+>defer : any diff --git a/testdata/baselines/reference/submodule/conformance/importDeferComments.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/importDeferComments.errors.txt.diff deleted file mode 100644 index 9cf02c2d3d..0000000000 --- a/testdata/baselines/reference/submodule/conformance/importDeferComments.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.importDeferComments.errors.txt -+++ new.importDeferComments.errors.txt -@@= skipped -0, +0 lines =@@ -- -+b.ts(1,70): error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ -+ -+==== a.ts (0 errors) ==== -+ export {}; -+ -+==== b.ts (1 errors) ==== -+ /*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/; -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importDeferComments.types.diff b/testdata/baselines/reference/submodule/conformance/importDeferComments.types.diff deleted file mode 100644 index 9a344a8478..0000000000 --- a/testdata/baselines/reference/submodule/conformance/importDeferComments.types.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- old.importDeferComments.types -+++ new.importDeferComments.types -@@= skipped -5, +5 lines =@@ - - === b.ts === - /*1*/ import /*2*/ defer /*3*/ * /*4*/ as /*5*/ aNs /*6*/ from /*7*/ "a" /*8*/; -->aNs : typeof aNs -+>aNs : any diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.errors.txt b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.errors.txt index 98b01b7145..f73208bd26 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.errors.txt +++ b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.errors.txt @@ -1,5 +1,4 @@ b.ts(1,8): error TS18058: Default imports are not allowed in a deferred import. -b.ts(1,23): error TS2307: Cannot find module 'a' or its corresponding type declarations. ==== a.ts (0 errors) ==== @@ -7,11 +6,9 @@ b.ts(1,23): error TS2307: Cannot find module 'a' or its corresponding type decla console.log("foo from a"); } -==== b.ts (2 errors) ==== - import defer foo from "a"; +==== b.ts (1 errors) ==== + import defer foo from "./a"; ~~~~~~~~~ !!! error TS18058: Default imports are not allowed in a deferred import. - ~~~ -!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. foo(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.errors.txt.diff deleted file mode 100644 index 380c23e525..0000000000 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.importDeferInvalidDefault.errors.txt -+++ new.importDeferInvalidDefault.errors.txt -@@= skipped -0, +0 lines =@@ - b.ts(1,8): error TS18058: Default imports are not allowed in a deferred import. -+b.ts(1,23): error TS2307: Cannot find module 'a' or its corresponding type declarations. - - - ==== a.ts (0 errors) ==== -@@= skipped -5, +6 lines =@@ - console.log("foo from a"); - } - --==== b.ts (1 errors) ==== -+==== b.ts (2 errors) ==== - import defer foo from "a"; - ~~~~~~~~~ - !!! error TS18058: Default imports are not allowed in a deferred import. -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. - - foo(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.js b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.js index e0f3491c63..1bcd8af758 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.js +++ b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.js @@ -6,7 +6,7 @@ export default function foo() { } //// [b.ts] -import defer foo from "a"; +import defer foo from "./a"; foo(); @@ -15,5 +15,5 @@ export default function foo() { console.log("foo from a"); } //// [b.js] -import defer foo from "a"; +import defer foo from "./a"; foo(); diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.symbols b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.symbols index dd548fc593..34b190c10f 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.symbols +++ b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.symbols @@ -11,7 +11,7 @@ export default function foo() { } === b.ts === -import defer foo from "a"; +import defer foo from "./a"; >foo : Symbol(foo, Decl(b.ts, 0, 6)) foo(); diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.types b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.types index a9b9e63190..031d93e158 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.types +++ b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.types @@ -13,10 +13,10 @@ export default function foo() { } === b.ts === -import defer foo from "a"; ->foo : any +import defer foo from "./a"; +>foo : () => void foo(); ->foo() : any ->foo : any +>foo() : void +>foo : () => void diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.types.diff b/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.types.diff deleted file mode 100644 index f0c844e7c9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidDefault.types.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.importDeferInvalidDefault.types -+++ new.importDeferInvalidDefault.types -@@= skipped -13, +13 lines =@@ - - === b.ts === - import defer foo from "a"; -->foo : () => void -+>foo : any - - foo(); -->foo() : void -->foo : () => void -+>foo() : any -+>foo : any diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.errors.txt b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.errors.txt index 4670b0cf31..f802be536f 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.errors.txt +++ b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.errors.txt @@ -1,5 +1,4 @@ b.ts(1,8): error TS18059: Named imports are not allowed in a deferred import. -b.ts(1,27): error TS2307: Cannot find module 'a' or its corresponding type declarations. ==== a.ts (0 errors) ==== @@ -7,11 +6,9 @@ b.ts(1,27): error TS2307: Cannot find module 'a' or its corresponding type decla console.log("foo from a"); } -==== b.ts (2 errors) ==== - import defer { foo } from "a"; +==== b.ts (1 errors) ==== + import defer { foo } from "./a"; ~~~~~~~~~~~~~ !!! error TS18059: Named imports are not allowed in a deferred import. - ~~~ -!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. foo(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.errors.txt.diff deleted file mode 100644 index 4f150de2ce..0000000000 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.importDeferInvalidNamed.errors.txt -+++ new.importDeferInvalidNamed.errors.txt -@@= skipped -0, +0 lines =@@ - b.ts(1,8): error TS18059: Named imports are not allowed in a deferred import. -+b.ts(1,27): error TS2307: Cannot find module 'a' or its corresponding type declarations. - - - ==== a.ts (0 errors) ==== -@@= skipped -5, +6 lines =@@ - console.log("foo from a"); - } - --==== b.ts (1 errors) ==== -+==== b.ts (2 errors) ==== - import defer { foo } from "a"; - ~~~~~~~~~~~~~ - !!! error TS18059: Named imports are not allowed in a deferred import. -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. - - foo(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.js b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.js index 8f92f52fa0..925c583e31 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.js +++ b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.js @@ -6,7 +6,7 @@ export function foo() { } //// [b.ts] -import defer { foo } from "a"; +import defer { foo } from "./a"; foo(); @@ -15,5 +15,5 @@ export function foo() { console.log("foo from a"); } //// [b.js] -import defer { foo } from "a"; +import defer { foo } from "./a"; foo(); diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.symbols b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.symbols index 77f3959cd7..83b170aa34 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.symbols +++ b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.symbols @@ -11,7 +11,7 @@ export function foo() { } === b.ts === -import defer { foo } from "a"; +import defer { foo } from "./a"; >foo : Symbol(foo, Decl(b.ts, 0, 14)) foo(); diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.types b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.types index 6263341dcc..8878814a73 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.types +++ b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.types @@ -13,10 +13,10 @@ export function foo() { } === b.ts === -import defer { foo } from "a"; ->foo : any +import defer { foo } from "./a"; +>foo : () => void foo(); ->foo() : any ->foo : any +>foo() : void +>foo : () => void diff --git a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.types.diff b/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.types.diff deleted file mode 100644 index 5b1085115d..0000000000 --- a/testdata/baselines/reference/submodule/conformance/importDeferInvalidNamed.types.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.importDeferInvalidNamed.types -+++ new.importDeferInvalidNamed.types -@@= skipped -13, +13 lines =@@ - - === b.ts === - import defer { foo } from "a"; -->foo : () => void -+>foo : any - - foo(); -->foo() : void -->foo : () => void -+>foo() : any -+>foo : any diff --git a/testdata/baselines/reference/submodule/conformance/importDeferNamespace(module=commonjs).js b/testdata/baselines/reference/submodule/conformance/importDeferNamespace(module=commonjs).js index 181c471732..95cd4ac60d 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferNamespace(module=commonjs).js +++ b/testdata/baselines/reference/submodule/conformance/importDeferNamespace(module=commonjs).js @@ -19,6 +19,39 @@ function foo() { } //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const aNs = require("./a.js"); +const aNs = __importStar(require("./a.js")); aNs.foo(); diff --git a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.errors.txt b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.errors.txt index 138cfa68e9..a97903b2cf 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.errors.txt +++ b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.errors.txt @@ -12,7 +12,7 @@ b.ts(1,28): error TS2304: Cannot find name 'from'. } ==== b.ts (6 errors) ==== - import type defer * as ns1 from "a"; + import type defer * as ns1 from "./a"; ~ !!! error TS1005: '=' expected. ~~ diff --git a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.js b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.js index 0577f6a08c..463ebf0241 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.js +++ b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.js @@ -6,7 +6,7 @@ export function foo() { } //// [b.ts] -import type defer * as ns1 from "a"; +import type defer * as ns1 from "./a"; //// [a.js] @@ -17,4 +17,4 @@ export function foo() { * as; ns1; from; -"a"; +"./a"; diff --git a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.symbols b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.symbols index 961367f241..9771ff173b 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.symbols +++ b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.symbols @@ -11,6 +11,6 @@ export function foo() { } === b.ts === -import type defer * as ns1 from "a"; +import type defer * as ns1 from "./a"; >defer : Symbol(defer, Decl(b.ts, 0, 0)) diff --git a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.types b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.types index 10e770b659..bbf66772de 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.types +++ b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict1.types @@ -13,7 +13,7 @@ export function foo() { } === b.ts === -import type defer * as ns1 from "a"; +import type defer * as ns1 from "./a"; >defer : any > : any >* as : number @@ -21,5 +21,5 @@ import type defer * as ns1 from "a"; >as : any >ns1 : any >from : any ->"a" : "a" +>"./a" : "./a" diff --git a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.errors.txt b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.errors.txt index 2387d3e34a..6453749d15 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.errors.txt +++ b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.errors.txt @@ -12,7 +12,7 @@ b.ts(1,28): error TS2304: Cannot find name 'from'. } ==== b.ts (6 errors) ==== - import defer type * as ns1 from "a"; + import defer type * as ns1 from "./a"; ~ !!! error TS1005: 'from' expected. ~~~~ diff --git a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.js b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.js index 1c06d70469..393d7ff039 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.js +++ b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.js @@ -6,7 +6,7 @@ export function foo() { } //// [b.ts] -import defer type * as ns1 from "a"; +import defer type * as ns1 from "./a"; //// [a.js] @@ -16,5 +16,5 @@ export function foo() { //// [b.js] ns1; from; -"a"; +"./a"; export {}; diff --git a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.symbols b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.symbols index ea867e3cfd..699eea7926 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.symbols +++ b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.symbols @@ -11,6 +11,6 @@ export function foo() { } === b.ts === -import defer type * as ns1 from "a"; +import defer type * as ns1 from "./a"; >type : Symbol(type, Decl(b.ts, 0, 6)) diff --git a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.types b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.types index 5c106b971d..ec77da44ac 100644 --- a/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.types +++ b/testdata/baselines/reference/submodule/conformance/importDeferTypeConflict2.types @@ -13,12 +13,12 @@ export function foo() { } === b.ts === -import defer type * as ns1 from "a"; +import defer type * as ns1 from "./a"; >type : any >* as : number > : any >as : any >ns1 : any >from : any ->"a" : "a" +>"./a" : "./a" diff --git a/testdata/baselines/reference/submodule/conformance/importEquals3.js b/testdata/baselines/reference/submodule/conformance/importEquals3.js index d9cf95d8cb..2ade6b267b 100644 --- a/testdata/baselines/reference/submodule/conformance/importEquals3.js +++ b/testdata/baselines/reference/submodule/conformance/importEquals3.js @@ -35,6 +35,39 @@ const x = 0; exports.x = x; //// [c.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const b = require("./b"); +const b = __importStar(require("./b")); console.log(x); diff --git a/testdata/baselines/reference/submodule/conformance/importEquals3.js.diff b/testdata/baselines/reference/submodule/conformance/importEquals3.js.diff index d37aa2ec6a..faa3f4bb40 100644 --- a/testdata/baselines/reference/submodule/conformance/importEquals3.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importEquals3.js.diff @@ -9,9 +9,11 @@ const x = 0; exports.x = x; //// [c.js] - "use strict"; +@@= skipped -40, +38 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var b = require("./b"); +-var b = __importStar(require("./b")); -var x = b.x; -+const b = require("./b"); ++const b = __importStar(require("./b")); console.log(x); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importNonExternalModule.errors.txt b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.errors.txt new file mode 100644 index 0000000000..1cb0df9bfb --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.errors.txt @@ -0,0 +1,17 @@ +foo_1.ts(1,22): error TS2306: File 'foo_0.ts' is not a module. + + +==== foo_1.ts (1 errors) ==== + import foo = require("./foo_0"); + ~~~~~~~~~ +!!! error TS2306: File 'foo_0.ts' is not a module. + // Import should fail. foo_0 not an external module + if(foo.answer === 42){ + + } + +==== foo_0.ts (0 errors) ==== + module foo { + export var answer = 42; + } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importNonExternalModule.js b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.js new file mode 100644 index 0000000000..69b381eb81 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.js @@ -0,0 +1,27 @@ +//// [tests/cases/conformance/externalModules/importNonExternalModule.ts] //// + +//// [foo_0.ts] +module foo { + export var answer = 42; +} + +//// [foo_1.ts] +import foo = require("./foo_0"); +// Import should fail. foo_0 not an external module +if(foo.answer === 42){ + +} + + +//// [foo_0.js] +var foo; +(function (foo) { + foo.answer = 42; +})(foo || (foo = {})); +//// [foo_1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const foo = require("./foo_0"); +// Import should fail. foo_0 not an external module +if (foo.answer === 42) { +} diff --git a/testdata/baselines/reference/submodule/conformance/importNonExternalModule.js.diff b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.js.diff new file mode 100644 index 0000000000..1a9c2fb58f --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.js.diff @@ -0,0 +1,11 @@ +--- old.importNonExternalModule.js ++++ new.importNonExternalModule.js +@@= skipped -20, +20 lines =@@ + //// [foo_1.js] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-var foo = require("./foo_0"); ++const foo = require("./foo_0"); + // Import should fail. foo_0 not an external module + if (foo.answer === 42) { + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/importNonExternalModule.symbols b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.symbols new file mode 100644 index 0000000000..a0d7544d2d --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.symbols @@ -0,0 +1,20 @@ +//// [tests/cases/conformance/externalModules/importNonExternalModule.ts] //// + +=== foo_1.ts === +import foo = require("./foo_0"); +>foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) + +// Import should fail. foo_0 not an external module +if(foo.answer === 42){ +>foo : Symbol(foo, Decl(foo_1.ts, 0, 0)) + +} + +=== foo_0.ts === +module foo { +>foo : Symbol(foo, Decl(foo_0.ts, 0, 0)) + + export var answer = 42; +>answer : Symbol(answer, Decl(foo_0.ts, 1, 11)) +} + diff --git a/testdata/baselines/reference/submodule/conformance/importNonExternalModule.types b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.types new file mode 100644 index 0000000000..21b9eda8a8 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/importNonExternalModule.types @@ -0,0 +1,25 @@ +//// [tests/cases/conformance/externalModules/importNonExternalModule.ts] //// + +=== foo_1.ts === +import foo = require("./foo_0"); +>foo : any + +// Import should fail. foo_0 not an external module +if(foo.answer === 42){ +>foo.answer === 42 : boolean +>foo.answer : any +>foo : any +>answer : any +>42 : 42 + +} + +=== foo_0.ts === +module foo { +>foo : typeof foo + + export var answer = 42; +>answer : number +>42 : 42 +} + diff --git a/testdata/baselines/reference/submodule/conformance/importsImplicitlyReadonly.js b/testdata/baselines/reference/submodule/conformance/importsImplicitlyReadonly.js index bc80e1084e..4ee19ee0d0 100644 --- a/testdata/baselines/reference/submodule/conformance/importsImplicitlyReadonly.js +++ b/testdata/baselines/reference/submodule/conformance/importsImplicitlyReadonly.js @@ -29,9 +29,42 @@ var y = 1; exports.y = y; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); const a_1 = require("./a"); -const a1 = require("./a"); +const a1 = __importStar(require("./a")); const a2 = require("./a"); const a3 = a1; a_1.x = 1; // Error diff --git a/testdata/baselines/reference/submodule/conformance/importsImplicitlyReadonly.js.diff b/testdata/baselines/reference/submodule/conformance/importsImplicitlyReadonly.js.diff index e0cf34dfc2..a05abfde49 100644 --- a/testdata/baselines/reference/submodule/conformance/importsImplicitlyReadonly.js.diff +++ b/testdata/baselines/reference/submodule/conformance/importsImplicitlyReadonly.js.diff @@ -1,14 +1,14 @@ --- old.importsImplicitlyReadonly.js +++ new.importsImplicitlyReadonly.js -@@= skipped -29, +29 lines =@@ - //// [b.js] - "use strict"; +@@= skipped -62, +62 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); -var a_1 = require("./a"); --var a1 = require("./a"); +-var a1 = __importStar(require("./a")); -var a2 = require("./a"); +const a_1 = require("./a"); -+const a1 = require("./a"); ++const a1 = __importStar(require("./a")); +const a2 = require("./a"); const a3 = a1; a_1.x = 1; // Error diff --git a/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.errors.txt b/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.errors.txt deleted file mode 100644 index 837aa4d77f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.errors.txt +++ /dev/null @@ -1,148 +0,0 @@ -error TS5055: Cannot write file 'a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -a.js(14,13): error TS7008: Member 'inMethodNullable' implicitly has an 'any' type. -a.js(20,9): error TS2322: Type 'string' is not assignable to type 'number'. -a.js(39,9): error TS2322: Type 'boolean' is not assignable to type 'number'. - - -!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.js (3 errors) ==== - class C { - constructor() { - if (Math.random()) { - this.inConstructor = 0; - } - else { - this.inConstructor = "string" - } - this.inMultiple = 0; - } - method() { - if (Math.random()) { - this.inMethod = 0; - this.inMethodNullable = null; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS7008: Member 'inMethodNullable' implicitly has an 'any' type. - } - else { - this.inMethod = "string" - this.inMethodNullable = undefined; - } - this.inMultiple = "string"; - ~~~~~~~~~~~~~~~ -!!! error TS2322: Type 'string' is not assignable to type 'number'. - this.inMultipleMethods = "string"; - - var action = () => { - if (Math.random()) { - this.inNestedArrowFunction = 0; - } - else { - this.inNestedArrowFunction = "string" - } - }; - } - get() { - if (Math.random()) { - this.inGetter = 0; - } - else { - this.inGetter = "string" - } - this.inMultiple = false; - ~~~~~~~~~~~~~~~ -!!! error TS2322: Type 'boolean' is not assignable to type 'number'. - this.inMultipleMethods = false; - } - set() { - if (Math.random()) { - this.inSetter = 0; - } - else { - this.inSetter = "string" - } - } - prop = () => { - if (Math.random()) { - this.inPropertyDeclaration = 0; - } - else { - this.inPropertyDeclaration = "string" - } - } - static method() { - if (Math.random()) { - this.inStaticMethod = 0; - } - else { - this.inStaticMethod = "string" - } - - var action = () => { - if (Math.random()) { - this.inStaticNestedArrowFunction = 0; - } - else { - this.inStaticNestedArrowFunction = "string" - } - }; - } - static get() { - if (Math.random()) { - this.inStaticGetter = 0; - } - else { - this.inStaticGetter = "string" - } - } - static set() { - if (Math.random()) { - this.inStaticSetter = 0; - } - else { - this.inStaticSetter = "string" - } - } - static prop = () => { - if (Math.random()) { - this.inStaticPropertyDeclaration = 0; - } - else { - this.inStaticPropertyDeclaration = "string" - } - } - } - -==== b.ts (0 errors) ==== - var c = new C(); - - var stringOrNumber: string | number; - var stringOrNumber = c.inConstructor; - - var stringOrNumberOrUndefined: string | number | undefined; - - var stringOrNumberOrUndefined = c.inMethod; - var stringOrNumberOrUndefined = c.inGetter; - var stringOrNumberOrUndefined = c.inSetter; - var stringOrNumberOrUndefined = c.inPropertyDeclaration; - var stringOrNumberOrUndefined = c.inNestedArrowFunction - - var stringOrNumberOrBoolean: string | number | boolean; - - var number: number; - var number = c.inMultiple; - var stringOrBooleanOrUndefined : string | boolean | undefined; - var stringOrBooleanOrUndefined = c.inMultipleMethods; - var any: any; - var any = c.inMethodNullable; - - - var stringOrNumberOrUndefined = C.inStaticMethod; - var stringOrNumberOrUndefined = C.inStaticGetter; - var stringOrNumberOrUndefined = C.inStaticSetter; - var stringOrNumberOrUndefined = C.inStaticPropertyDeclaration; - var stringOrNumberOrUndefined = C.inStaticNestedArrowFunction; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.symbols b/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.symbols deleted file mode 100644 index a457b7ff9f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.symbols +++ /dev/null @@ -1,369 +0,0 @@ -//// [tests/cases/conformance/salsa/inferringClassMembersFromAssignments.ts] //// - -=== a.js === -class C { ->C : Symbol(C, Decl(a.js, 0, 0)) - - constructor() { - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inConstructor = 0; ->this.inConstructor : Symbol(C.inConstructor, Decl(a.js, 2, 28), Decl(a.js, 5, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inConstructor : Symbol(C.inConstructor, Decl(a.js, 2, 28), Decl(a.js, 5, 14)) - } - else { - this.inConstructor = "string" ->this.inConstructor : Symbol(C.inConstructor, Decl(a.js, 2, 28), Decl(a.js, 5, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inConstructor : Symbol(C.inConstructor, Decl(a.js, 2, 28), Decl(a.js, 5, 14)) - } - this.inMultiple = 0; ->this.inMultiple : Symbol(C.inMultiple, Decl(a.js, 7, 9), Decl(a.js, 18, 9), Decl(a.js, 37, 9)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMultiple : Symbol(C.inMultiple, Decl(a.js, 7, 9), Decl(a.js, 18, 9), Decl(a.js, 37, 9)) - } - method() { ->method : Symbol(C.method, Decl(a.js, 9, 5)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inMethod = 0; ->this.inMethod : Symbol(C.inMethod, Decl(a.js, 11, 28), Decl(a.js, 15, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMethod : Symbol(C.inMethod, Decl(a.js, 11, 28), Decl(a.js, 15, 14)) - - this.inMethodNullable = null; ->this.inMethodNullable : Symbol(C.inMethodNullable, Decl(a.js, 12, 30), Decl(a.js, 16, 36)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMethodNullable : Symbol(C.inMethodNullable, Decl(a.js, 12, 30), Decl(a.js, 16, 36)) - } - else { - this.inMethod = "string" ->this.inMethod : Symbol(C.inMethod, Decl(a.js, 11, 28), Decl(a.js, 15, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMethod : Symbol(C.inMethod, Decl(a.js, 11, 28), Decl(a.js, 15, 14)) - - this.inMethodNullable = undefined; ->this.inMethodNullable : Symbol(C.inMethodNullable, Decl(a.js, 12, 30), Decl(a.js, 16, 36)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMethodNullable : Symbol(C.inMethodNullable, Decl(a.js, 12, 30), Decl(a.js, 16, 36)) ->undefined : Symbol(undefined) - } - this.inMultiple = "string"; ->this.inMultiple : Symbol(C.inMultiple, Decl(a.js, 7, 9), Decl(a.js, 18, 9), Decl(a.js, 37, 9)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMultiple : Symbol(C.inMultiple, Decl(a.js, 7, 9), Decl(a.js, 18, 9), Decl(a.js, 37, 9)) - - this.inMultipleMethods = "string"; ->this.inMultipleMethods : Symbol(C.inMultipleMethods, Decl(a.js, 19, 35), Decl(a.js, 38, 32)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMultipleMethods : Symbol(C.inMultipleMethods, Decl(a.js, 19, 35), Decl(a.js, 38, 32)) - - var action = () => { ->action : Symbol(action, Decl(a.js, 22, 11)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inNestedArrowFunction = 0; ->this.inNestedArrowFunction : Symbol(C.inNestedArrowFunction, Decl(a.js, 23, 32), Decl(a.js, 26, 18)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inNestedArrowFunction : Symbol(C.inNestedArrowFunction, Decl(a.js, 23, 32), Decl(a.js, 26, 18)) - } - else { - this.inNestedArrowFunction = "string" ->this.inNestedArrowFunction : Symbol(C.inNestedArrowFunction, Decl(a.js, 23, 32), Decl(a.js, 26, 18)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inNestedArrowFunction : Symbol(C.inNestedArrowFunction, Decl(a.js, 23, 32), Decl(a.js, 26, 18)) - } - }; - } - get() { ->get : Symbol(C.get, Decl(a.js, 30, 5)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inGetter = 0; ->this.inGetter : Symbol(C.inGetter, Decl(a.js, 32, 28), Decl(a.js, 35, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inGetter : Symbol(C.inGetter, Decl(a.js, 32, 28), Decl(a.js, 35, 14)) - } - else { - this.inGetter = "string" ->this.inGetter : Symbol(C.inGetter, Decl(a.js, 32, 28), Decl(a.js, 35, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inGetter : Symbol(C.inGetter, Decl(a.js, 32, 28), Decl(a.js, 35, 14)) - } - this.inMultiple = false; ->this.inMultiple : Symbol(C.inMultiple, Decl(a.js, 7, 9), Decl(a.js, 18, 9), Decl(a.js, 37, 9)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMultiple : Symbol(C.inMultiple, Decl(a.js, 7, 9), Decl(a.js, 18, 9), Decl(a.js, 37, 9)) - - this.inMultipleMethods = false; ->this.inMultipleMethods : Symbol(C.inMultipleMethods, Decl(a.js, 19, 35), Decl(a.js, 38, 32)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inMultipleMethods : Symbol(C.inMultipleMethods, Decl(a.js, 19, 35), Decl(a.js, 38, 32)) - } - set() { ->set : Symbol(C.set, Decl(a.js, 40, 5)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inSetter = 0; ->this.inSetter : Symbol(C.inSetter, Decl(a.js, 42, 28), Decl(a.js, 45, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inSetter : Symbol(C.inSetter, Decl(a.js, 42, 28), Decl(a.js, 45, 14)) - } - else { - this.inSetter = "string" ->this.inSetter : Symbol(C.inSetter, Decl(a.js, 42, 28), Decl(a.js, 45, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inSetter : Symbol(C.inSetter, Decl(a.js, 42, 28), Decl(a.js, 45, 14)) - } - } - prop = () => { ->prop : Symbol(C.prop, Decl(a.js, 48, 5)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inPropertyDeclaration = 0; ->this.inPropertyDeclaration : Symbol(C.inPropertyDeclaration, Decl(a.js, 50, 28), Decl(a.js, 53, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inPropertyDeclaration : Symbol(C.inPropertyDeclaration, Decl(a.js, 50, 28), Decl(a.js, 53, 14)) - } - else { - this.inPropertyDeclaration = "string" ->this.inPropertyDeclaration : Symbol(C.inPropertyDeclaration, Decl(a.js, 50, 28), Decl(a.js, 53, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inPropertyDeclaration : Symbol(C.inPropertyDeclaration, Decl(a.js, 50, 28), Decl(a.js, 53, 14)) - } - } - static method() { ->method : Symbol(C.method, Decl(a.js, 56, 5)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inStaticMethod = 0; ->this.inStaticMethod : Symbol(C.inStaticMethod, Decl(a.js, 58, 28), Decl(a.js, 61, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticMethod : Symbol(C.inStaticMethod, Decl(a.js, 58, 28), Decl(a.js, 61, 14)) - } - else { - this.inStaticMethod = "string" ->this.inStaticMethod : Symbol(C.inStaticMethod, Decl(a.js, 58, 28), Decl(a.js, 61, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticMethod : Symbol(C.inStaticMethod, Decl(a.js, 58, 28), Decl(a.js, 61, 14)) - } - - var action = () => { ->action : Symbol(action, Decl(a.js, 65, 11)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inStaticNestedArrowFunction = 0; ->this.inStaticNestedArrowFunction : Symbol(C.inStaticNestedArrowFunction, Decl(a.js, 66, 32), Decl(a.js, 69, 18)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticNestedArrowFunction : Symbol(C.inStaticNestedArrowFunction, Decl(a.js, 66, 32), Decl(a.js, 69, 18)) - } - else { - this.inStaticNestedArrowFunction = "string" ->this.inStaticNestedArrowFunction : Symbol(C.inStaticNestedArrowFunction, Decl(a.js, 66, 32), Decl(a.js, 69, 18)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticNestedArrowFunction : Symbol(C.inStaticNestedArrowFunction, Decl(a.js, 66, 32), Decl(a.js, 69, 18)) - } - }; - } - static get() { ->get : Symbol(C.get, Decl(a.js, 73, 5)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inStaticGetter = 0; ->this.inStaticGetter : Symbol(C.inStaticGetter, Decl(a.js, 75, 28), Decl(a.js, 78, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticGetter : Symbol(C.inStaticGetter, Decl(a.js, 75, 28), Decl(a.js, 78, 14)) - } - else { - this.inStaticGetter = "string" ->this.inStaticGetter : Symbol(C.inStaticGetter, Decl(a.js, 75, 28), Decl(a.js, 78, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticGetter : Symbol(C.inStaticGetter, Decl(a.js, 75, 28), Decl(a.js, 78, 14)) - } - } - static set() { ->set : Symbol(C.set, Decl(a.js, 81, 5)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inStaticSetter = 0; ->this.inStaticSetter : Symbol(C.inStaticSetter, Decl(a.js, 83, 28), Decl(a.js, 86, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticSetter : Symbol(C.inStaticSetter, Decl(a.js, 83, 28), Decl(a.js, 86, 14)) - } - else { - this.inStaticSetter = "string" ->this.inStaticSetter : Symbol(C.inStaticSetter, Decl(a.js, 83, 28), Decl(a.js, 86, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticSetter : Symbol(C.inStaticSetter, Decl(a.js, 83, 28), Decl(a.js, 86, 14)) - } - } - static prop = () => { ->prop : Symbol(C.prop, Decl(a.js, 89, 5)) - - if (Math.random()) { ->Math.random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) ->Math : Symbol(Math, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --)) ->random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --)) - - this.inStaticPropertyDeclaration = 0; ->this.inStaticPropertyDeclaration : Symbol(C.inStaticPropertyDeclaration, Decl(a.js, 91, 28), Decl(a.js, 94, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticPropertyDeclaration : Symbol(C.inStaticPropertyDeclaration, Decl(a.js, 91, 28), Decl(a.js, 94, 14)) - } - else { - this.inStaticPropertyDeclaration = "string" ->this.inStaticPropertyDeclaration : Symbol(C.inStaticPropertyDeclaration, Decl(a.js, 91, 28), Decl(a.js, 94, 14)) ->this : Symbol(C, Decl(a.js, 0, 0)) ->inStaticPropertyDeclaration : Symbol(C.inStaticPropertyDeclaration, Decl(a.js, 91, 28), Decl(a.js, 94, 14)) - } - } -} - -=== b.ts === -var c = new C(); ->c : Symbol(c, Decl(b.ts, 0, 3)) ->C : Symbol(C, Decl(a.js, 0, 0)) - -var stringOrNumber: string | number; ->stringOrNumber : Symbol(stringOrNumber, Decl(b.ts, 2, 3), Decl(b.ts, 3, 3)) - -var stringOrNumber = c.inConstructor; ->stringOrNumber : Symbol(stringOrNumber, Decl(b.ts, 2, 3), Decl(b.ts, 3, 3)) ->c.inConstructor : Symbol(C.inConstructor, Decl(a.js, 2, 28), Decl(a.js, 5, 14)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inConstructor : Symbol(C.inConstructor, Decl(a.js, 2, 28), Decl(a.js, 5, 14)) - -var stringOrNumberOrUndefined: string | number | undefined; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) - -var stringOrNumberOrUndefined = c.inMethod; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->c.inMethod : Symbol(C.inMethod, Decl(a.js, 11, 28), Decl(a.js, 15, 14)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inMethod : Symbol(C.inMethod, Decl(a.js, 11, 28), Decl(a.js, 15, 14)) - -var stringOrNumberOrUndefined = c.inGetter; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->c.inGetter : Symbol(C.inGetter, Decl(a.js, 32, 28), Decl(a.js, 35, 14)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inGetter : Symbol(C.inGetter, Decl(a.js, 32, 28), Decl(a.js, 35, 14)) - -var stringOrNumberOrUndefined = c.inSetter; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->c.inSetter : Symbol(C.inSetter, Decl(a.js, 42, 28), Decl(a.js, 45, 14)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inSetter : Symbol(C.inSetter, Decl(a.js, 42, 28), Decl(a.js, 45, 14)) - -var stringOrNumberOrUndefined = c.inPropertyDeclaration; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->c.inPropertyDeclaration : Symbol(C.inPropertyDeclaration, Decl(a.js, 50, 28), Decl(a.js, 53, 14)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inPropertyDeclaration : Symbol(C.inPropertyDeclaration, Decl(a.js, 50, 28), Decl(a.js, 53, 14)) - -var stringOrNumberOrUndefined = c.inNestedArrowFunction ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->c.inNestedArrowFunction : Symbol(C.inNestedArrowFunction, Decl(a.js, 23, 32), Decl(a.js, 26, 18)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inNestedArrowFunction : Symbol(C.inNestedArrowFunction, Decl(a.js, 23, 32), Decl(a.js, 26, 18)) - -var stringOrNumberOrBoolean: string | number | boolean; ->stringOrNumberOrBoolean : Symbol(stringOrNumberOrBoolean, Decl(b.ts, 13, 3)) - -var number: number; ->number : Symbol(number, Decl(b.ts, 15, 3), Decl(b.ts, 16, 3)) - -var number = c.inMultiple; ->number : Symbol(number, Decl(b.ts, 15, 3), Decl(b.ts, 16, 3)) ->c.inMultiple : Symbol(C.inMultiple, Decl(a.js, 7, 9), Decl(a.js, 18, 9), Decl(a.js, 37, 9)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inMultiple : Symbol(C.inMultiple, Decl(a.js, 7, 9), Decl(a.js, 18, 9), Decl(a.js, 37, 9)) - -var stringOrBooleanOrUndefined : string | boolean | undefined; ->stringOrBooleanOrUndefined : Symbol(stringOrBooleanOrUndefined, Decl(b.ts, 17, 3), Decl(b.ts, 18, 3)) - -var stringOrBooleanOrUndefined = c.inMultipleMethods; ->stringOrBooleanOrUndefined : Symbol(stringOrBooleanOrUndefined, Decl(b.ts, 17, 3), Decl(b.ts, 18, 3)) ->c.inMultipleMethods : Symbol(C.inMultipleMethods, Decl(a.js, 19, 35), Decl(a.js, 38, 32)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inMultipleMethods : Symbol(C.inMultipleMethods, Decl(a.js, 19, 35), Decl(a.js, 38, 32)) - -var any: any; ->any : Symbol(any, Decl(b.ts, 19, 3), Decl(b.ts, 20, 3)) - -var any = c.inMethodNullable; ->any : Symbol(any, Decl(b.ts, 19, 3), Decl(b.ts, 20, 3)) ->c.inMethodNullable : Symbol(C.inMethodNullable, Decl(a.js, 12, 30), Decl(a.js, 16, 36)) ->c : Symbol(c, Decl(b.ts, 0, 3)) ->inMethodNullable : Symbol(C.inMethodNullable, Decl(a.js, 12, 30), Decl(a.js, 16, 36)) - - -var stringOrNumberOrUndefined = C.inStaticMethod; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->C.inStaticMethod : Symbol(C.inStaticMethod, Decl(a.js, 58, 28), Decl(a.js, 61, 14)) ->C : Symbol(C, Decl(a.js, 0, 0)) ->inStaticMethod : Symbol(C.inStaticMethod, Decl(a.js, 58, 28), Decl(a.js, 61, 14)) - -var stringOrNumberOrUndefined = C.inStaticGetter; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->C.inStaticGetter : Symbol(C.inStaticGetter, Decl(a.js, 75, 28), Decl(a.js, 78, 14)) ->C : Symbol(C, Decl(a.js, 0, 0)) ->inStaticGetter : Symbol(C.inStaticGetter, Decl(a.js, 75, 28), Decl(a.js, 78, 14)) - -var stringOrNumberOrUndefined = C.inStaticSetter; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->C.inStaticSetter : Symbol(C.inStaticSetter, Decl(a.js, 83, 28), Decl(a.js, 86, 14)) ->C : Symbol(C, Decl(a.js, 0, 0)) ->inStaticSetter : Symbol(C.inStaticSetter, Decl(a.js, 83, 28), Decl(a.js, 86, 14)) - -var stringOrNumberOrUndefined = C.inStaticPropertyDeclaration; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->C.inStaticPropertyDeclaration : Symbol(C.inStaticPropertyDeclaration, Decl(a.js, 91, 28), Decl(a.js, 94, 14)) ->C : Symbol(C, Decl(a.js, 0, 0)) ->inStaticPropertyDeclaration : Symbol(C.inStaticPropertyDeclaration, Decl(a.js, 91, 28), Decl(a.js, 94, 14)) - -var stringOrNumberOrUndefined = C.inStaticNestedArrowFunction; ->stringOrNumberOrUndefined : Symbol(stringOrNumberOrUndefined, Decl(b.ts, 5, 3), Decl(b.ts, 7, 3), Decl(b.ts, 8, 3), Decl(b.ts, 9, 3), Decl(b.ts, 10, 3) ... and 6 more) ->C.inStaticNestedArrowFunction : Symbol(C.inStaticNestedArrowFunction, Decl(a.js, 66, 32), Decl(a.js, 69, 18)) ->C : Symbol(C, Decl(a.js, 0, 0)) ->inStaticNestedArrowFunction : Symbol(C.inStaticNestedArrowFunction, Decl(a.js, 66, 32), Decl(a.js, 69, 18)) - diff --git a/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.types b/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.types deleted file mode 100644 index ffe098213c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/inferringClassMembersFromAssignments.types +++ /dev/null @@ -1,441 +0,0 @@ -//// [tests/cases/conformance/salsa/inferringClassMembersFromAssignments.ts] //// - -=== a.js === -class C { ->C : C - - constructor() { - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inConstructor = 0; ->this.inConstructor = 0 : 0 ->this.inConstructor : any ->this : this ->inConstructor : any ->0 : 0 - } - else { - this.inConstructor = "string" ->this.inConstructor = "string" : "string" ->this.inConstructor : any ->this : this ->inConstructor : any ->"string" : "string" - } - this.inMultiple = 0; ->this.inMultiple = 0 : 0 ->this.inMultiple : any ->this : this ->inMultiple : any ->0 : 0 - } - method() { ->method : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inMethod = 0; ->this.inMethod = 0 : 0 ->this.inMethod : string | number | undefined ->this : this ->inMethod : string | number | undefined ->0 : 0 - - this.inMethodNullable = null; ->this.inMethodNullable = null : null ->this.inMethodNullable : any ->this : this ->inMethodNullable : any - } - else { - this.inMethod = "string" ->this.inMethod = "string" : "string" ->this.inMethod : string | number | undefined ->this : this ->inMethod : string | number | undefined ->"string" : "string" - - this.inMethodNullable = undefined; ->this.inMethodNullable = undefined : undefined ->this.inMethodNullable : any ->this : this ->inMethodNullable : any ->undefined : undefined - } - this.inMultiple = "string"; ->this.inMultiple = "string" : "string" ->this.inMultiple : number ->this : this ->inMultiple : number ->"string" : "string" - - this.inMultipleMethods = "string"; ->this.inMultipleMethods = "string" : "string" ->this.inMultipleMethods : string | boolean | undefined ->this : this ->inMultipleMethods : string | boolean | undefined ->"string" : "string" - - var action = () => { ->action : () => void ->() => { if (Math.random()) { this.inNestedArrowFunction = 0; } else { this.inNestedArrowFunction = "string" } } : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inNestedArrowFunction = 0; ->this.inNestedArrowFunction = 0 : 0 ->this.inNestedArrowFunction : string | number | undefined ->this : this ->inNestedArrowFunction : string | number | undefined ->0 : 0 - } - else { - this.inNestedArrowFunction = "string" ->this.inNestedArrowFunction = "string" : "string" ->this.inNestedArrowFunction : string | number | undefined ->this : this ->inNestedArrowFunction : string | number | undefined ->"string" : "string" - } - }; - } - get() { ->get : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inGetter = 0; ->this.inGetter = 0 : 0 ->this.inGetter : string | number | undefined ->this : this ->inGetter : string | number | undefined ->0 : 0 - } - else { - this.inGetter = "string" ->this.inGetter = "string" : "string" ->this.inGetter : string | number | undefined ->this : this ->inGetter : string | number | undefined ->"string" : "string" - } - this.inMultiple = false; ->this.inMultiple = false : false ->this.inMultiple : number ->this : this ->inMultiple : number ->false : false - - this.inMultipleMethods = false; ->this.inMultipleMethods = false : false ->this.inMultipleMethods : string | boolean | undefined ->this : this ->inMultipleMethods : string | boolean | undefined ->false : false - } - set() { ->set : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inSetter = 0; ->this.inSetter = 0 : 0 ->this.inSetter : string | number | undefined ->this : this ->inSetter : string | number | undefined ->0 : 0 - } - else { - this.inSetter = "string" ->this.inSetter = "string" : "string" ->this.inSetter : string | number | undefined ->this : this ->inSetter : string | number | undefined ->"string" : "string" - } - } - prop = () => { ->prop : () => void ->() => { if (Math.random()) { this.inPropertyDeclaration = 0; } else { this.inPropertyDeclaration = "string" } } : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inPropertyDeclaration = 0; ->this.inPropertyDeclaration = 0 : 0 ->this.inPropertyDeclaration : string | number | undefined ->this : this ->inPropertyDeclaration : string | number | undefined ->0 : 0 - } - else { - this.inPropertyDeclaration = "string" ->this.inPropertyDeclaration = "string" : "string" ->this.inPropertyDeclaration : string | number | undefined ->this : this ->inPropertyDeclaration : string | number | undefined ->"string" : "string" - } - } - static method() { ->method : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inStaticMethod = 0; ->this.inStaticMethod = 0 : 0 ->this.inStaticMethod : string | number | undefined ->this : typeof C ->inStaticMethod : string | number | undefined ->0 : 0 - } - else { - this.inStaticMethod = "string" ->this.inStaticMethod = "string" : "string" ->this.inStaticMethod : string | number | undefined ->this : typeof C ->inStaticMethod : string | number | undefined ->"string" : "string" - } - - var action = () => { ->action : () => void ->() => { if (Math.random()) { this.inStaticNestedArrowFunction = 0; } else { this.inStaticNestedArrowFunction = "string" } } : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inStaticNestedArrowFunction = 0; ->this.inStaticNestedArrowFunction = 0 : 0 ->this.inStaticNestedArrowFunction : string | number | undefined ->this : typeof C ->inStaticNestedArrowFunction : string | number | undefined ->0 : 0 - } - else { - this.inStaticNestedArrowFunction = "string" ->this.inStaticNestedArrowFunction = "string" : "string" ->this.inStaticNestedArrowFunction : string | number | undefined ->this : typeof C ->inStaticNestedArrowFunction : string | number | undefined ->"string" : "string" - } - }; - } - static get() { ->get : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inStaticGetter = 0; ->this.inStaticGetter = 0 : 0 ->this.inStaticGetter : string | number | undefined ->this : typeof C ->inStaticGetter : string | number | undefined ->0 : 0 - } - else { - this.inStaticGetter = "string" ->this.inStaticGetter = "string" : "string" ->this.inStaticGetter : string | number | undefined ->this : typeof C ->inStaticGetter : string | number | undefined ->"string" : "string" - } - } - static set() { ->set : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inStaticSetter = 0; ->this.inStaticSetter = 0 : 0 ->this.inStaticSetter : string | number | undefined ->this : typeof C ->inStaticSetter : string | number | undefined ->0 : 0 - } - else { - this.inStaticSetter = "string" ->this.inStaticSetter = "string" : "string" ->this.inStaticSetter : string | number | undefined ->this : typeof C ->inStaticSetter : string | number | undefined ->"string" : "string" - } - } - static prop = () => { ->prop : () => void ->() => { if (Math.random()) { this.inStaticPropertyDeclaration = 0; } else { this.inStaticPropertyDeclaration = "string" } } : () => void - - if (Math.random()) { ->Math.random() : number ->Math.random : () => number ->Math : Math ->random : () => number - - this.inStaticPropertyDeclaration = 0; ->this.inStaticPropertyDeclaration = 0 : 0 ->this.inStaticPropertyDeclaration : string | number | undefined ->this : typeof C ->inStaticPropertyDeclaration : string | number | undefined ->0 : 0 - } - else { - this.inStaticPropertyDeclaration = "string" ->this.inStaticPropertyDeclaration = "string" : "string" ->this.inStaticPropertyDeclaration : string | number | undefined ->this : typeof C ->inStaticPropertyDeclaration : string | number | undefined ->"string" : "string" - } - } -} - -=== b.ts === -var c = new C(); ->c : C ->new C() : C ->C : typeof C - -var stringOrNumber: string | number; ->stringOrNumber : string | number - -var stringOrNumber = c.inConstructor; ->stringOrNumber : string | number ->c.inConstructor : string | number ->c : C ->inConstructor : string | number - -var stringOrNumberOrUndefined: string | number | undefined; ->stringOrNumberOrUndefined : string | number | undefined - -var stringOrNumberOrUndefined = c.inMethod; ->stringOrNumberOrUndefined : string | number | undefined ->c.inMethod : string | number | undefined ->c : C ->inMethod : string | number | undefined - -var stringOrNumberOrUndefined = c.inGetter; ->stringOrNumberOrUndefined : string | number | undefined ->c.inGetter : string | number | undefined ->c : C ->inGetter : string | number | undefined - -var stringOrNumberOrUndefined = c.inSetter; ->stringOrNumberOrUndefined : string | number | undefined ->c.inSetter : string | number | undefined ->c : C ->inSetter : string | number | undefined - -var stringOrNumberOrUndefined = c.inPropertyDeclaration; ->stringOrNumberOrUndefined : string | number | undefined ->c.inPropertyDeclaration : string | number | undefined ->c : C ->inPropertyDeclaration : string | number | undefined - -var stringOrNumberOrUndefined = c.inNestedArrowFunction ->stringOrNumberOrUndefined : string | number | undefined ->c.inNestedArrowFunction : string | number | undefined ->c : C ->inNestedArrowFunction : string | number | undefined - -var stringOrNumberOrBoolean: string | number | boolean; ->stringOrNumberOrBoolean : string | number | boolean - -var number: number; ->number : number - -var number = c.inMultiple; ->number : number ->c.inMultiple : number ->c : C ->inMultiple : number - -var stringOrBooleanOrUndefined : string | boolean | undefined; ->stringOrBooleanOrUndefined : string | boolean | undefined - -var stringOrBooleanOrUndefined = c.inMultipleMethods; ->stringOrBooleanOrUndefined : string | boolean | undefined ->c.inMultipleMethods : string | boolean | undefined ->c : C ->inMultipleMethods : string | boolean | undefined - -var any: any; ->any : any - -var any = c.inMethodNullable; ->any : any ->c.inMethodNullable : any ->c : C ->inMethodNullable : any - - -var stringOrNumberOrUndefined = C.inStaticMethod; ->stringOrNumberOrUndefined : string | number | undefined ->C.inStaticMethod : string | number | undefined ->C : typeof C ->inStaticMethod : string | number | undefined - -var stringOrNumberOrUndefined = C.inStaticGetter; ->stringOrNumberOrUndefined : string | number | undefined ->C.inStaticGetter : string | number | undefined ->C : typeof C ->inStaticGetter : string | number | undefined - -var stringOrNumberOrUndefined = C.inStaticSetter; ->stringOrNumberOrUndefined : string | number | undefined ->C.inStaticSetter : string | number | undefined ->C : typeof C ->inStaticSetter : string | number | undefined - -var stringOrNumberOrUndefined = C.inStaticPropertyDeclaration; ->stringOrNumberOrUndefined : string | number | undefined ->C.inStaticPropertyDeclaration : string | number | undefined ->C : typeof C ->inStaticPropertyDeclaration : string | number | undefined - -var stringOrNumberOrUndefined = C.inStaticNestedArrowFunction; ->stringOrNumberOrUndefined : string | number | undefined ->C.inStaticNestedArrowFunction : string | number | undefined ->C : typeof C ->inStaticNestedArrowFunction : string | number | undefined - diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarations.js b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarations.js index 14fffa54b5..5e568b5ba5 100644 --- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarations.js +++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarations.js @@ -39,9 +39,42 @@ export * from "./reacty"; //// [otherreacty.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx React.createElement */ -const React = require("./renderer"); +const React = __importStar(require("./renderer")); React.createElement("h", null); //// [other.js] "use strict"; @@ -59,9 +92,12 @@ const renderer_1 = require("./renderer"); exports.prerendered2 = (0, renderer_1.otherdom)("h", null); //// [reacty.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.prerendered3 = void 0; -const renderer_1 = require("./renderer"); +const renderer_1 = __importDefault(require("./renderer")); exports.prerendered3 = renderer_1.default.createElement("h", null); //// [index.js] "use strict"; diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarations.js.diff b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarations.js.diff index dd6bc2c3eb..6c0f158612 100644 --- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarations.js.diff +++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarations.js.diff @@ -1,11 +1,11 @@ --- old.inlineJsxFactoryDeclarations.js +++ new.inlineJsxFactoryDeclarations.js -@@= skipped -40, +40 lines =@@ - "use strict"; +@@= skipped -73, +73 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx React.createElement */ --var React = require("./renderer"); -+const React = require("./renderer"); +-var React = __importStar(require("./renderer")); ++const React = __importStar(require("./renderer")); React.createElement("h", null); //// [other.js] "use strict"; @@ -25,14 +25,16 @@ exports.prerendered2 = (0, renderer_1.otherdom)("h", null); //// [reacty.js] "use strict"; +@@= skipped -23, +23 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.prerendered3 = void 0; --var renderer_1 = require("./renderer"); -+const renderer_1 = require("./renderer"); +-var renderer_1 = __importDefault(require("./renderer")); ++const renderer_1 = __importDefault(require("./renderer")); exports.prerendered3 = renderer_1.default.createElement("h", null); //// [index.js] "use strict"; -@@= skipped -40, +40 lines =@@ +@@= skipped -20, +20 lines =@@ }; Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx dom */ diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.js b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.js index b988f0ea60..1e3a888ba6 100644 --- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.js +++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.js @@ -124,10 +124,43 @@ exports.tree = (0, renderer2_1.predom)(exports.MySFC, { x: 1, y: 2 }, exports.default = (0, renderer2_1.predom)("h", null); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx dom */ const renderer_1 = require("./renderer"); -const component_1 = require("./component"); +const component_1 = __importStar(require("./component")); let elem = component_1.default; elem = (0, renderer_1.dom)("h", null); // Expect assignability error here const DOMSFC = (props) => (0, renderer_1.dom)("p", null, diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.js.diff b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.js.diff index 743d7f200c..8beb343c9c 100644 --- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.js.diff +++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryDeclarationsLocalTypes.js.diff @@ -18,14 +18,14 @@ constructor(props) { this.props = props; } -@@= skipped -22, +24 lines =@@ - "use strict"; +@@= skipped -55, +57 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx dom */ -var renderer_1 = require("./renderer"); --var component_1 = require("./component"); +-var component_1 = __importStar(require("./component")); +const renderer_1 = require("./renderer"); -+const component_1 = require("./component"); ++const component_1 = __importStar(require("./component")); let elem = component_1.default; elem = (0, renderer_1.dom)("h", null); // Expect assignability error here const DOMSFC = (props) => (0, renderer_1.dom)("p", null, diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.js b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.js index 0f64bc3971..15376103fd 100644 --- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.js +++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.js @@ -53,9 +53,12 @@ const renderer2_1 = require("./renderer2"); exports.default = (0, renderer2_1.predom)("h", null); //// [index.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx dom */ const renderer_1 = require("./renderer"); -const component_1 = require("./component"); +const component_1 = __importDefault(require("./component")); let elem = component_1.default; elem = (0, renderer_1.dom)("h", null); // Expect assignability error here diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.js.diff b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.js.diff index 9076baf807..9804625ed6 100644 --- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.js.diff +++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryLocalTypeGlobalFallback.js.diff @@ -9,11 +9,13 @@ exports.default = (0, renderer2_1.predom)("h", null); //// [index.js] "use strict"; +@@= skipped -9, +9 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx dom */ -var renderer_1 = require("./renderer"); --var component_1 = require("./component"); +-var component_1 = __importDefault(require("./component")); +const renderer_1 = require("./renderer"); -+const component_1 = require("./component"); ++const component_1 = __importDefault(require("./component")); let elem = component_1.default; elem = (0, renderer_1.dom)("h", null); // Expect assignability error here \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryWithFragmentIsError.js b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryWithFragmentIsError.js index 6abb9f89fd..c76d58358d 100644 --- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryWithFragmentIsError.js +++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryWithFragmentIsError.js @@ -21,9 +21,42 @@ import { dom } from "./renderer"; //// [reacty.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx React.createElement */ -const React = require("./renderer"); +const React = __importStar(require("./renderer")); React.createElement(React.Fragment, null, React.createElement("h", null)); //// [index.js] diff --git a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryWithFragmentIsError.js.diff b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryWithFragmentIsError.js.diff index ab8df76223..3b6630a863 100644 --- a/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryWithFragmentIsError.js.diff +++ b/testdata/baselines/reference/submodule/conformance/inlineJsxFactoryWithFragmentIsError.js.diff @@ -1,11 +1,11 @@ --- old.inlineJsxFactoryWithFragmentIsError.js +++ new.inlineJsxFactoryWithFragmentIsError.js -@@= skipped -22, +22 lines =@@ - "use strict"; +@@= skipped -55, +55 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /** @jsx React.createElement */ --var React = require("./renderer"); -+const React = require("./renderer"); +-var React = __importStar(require("./renderer")); ++const React = __importStar(require("./renderer")); React.createElement(React.Fragment, null, React.createElement("h", null)); //// [index.js] diff --git a/testdata/baselines/reference/submodule/conformance/invalidSyntaxNamespaceImportWithCommonjs.js b/testdata/baselines/reference/submodule/conformance/invalidSyntaxNamespaceImportWithCommonjs.js index d3b20995b7..46ad28ec96 100644 --- a/testdata/baselines/reference/submodule/conformance/invalidSyntaxNamespaceImportWithCommonjs.js +++ b/testdata/baselines/reference/submodule/conformance/invalidSyntaxNamespaceImportWithCommonjs.js @@ -15,7 +15,40 @@ class C { exports.C = C; //// [1.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const from = require(); +const from = __importStar(require()); from; "./0"; diff --git a/testdata/baselines/reference/submodule/conformance/invalidSyntaxNamespaceImportWithCommonjs.js.diff b/testdata/baselines/reference/submodule/conformance/invalidSyntaxNamespaceImportWithCommonjs.js.diff index 2207338a5a..1cf6c8b1c7 100644 --- a/testdata/baselines/reference/submodule/conformance/invalidSyntaxNamespaceImportWithCommonjs.js.diff +++ b/testdata/baselines/reference/submodule/conformance/invalidSyntaxNamespaceImportWithCommonjs.js.diff @@ -1,10 +1,10 @@ --- old.invalidSyntaxNamespaceImportWithCommonjs.js +++ new.invalidSyntaxNamespaceImportWithCommonjs.js -@@= skipped -15, +15 lines =@@ - //// [1.js] - "use strict"; +@@= skipped -48, +48 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var from = require(); -+const from = require(); +-var from = __importStar(require()); ++const from = __importStar(require()); from; "./0"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDefault.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDefault.js index 6f9f8f4d49..c42c3c641a 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDefault.js +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDefault.js @@ -66,8 +66,11 @@ exports.Bar = Foo; exports.X = Foo; //// [index4.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const index3_1 = require("./index3"); +const index3_1 = __importDefault(require("./index3")); class Bar extends index3_1.default { x = /** @type {Bar} */ null; } diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDefault.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDefault.js.diff index 7ba41aae8a..d322029469 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsDefault.js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsDefault.js.diff @@ -11,12 +11,12 @@ } exports.default = Foo; exports.Bar = Foo; -@@= skipped -11, +9 lines =@@ - //// [index4.js] - "use strict"; +@@= skipped -14, +12 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var index3_1 = require("./index3"); -+const index3_1 = require("./index3"); +-var index3_1 = __importDefault(require("./index3")); ++const index3_1 = __importDefault(require("./index3")); class Bar extends index3_1.default { - constructor() { - super(...arguments); diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.js index 58e1e4b0ff..4510ccf9ac 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.js +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.js @@ -115,20 +115,119 @@ const cls_1 = require("./cls"); Object.defineProperty(exports, "Foo", { enumerable: true, get: function () { return cls_1.Foo; } }); //// [bat.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ns = require("./cls"); +const ns = __importStar(require("./cls")); exports.default = ns; //// [ban.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.ns = void 0; -const ns = require("./cls"); +const ns = __importStar(require("./cls")); exports.ns = ns; //// [bol.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.classContainer = void 0; -const ns = require("./cls"); +const ns = __importStar(require("./cls")); exports.classContainer = ns; //// [cjs.js] const ns = require("./cls"); diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.js.diff index 0d7c673b3d..b8b943ee7a 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportForms.js.diff @@ -9,23 +9,30 @@ Object.defineProperty(exports, "Foo", { enumerable: true, get: function () { return cls_1.Foo; } }); //// [bat.js] "use strict"; +@@= skipped -38, +38 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ns = require("./cls"); -+const ns = require("./cls"); +-var ns = __importStar(require("./cls")); ++const ns = __importStar(require("./cls")); exports.default = ns; //// [ban.js] "use strict"; +@@= skipped -39, +39 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.ns = void 0; --var ns = require("./cls"); -+const ns = require("./cls"); +-var ns = __importStar(require("./cls")); ++const ns = __importStar(require("./cls")); exports.ns = ns; //// [bol.js] "use strict"; +@@= skipped -39, +39 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.classContainer = void 0; --var ns = require("./cls"); -+const ns = require("./cls"); +-var ns = __importStar(require("./cls")); ++const ns = __importStar(require("./cls")); exports.classContainer = ns; //// [cjs.js] const ns = require("./cls"); @@ -48,7 +55,7 @@ module.exports.names = ns; //// [includeAll.js] "use strict"; -@@= skipped -47, +54 lines =@@ +@@= skipped -30, +37 lines =@@ //// [cls.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.js index 29d60e3d25..c77d5c4e84 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.js +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.js @@ -34,8 +34,41 @@ const ns = require("./cls"); module.exports = ns; //// [bin.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const ns = require("./cls"); +const ns = __importStar(require("./cls")); export = ns; module.exports = ns; // We refuse to bind cjs module exports assignments in the same file we find an import in //// [globalNs.js] diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.js.diff index a4dce2b54f..cd5e891fab 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsExportFormsErr.js.diff @@ -9,14 +9,17 @@ module.exports = ns; //// [bin.js] "use strict"; +@@= skipped -38, +38 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var ns = require("./cls"); -+const ns = require("./cls"); +-var ns = __importStar(require("./cls")); ++const ns = __importStar(require("./cls")); +export = ns; module.exports = ns; // We refuse to bind cjs module exports assignments in the same file we find an import in //// [globalNs.js] "use strict"; -@@= skipped -34, +35 lines =@@ +@@= skipped -29, +30 lines =@@ //// [cls.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliases.js b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliases.js index 3026f124f4..4fc3136394 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliases.js +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliases.js @@ -19,12 +19,15 @@ class Foo { exports.default = Foo; //// [usage.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.Foob = exports.x = void 0; -const cls_1 = require("./cls"); +const cls_1 = __importDefault(require("./cls")); exports.x = new cls_1.default(); const cls_2 = require("./cls"); -Object.defineProperty(exports, "Foob", { enumerable: true, get: function () { return cls_2.default; } }); +Object.defineProperty(exports, "Foob", { enumerable: true, get: function () { return __importDefault(cls_2).default; } }); //// [cls.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliases.js.diff b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliases.js.diff index 453b316f0f..6f15916953 100644 --- a/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliases.js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsDeclarationsReexportAliases.js.diff @@ -1,15 +1,15 @@ --- old.jsDeclarationsReexportAliases.js +++ new.jsDeclarationsReexportAliases.js -@@= skipped -20, +20 lines =@@ - "use strict"; +@@= skipped -23, +23 lines =@@ + }; Object.defineProperty(exports, "__esModule", { value: true }); exports.Foob = exports.x = void 0; --var cls_1 = require("./cls"); -+const cls_1 = require("./cls"); +-var cls_1 = __importDefault(require("./cls")); ++const cls_1 = __importDefault(require("./cls")); exports.x = new cls_1.default(); -var cls_2 = require("./cls"); +const cls_2 = require("./cls"); - Object.defineProperty(exports, "Foob", { enumerable: true, get: function () { return cls_2.default; } }); + Object.defineProperty(exports, "Foob", { enumerable: true, get: function () { return __importDefault(cls_2).default; } }); @@= skipped -10, +10 lines =@@ diff --git a/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.errors.txt b/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.errors.txt deleted file mode 100644 index 8f9eea6533..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.errors.txt +++ /dev/null @@ -1,54 +0,0 @@ -error TS5055: Cannot write file 'a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -b.ts(3,29): error TS2339: Property 'a' does not exist on type '{}'. -b.ts(4,14): error TS2339: Property 'a' does not exist on type '{}'. -b.ts(5,8): error TS2339: Property 'a' does not exist on type '{}'. -b.ts(6,10): error TS2339: Property 'a' does not exist on type '{}'. - - -!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.js (0 errors) ==== - var variable = {}; - variable.a = 0; - - class C { - initializedMember = {}; - constructor() { - this.member = {}; - this.member.a = 0; - } - } - - var obj = { - property: {} - }; - - obj.property.a = 0; - - var arr = [{}]; - - function getObj() { - return {}; - } - - -==== b.ts (4 errors) ==== - variable.a = 1; - (new C()).member.a = 1; - (new C()).initializedMember.a = 1; - ~ -!!! error TS2339: Property 'a' does not exist on type '{}'. - obj.property.a = 1; - ~ -!!! error TS2339: Property 'a' does not exist on type '{}'. - arr[0].a = 1; - ~ -!!! error TS2339: Property 'a' does not exist on type '{}'. - getObj().a = 1; - ~ -!!! error TS2339: Property 'a' does not exist on type '{}'. - - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.symbols b/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.symbols deleted file mode 100644 index 34310dd248..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.symbols +++ /dev/null @@ -1,85 +0,0 @@ -//// [tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts] //// - -=== a.js === -var variable = {}; ->variable : Symbol(variable, Decl(a.js, 0, 3)) - -variable.a = 0; ->variable.a : Symbol(a, Decl(a.js, 0, 18)) ->variable : Symbol(variable, Decl(a.js, 0, 3)) ->a : Symbol(a, Decl(a.js, 0, 18)) - -class C { ->C : Symbol(C, Decl(a.js, 1, 15)) - - initializedMember = {}; ->initializedMember : Symbol(C.initializedMember, Decl(a.js, 3, 9)) - - constructor() { - this.member = {}; ->this.member : Symbol(C.member, Decl(a.js, 5, 19)) ->this : Symbol(C, Decl(a.js, 1, 15)) ->member : Symbol(C.member, Decl(a.js, 5, 19)) - - this.member.a = 0; ->this.member.a : Symbol(a, Decl(a.js, 6, 25)) ->this.member : Symbol(C.member, Decl(a.js, 5, 19)) ->this : Symbol(C, Decl(a.js, 1, 15)) ->member : Symbol(C.member, Decl(a.js, 5, 19)) ->a : Symbol(a, Decl(a.js, 6, 25)) - } -} - -var obj = { ->obj : Symbol(obj, Decl(a.js, 11, 3)) - - property: {} ->property : Symbol(property, Decl(a.js, 11, 11)) - -}; - -obj.property.a = 0; ->obj.property : Symbol(property, Decl(a.js, 11, 11)) ->obj : Symbol(obj, Decl(a.js, 11, 3)) ->property : Symbol(property, Decl(a.js, 11, 11)) - -var arr = [{}]; ->arr : Symbol(arr, Decl(a.js, 17, 3)) - -function getObj() { ->getObj : Symbol(getObj, Decl(a.js, 17, 15)) - - return {}; -} - - -=== b.ts === -variable.a = 1; ->variable.a : Symbol(a, Decl(a.js, 0, 18)) ->variable : Symbol(variable, Decl(a.js, 0, 3)) ->a : Symbol(a, Decl(a.js, 0, 18)) - -(new C()).member.a = 1; ->(new C()).member.a : Symbol(a, Decl(a.js, 6, 25)) ->(new C()).member : Symbol(C.member, Decl(a.js, 5, 19)) ->C : Symbol(C, Decl(a.js, 1, 15)) ->member : Symbol(C.member, Decl(a.js, 5, 19)) ->a : Symbol(a, Decl(a.js, 6, 25)) - -(new C()).initializedMember.a = 1; ->(new C()).initializedMember : Symbol(C.initializedMember, Decl(a.js, 3, 9)) ->C : Symbol(C, Decl(a.js, 1, 15)) ->initializedMember : Symbol(C.initializedMember, Decl(a.js, 3, 9)) - -obj.property.a = 1; ->obj.property : Symbol(property, Decl(a.js, 11, 11)) ->obj : Symbol(obj, Decl(a.js, 11, 3)) ->property : Symbol(property, Decl(a.js, 11, 11)) - -arr[0].a = 1; ->arr : Symbol(arr, Decl(a.js, 17, 3)) - -getObj().a = 1; ->getObj : Symbol(getObj, Decl(a.js, 17, 15)) - - diff --git a/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.symbols.diff deleted file mode 100644 index 632c7694d0..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.symbols.diff +++ /dev/null @@ -1,75 +0,0 @@ ---- old.jsObjectsMarkedAsOpenEnded.symbols -+++ new.jsObjectsMarkedAsOpenEnded.symbols -@@= skipped -1, +1 lines =@@ - - === a.js === - var variable = {}; -->variable : Symbol(variable, Decl(a.js, 0, 3), Decl(a.js, 0, 18)) -+>variable : Symbol(variable, Decl(a.js, 0, 3)) - - variable.a = 0; -->variable.a : Symbol(variable.a, Decl(a.js, 0, 18)) -->variable : Symbol(variable, Decl(a.js, 0, 3), Decl(a.js, 0, 18)) -->a : Symbol(variable.a, Decl(a.js, 0, 18)) -+>variable.a : Symbol(a, Decl(a.js, 0, 18)) -+>variable : Symbol(variable, Decl(a.js, 0, 3)) -+>a : Symbol(a, Decl(a.js, 0, 18)) - - class C { - >C : Symbol(C, Decl(a.js, 1, 15)) -@@= skipped -20, +20 lines =@@ - >member : Symbol(C.member, Decl(a.js, 5, 19)) - - this.member.a = 0; -+>this.member.a : Symbol(a, Decl(a.js, 6, 25)) - >this.member : Symbol(C.member, Decl(a.js, 5, 19)) - >this : Symbol(C, Decl(a.js, 1, 15)) - >member : Symbol(C.member, Decl(a.js, 5, 19)) -+>a : Symbol(a, Decl(a.js, 6, 25)) - } - } - - var obj = { -->obj : Symbol(obj, Decl(a.js, 11, 3), Decl(a.js, 13, 2)) -+>obj : Symbol(obj, Decl(a.js, 11, 3)) - - property: {} - >property : Symbol(property, Decl(a.js, 11, 11)) -@@= skipped -16, +18 lines =@@ - - obj.property.a = 0; - >obj.property : Symbol(property, Decl(a.js, 11, 11)) -->obj : Symbol(obj, Decl(a.js, 11, 3), Decl(a.js, 13, 2)) -+>obj : Symbol(obj, Decl(a.js, 11, 3)) - >property : Symbol(property, Decl(a.js, 11, 11)) - - var arr = [{}]; -@@= skipped -15, +15 lines =@@ - - === b.ts === - variable.a = 1; -->variable.a : Symbol(variable.a, Decl(a.js, 0, 18)) -->variable : Symbol(variable, Decl(a.js, 0, 3), Decl(a.js, 0, 18)) -->a : Symbol(variable.a, Decl(a.js, 0, 18)) -+>variable.a : Symbol(a, Decl(a.js, 0, 18)) -+>variable : Symbol(variable, Decl(a.js, 0, 3)) -+>a : Symbol(a, Decl(a.js, 0, 18)) - - (new C()).member.a = 1; -+>(new C()).member.a : Symbol(a, Decl(a.js, 6, 25)) - >(new C()).member : Symbol(C.member, Decl(a.js, 5, 19)) - >C : Symbol(C, Decl(a.js, 1, 15)) - >member : Symbol(C.member, Decl(a.js, 5, 19)) -+>a : Symbol(a, Decl(a.js, 6, 25)) - - (new C()).initializedMember.a = 1; - >(new C()).initializedMember : Symbol(C.initializedMember, Decl(a.js, 3, 9)) -@@= skipped -16, +18 lines =@@ - - obj.property.a = 1; - >obj.property : Symbol(property, Decl(a.js, 11, 11)) -->obj : Symbol(obj, Decl(a.js, 11, 3), Decl(a.js, 13, 2)) -+>obj : Symbol(obj, Decl(a.js, 11, 3)) - >property : Symbol(property, Decl(a.js, 11, 11)) - - arr[0].a = 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.types b/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.types deleted file mode 100644 index 428cdef6f3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsObjectsMarkedAsOpenEnded.types +++ /dev/null @@ -1,129 +0,0 @@ -//// [tests/cases/conformance/salsa/jsObjectsMarkedAsOpenEnded.ts] //// - -=== a.js === -var variable = {}; ->variable : { a: number; } ->{} : { a: number; } - -variable.a = 0; ->variable.a = 0 : 0 ->variable.a : number ->variable : { a: number; } ->a : number ->0 : 0 - -class C { ->C : C - - initializedMember = {}; ->initializedMember : {} ->{} : {} - - constructor() { - this.member = {}; ->this.member = {} : { a: number; } ->this.member : any ->this : this ->member : any ->{} : { a: number; } - - this.member.a = 0; ->this.member.a = 0 : 0 ->this.member.a : number ->this.member : { a: number; } ->this : this ->member : { a: number; } ->a : number ->0 : 0 - } -} - -var obj = { ->obj : { property: {}; } ->{ property: {}} : { property: {}; } - - property: {} ->property : {} ->{} : {} - -}; - -obj.property.a = 0; ->obj.property.a = 0 : 0 ->obj.property.a : any ->obj.property : {} ->obj : { property: {}; } ->property : {} ->a : any ->0 : 0 - -var arr = [{}]; ->arr : {}[] ->[{}] : {}[] ->{} : {} - -function getObj() { ->getObj : () => {} - - return {}; ->{} : {} -} - - -=== b.ts === -variable.a = 1; ->variable.a = 1 : 1 ->variable.a : number ->variable : { a: number; } ->a : number ->1 : 1 - -(new C()).member.a = 1; ->(new C()).member.a = 1 : 1 ->(new C()).member.a : number ->(new C()).member : { a: number; } ->(new C()) : C ->new C() : C ->C : typeof C ->member : { a: number; } ->a : number ->1 : 1 - -(new C()).initializedMember.a = 1; ->(new C()).initializedMember.a = 1 : 1 ->(new C()).initializedMember.a : any ->(new C()).initializedMember : {} ->(new C()) : C ->new C() : C ->C : typeof C ->initializedMember : {} ->a : any ->1 : 1 - -obj.property.a = 1; ->obj.property.a = 1 : 1 ->obj.property.a : any ->obj.property : {} ->obj : { property: {}; } ->property : {} ->a : any ->1 : 1 - -arr[0].a = 1; ->arr[0].a = 1 : 1 ->arr[0].a : any ->arr[0] : {} ->arr : {}[] ->0 : 0 ->a : any ->1 : 1 - -getObj().a = 1; ->getObj().a = 1 : 1 ->getObj().a : any ->getObj() : {} ->getObj : () => {} ->a : any ->1 : 1 - - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.errors.txt b/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.errors.txt deleted file mode 100644 index 6dde425f17..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.errors.txt +++ /dev/null @@ -1,47 +0,0 @@ -error TS5055: Cannot write file 'jsdocAccessibilityTagDeclarations.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'jsdocAccessibilityTagDeclarations.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== jsdocAccessibilityTagDeclarations.js (0 errors) ==== - class Protected { - /** @protected */ - constructor(c) { - /** @protected */ - this.c = c - } - /** @protected */ - m() { - return this.c - } - /** @protected */ - get p() { return this.c } - /** @protected */ - set p(value) { this.c = value } - } - - class Private { - /** @private */ - constructor(c) { - /** @private */ - this.c = c - } - /** @private */ - m() { - return this.c - } - /** @private */ - get p() { return this.c } - /** @private */ - set p(value) { this.c = value } - } - - // https://github.com/microsoft/TypeScript/issues/38401 - class C { - constructor(/** @public */ x, /** @protected */ y, /** @private */ z) { - } - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.symbols b/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.symbols deleted file mode 100644 index 95faf3741d..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.symbols +++ /dev/null @@ -1,94 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts] //// - -=== jsdocAccessibilityTagDeclarations.js === -class Protected { ->Protected : Symbol(Protected, Decl(jsdocAccessibilityTagDeclarations.js, 0, 0)) - - /** @protected */ - constructor(c) { ->c : Symbol(c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 16)) - - /** @protected */ - this.c = c ->this.c : Symbol(Protected.c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 20), Decl(jsdocAccessibilityTagDeclarations.js, 13, 18)) ->this : Symbol(Protected, Decl(jsdocAccessibilityTagDeclarations.js, 0, 0)) ->c : Symbol(Protected.c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 20), Decl(jsdocAccessibilityTagDeclarations.js, 13, 18)) ->c : Symbol(c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 16)) - } - /** @protected */ - m() { ->m : Symbol(Protected.m, Decl(jsdocAccessibilityTagDeclarations.js, 5, 5)) - - return this.c ->this.c : Symbol(Protected.c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 20), Decl(jsdocAccessibilityTagDeclarations.js, 13, 18)) ->this : Symbol(Protected, Decl(jsdocAccessibilityTagDeclarations.js, 0, 0)) ->c : Symbol(Protected.c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 20), Decl(jsdocAccessibilityTagDeclarations.js, 13, 18)) - } - /** @protected */ - get p() { return this.c } ->p : Symbol(Protected.p, Decl(jsdocAccessibilityTagDeclarations.js, 9, 5), Decl(jsdocAccessibilityTagDeclarations.js, 11, 29)) ->this.c : Symbol(Protected.c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 20), Decl(jsdocAccessibilityTagDeclarations.js, 13, 18)) ->this : Symbol(Protected, Decl(jsdocAccessibilityTagDeclarations.js, 0, 0)) ->c : Symbol(Protected.c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 20), Decl(jsdocAccessibilityTagDeclarations.js, 13, 18)) - - /** @protected */ - set p(value) { this.c = value } ->p : Symbol(Protected.p, Decl(jsdocAccessibilityTagDeclarations.js, 9, 5), Decl(jsdocAccessibilityTagDeclarations.js, 11, 29)) ->value : Symbol(value, Decl(jsdocAccessibilityTagDeclarations.js, 13, 10)) ->this.c : Symbol(Protected.c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 20), Decl(jsdocAccessibilityTagDeclarations.js, 13, 18)) ->this : Symbol(Protected, Decl(jsdocAccessibilityTagDeclarations.js, 0, 0)) ->c : Symbol(Protected.c, Decl(jsdocAccessibilityTagDeclarations.js, 2, 20), Decl(jsdocAccessibilityTagDeclarations.js, 13, 18)) ->value : Symbol(value, Decl(jsdocAccessibilityTagDeclarations.js, 13, 10)) -} - -class Private { ->Private : Symbol(Private, Decl(jsdocAccessibilityTagDeclarations.js, 14, 1)) - - /** @private */ - constructor(c) { ->c : Symbol(c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 16)) - - /** @private */ - this.c = c ->this.c : Symbol(Private.c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 20), Decl(jsdocAccessibilityTagDeclarations.js, 29, 18)) ->this : Symbol(Private, Decl(jsdocAccessibilityTagDeclarations.js, 14, 1)) ->c : Symbol(Private.c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 20), Decl(jsdocAccessibilityTagDeclarations.js, 29, 18)) ->c : Symbol(c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 16)) - } - /** @private */ - m() { ->m : Symbol(Private.m, Decl(jsdocAccessibilityTagDeclarations.js, 21, 5)) - - return this.c ->this.c : Symbol(Private.c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 20), Decl(jsdocAccessibilityTagDeclarations.js, 29, 18)) ->this : Symbol(Private, Decl(jsdocAccessibilityTagDeclarations.js, 14, 1)) ->c : Symbol(Private.c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 20), Decl(jsdocAccessibilityTagDeclarations.js, 29, 18)) - } - /** @private */ - get p() { return this.c } ->p : Symbol(Private.p, Decl(jsdocAccessibilityTagDeclarations.js, 25, 5), Decl(jsdocAccessibilityTagDeclarations.js, 27, 29)) ->this.c : Symbol(Private.c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 20), Decl(jsdocAccessibilityTagDeclarations.js, 29, 18)) ->this : Symbol(Private, Decl(jsdocAccessibilityTagDeclarations.js, 14, 1)) ->c : Symbol(Private.c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 20), Decl(jsdocAccessibilityTagDeclarations.js, 29, 18)) - - /** @private */ - set p(value) { this.c = value } ->p : Symbol(Private.p, Decl(jsdocAccessibilityTagDeclarations.js, 25, 5), Decl(jsdocAccessibilityTagDeclarations.js, 27, 29)) ->value : Symbol(value, Decl(jsdocAccessibilityTagDeclarations.js, 29, 10)) ->this.c : Symbol(Private.c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 20), Decl(jsdocAccessibilityTagDeclarations.js, 29, 18)) ->this : Symbol(Private, Decl(jsdocAccessibilityTagDeclarations.js, 14, 1)) ->c : Symbol(Private.c, Decl(jsdocAccessibilityTagDeclarations.js, 18, 20), Decl(jsdocAccessibilityTagDeclarations.js, 29, 18)) ->value : Symbol(value, Decl(jsdocAccessibilityTagDeclarations.js, 29, 10)) -} - -// https://github.com/microsoft/TypeScript/issues/38401 -class C { ->C : Symbol(C, Decl(jsdocAccessibilityTagDeclarations.js, 30, 1)) - - constructor(/** @public */ x, /** @protected */ y, /** @private */ z) { ->x : Symbol(x, Decl(jsdocAccessibilityTagDeclarations.js, 34, 16)) ->y : Symbol(y, Decl(jsdocAccessibilityTagDeclarations.js, 34, 33)) ->z : Symbol(z, Decl(jsdocAccessibilityTagDeclarations.js, 34, 54)) - } -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.types b/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.types deleted file mode 100644 index d43f0b5de9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocAccessibilityTagsDeclarations.types +++ /dev/null @@ -1,98 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocAccessibilityTagsDeclarations.ts] //// - -=== jsdocAccessibilityTagDeclarations.js === -class Protected { ->Protected : Protected - - /** @protected */ - constructor(c) { ->c : any - - /** @protected */ - this.c = c ->this.c = c : any ->this.c : any ->this : this ->c : any ->c : any - } - /** @protected */ - m() { ->m : () => any - - return this.c ->this.c : any ->this : this ->c : any - } - /** @protected */ - get p() { return this.c } ->p : any ->this.c : any ->this : this ->c : any - - /** @protected */ - set p(value) { this.c = value } ->p : any ->value : any ->this.c = value : any ->this.c : any ->this : this ->c : any ->value : any -} - -class Private { ->Private : Private - - /** @private */ - constructor(c) { ->c : any - - /** @private */ - this.c = c ->this.c = c : any ->this.c : any ->this : this ->c : any ->c : any - } - /** @private */ - m() { ->m : () => any - - return this.c ->this.c : any ->this : this ->c : any - } - /** @private */ - get p() { return this.c } ->p : any ->this.c : any ->this : this ->c : any - - /** @private */ - set p(value) { this.c = value } ->p : any ->value : any ->this.c = value : any ->this.c : any ->this : this ->c : any ->value : any -} - -// https://github.com/microsoft/TypeScript/issues/38401 -class C { ->C : C - - constructor(/** @public */ x, /** @protected */ y, /** @private */ z) { ->x : any ->y : any ->z : any - } -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocLiteral.errors.txt b/testdata/baselines/reference/submodule/conformance/jsdocLiteral.errors.txt deleted file mode 100644 index 59775da771..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocLiteral.errors.txt +++ /dev/null @@ -1,20 +0,0 @@ -error TS5055: Cannot write file 'in.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'in.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== in.js (0 errors) ==== - /** - * @param {'literal'} p1 - * @param {"literal"} p2 - * @param {'literal' | 'other'} p3 - * @param {'literal' | number} p4 - * @param {12 | true | 'str'} p5 - */ - function f(p1, p2, p3, p4, p5) { - return p1 + p2 + p3 + p4 + p5 + '.'; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsdocLiteral.symbols b/testdata/baselines/reference/submodule/conformance/jsdocLiteral.symbols deleted file mode 100644 index 0a194a6604..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocLiteral.symbols +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocLiteral.ts] //// - -=== in.js === -/** - * @param {'literal'} p1 - * @param {"literal"} p2 - * @param {'literal' | 'other'} p3 - * @param {'literal' | number} p4 - * @param {12 | true | 'str'} p5 - */ -function f(p1, p2, p3, p4, p5) { ->f : Symbol(f, Decl(in.js, 0, 0)) ->p1 : Symbol(p1, Decl(in.js, 7, 11)) ->p2 : Symbol(p2, Decl(in.js, 7, 14)) ->p3 : Symbol(p3, Decl(in.js, 7, 18)) ->p4 : Symbol(p4, Decl(in.js, 7, 22)) ->p5 : Symbol(p5, Decl(in.js, 7, 26)) - - return p1 + p2 + p3 + p4 + p5 + '.'; ->p1 : Symbol(p1, Decl(in.js, 7, 11)) ->p2 : Symbol(p2, Decl(in.js, 7, 14)) ->p3 : Symbol(p3, Decl(in.js, 7, 18)) ->p4 : Symbol(p4, Decl(in.js, 7, 22)) ->p5 : Symbol(p5, Decl(in.js, 7, 26)) -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocLiteral.types b/testdata/baselines/reference/submodule/conformance/jsdocLiteral.types deleted file mode 100644 index 9420cd1887..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocLiteral.types +++ /dev/null @@ -1,32 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocLiteral.ts] //// - -=== in.js === -/** - * @param {'literal'} p1 - * @param {"literal"} p2 - * @param {'literal' | 'other'} p3 - * @param {'literal' | number} p4 - * @param {12 | true | 'str'} p5 - */ -function f(p1, p2, p3, p4, p5) { ->f : (p1: "literal", p2: "literal", p3: "literal" | "other", p4: number | "literal", p5: "str" | 12 | true) => string ->p1 : "literal" ->p2 : "literal" ->p3 : "literal" | "other" ->p4 : number | "literal" ->p5 : "str" | 12 | true - - return p1 + p2 + p3 + p4 + p5 + '.'; ->p1 + p2 + p3 + p4 + p5 + '.' : string ->p1 + p2 + p3 + p4 + p5 : string ->p1 + p2 + p3 + p4 : string ->p1 + p2 + p3 : string ->p1 + p2 : string ->p1 : "literal" ->p2 : "literal" ->p3 : "literal" | "other" ->p4 : number | "literal" ->p5 : "str" | 12 | true ->'.' : "." -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.errors.txt b/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.errors.txt deleted file mode 100644 index ad56cb1b82..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -error TS5055: Cannot write file 'in.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'in.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== in.js (0 errors) ==== - /** - * @param {never} p1 - * @param {undefined} p2 - * @param {null} p3 - * @returns {void} nothing - */ - function f(p1, p2, p3) { - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.symbols b/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.symbols deleted file mode 100644 index 727f0ee5a8..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.symbols +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocNeverUndefinedNull.ts] //// - -=== in.js === -/** - * @param {never} p1 - * @param {undefined} p2 - * @param {null} p3 - * @returns {void} nothing - */ -function f(p1, p2, p3) { ->f : Symbol(f, Decl(in.js, 0, 0)) ->p1 : Symbol(p1, Decl(in.js, 6, 11)) ->p2 : Symbol(p2, Decl(in.js, 6, 14)) ->p3 : Symbol(p3, Decl(in.js, 6, 18)) -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.types b/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.types deleted file mode 100644 index 2a8baa91ff..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocNeverUndefinedNull.types +++ /dev/null @@ -1,16 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocNeverUndefinedNull.ts] //// - -=== in.js === -/** - * @param {never} p1 - * @param {undefined} p2 - * @param {null} p3 - * @returns {void} nothing - */ -function f(p1, p2, p3) { ->f : (p1: never, p2: undefined, p3: null) => void ->p1 : never ->p2 : undefined ->p3 : null -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.errors.txt b/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.errors.txt deleted file mode 100644 index 92151c27cc..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.errors.txt +++ /dev/null @@ -1,34 +0,0 @@ -error TS5055: Cannot write file 'jsdocReadonlyDeclarations.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'jsdocReadonlyDeclarations.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== jsdocReadonlyDeclarations.js (0 errors) ==== - class C { - /** @readonly */ - x = 6 - /** @readonly */ - constructor(n) { - this.x = n - /** - * @readonly - * @type {number} - */ - this.y = n - } - } - new C().x - - function F() { - /** @readonly */ - this.z = 1 - } - - // https://github.com/microsoft/TypeScript/issues/38401 - class D { - constructor(/** @readonly */ x) {} - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.symbols b/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.symbols deleted file mode 100644 index 076824d27e..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.symbols +++ /dev/null @@ -1,51 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts] //// - -=== jsdocReadonlyDeclarations.js === -class C { ->C : Symbol(C, Decl(jsdocReadonlyDeclarations.js, 0, 0)) - - /** @readonly */ - x = 6 ->x : Symbol(C.x, Decl(jsdocReadonlyDeclarations.js, 0, 9)) - - /** @readonly */ - constructor(n) { ->n : Symbol(n, Decl(jsdocReadonlyDeclarations.js, 4, 16)) - - this.x = n ->this.x : Symbol(C.x, Decl(jsdocReadonlyDeclarations.js, 0, 9)) ->this : Symbol(C, Decl(jsdocReadonlyDeclarations.js, 0, 0)) ->x : Symbol(C.x, Decl(jsdocReadonlyDeclarations.js, 0, 9)) ->n : Symbol(n, Decl(jsdocReadonlyDeclarations.js, 4, 16)) - - /** - * @readonly - * @type {number} - */ - this.y = n ->this.y : Symbol(C.y, Decl(jsdocReadonlyDeclarations.js, 5, 18)) ->this : Symbol(C, Decl(jsdocReadonlyDeclarations.js, 0, 0)) ->y : Symbol(C.y, Decl(jsdocReadonlyDeclarations.js, 5, 18)) ->n : Symbol(n, Decl(jsdocReadonlyDeclarations.js, 4, 16)) - } -} -new C().x ->new C().x : Symbol(C.x, Decl(jsdocReadonlyDeclarations.js, 0, 9)) ->C : Symbol(C, Decl(jsdocReadonlyDeclarations.js, 0, 0)) ->x : Symbol(C.x, Decl(jsdocReadonlyDeclarations.js, 0, 9)) - -function F() { ->F : Symbol(F, Decl(jsdocReadonlyDeclarations.js, 13, 9)) - - /** @readonly */ - this.z = 1 -} - -// https://github.com/microsoft/TypeScript/issues/38401 -class D { ->D : Symbol(D, Decl(jsdocReadonlyDeclarations.js, 18, 1)) - - constructor(/** @readonly */ x) {} ->x : Symbol(x, Decl(jsdocReadonlyDeclarations.js, 22, 16)) -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.symbols.diff b/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.symbols.diff deleted file mode 100644 index f3e205fd69..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.symbols.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.jsdocReadonlyDeclarations.symbols -+++ new.jsdocReadonlyDeclarations.symbols -@@= skipped -38, +38 lines =@@ - - /** @readonly */ - this.z = 1 -->this.z : Symbol(F.z, Decl(jsdocReadonlyDeclarations.js, 15, 14)) -->this : Symbol(F, Decl(jsdocReadonlyDeclarations.js, 13, 9)) -->z : Symbol(F.z, Decl(jsdocReadonlyDeclarations.js, 15, 14)) - } - - // https://github.com/microsoft/TypeScript/issues/38401 \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.types b/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.types deleted file mode 100644 index 1fd313cd37..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocReadonlyDeclarations.types +++ /dev/null @@ -1,60 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocReadonlyDeclarations.ts] //// - -=== jsdocReadonlyDeclarations.js === -class C { ->C : C - - /** @readonly */ - x = 6 ->x : 6 ->6 : 6 - - /** @readonly */ - constructor(n) { ->n : any - - this.x = n ->this.x = n : any ->this.x : 6 ->this : this ->x : 6 ->n : any - - /** - * @readonly - * @type {number} - */ - this.y = n ->this.y = n : any ->this.y : number ->this : this ->y : number ->n : any - } -} -new C().x ->new C().x : 6 ->new C() : C ->C : typeof C ->x : 6 - -function F() { ->F : () => void - - /** @readonly */ - this.z = 1 ->this.z = 1 : 1 ->this.z : any ->this : any ->z : any ->1 : 1 -} - -// https://github.com/microsoft/TypeScript/issues/38401 -class D { ->D : D - - constructor(/** @readonly */ x) {} ->x : any -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.errors.txt b/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.errors.txt deleted file mode 100644 index d36700919c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -error TS5055: Cannot write file 'returns.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== returns.js (0 errors) ==== - /** - * @returns {string} This comment is not currently exposed - */ - function f() { - return 5; - } - - /** - * @returns {string=} This comment is not currently exposed - */ - function f1() { - return 5; - } - - /** - * @returns {string|number} This comment is not currently exposed - */ - function f2() { - return 5 || "hello"; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.symbols b/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.symbols deleted file mode 100644 index 9dd7020ad6..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.symbols +++ /dev/null @@ -1,30 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocReturnTag1.ts] //// - -=== returns.js === -/** - * @returns {string} This comment is not currently exposed - */ -function f() { ->f : Symbol(f, Decl(returns.js, 0, 0)) - - return 5; -} - -/** - * @returns {string=} This comment is not currently exposed - */ -function f1() { ->f1 : Symbol(f1, Decl(returns.js, 5, 1)) - - return 5; -} - -/** - * @returns {string|number} This comment is not currently exposed - */ -function f2() { ->f2 : Symbol(f2, Decl(returns.js, 12, 1)) - - return 5 || "hello"; -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.types b/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.types deleted file mode 100644 index e6c327cbb4..0000000000 --- a/testdata/baselines/reference/submodule/conformance/jsdocReturnTag1.types +++ /dev/null @@ -1,35 +0,0 @@ -//// [tests/cases/conformance/jsdoc/jsdocReturnTag1.ts] //// - -=== returns.js === -/** - * @returns {string} This comment is not currently exposed - */ -function f() { ->f : () => string - - return 5; ->5 : 5 -} - -/** - * @returns {string=} This comment is not currently exposed - */ -function f1() { ->f1 : () => string - - return 5; ->5 : 5 -} - -/** - * @returns {string|number} This comment is not currently exposed - */ -function f2() { ->f2 : () => string | number - - return 5 || "hello"; ->5 || "hello" : "hello" | 5 ->5 : 5 ->"hello" : "hello" -} - diff --git a/testdata/baselines/reference/submodule/conformance/jsdocThisType.types b/testdata/baselines/reference/submodule/conformance/jsdocThisType.types index ae97d83b72..c1972827c9 100644 --- a/testdata/baselines/reference/submodule/conformance/jsdocThisType.types +++ b/testdata/baselines/reference/submodule/conformance/jsdocThisType.types @@ -25,7 +25,7 @@ export const f1 = function() { /** @type {import('./types').M} */ export function f2() { ->f2 : (this: import("/types").Foo) => void +>f2 : () => void this.test(); >this.test() : any @@ -48,7 +48,7 @@ export const f3 = function() { /** @type {(this: import('./types').Foo) => void} */ export function f4() { ->f4 : (this: import("/types").Foo) => void +>f4 : () => void this.test(); >this.test() : any diff --git a/testdata/baselines/reference/submodule/conformance/jsdocTypeTagRequiredParameters.errors.txt b/testdata/baselines/reference/submodule/conformance/jsdocTypeTagRequiredParameters.errors.txt index 22e99daab8..39e940dd64 100644 --- a/testdata/baselines/reference/submodule/conformance/jsdocTypeTagRequiredParameters.errors.txt +++ b/testdata/baselines/reference/submodule/conformance/jsdocTypeTagRequiredParameters.errors.txt @@ -27,9 +27,9 @@ a.js(13,1): error TS2554: Expected 1 arguments, but got 0. g() // should error ~ !!! error TS2554: Expected 1 arguments, but got 0. -!!! related TS6210 a.js:4:13: An argument for 's' was not provided. +!!! related TS6210 a.js:5:12: An argument for 's' was not provided. h() ~ !!! error TS2554: Expected 1 arguments, but got 0. -!!! related TS6210 a.js:7:14: An argument for 's' was not provided. +!!! related TS6210 a.js:8:12: An argument for 's' was not provided. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/jsxCheckJsxNoTypeArgumentsAllowed.js b/testdata/baselines/reference/submodule/conformance/jsxCheckJsxNoTypeArgumentsAllowed.js index 36e2017dcd..0d710ca0b3 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxCheckJsxNoTypeArgumentsAllowed.js +++ b/testdata/baselines/reference/submodule/conformance/jsxCheckJsxNoTypeArgumentsAllowed.js @@ -20,8 +20,41 @@ let x = a={10} b="hi" />; // error, no type arguments in js //// [file.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); const component_1 = require("./component"); -const React = require("react"); +const React = __importStar(require("react")); let x = (, a={10} b="hi" />; // error, no type arguments in js ); diff --git a/testdata/baselines/reference/submodule/conformance/jsxCheckJsxNoTypeArgumentsAllowed.js.diff b/testdata/baselines/reference/submodule/conformance/jsxCheckJsxNoTypeArgumentsAllowed.js.diff index 3b0ae50253..a6d9f0a9b2 100644 --- a/testdata/baselines/reference/submodule/conformance/jsxCheckJsxNoTypeArgumentsAllowed.js.diff +++ b/testdata/baselines/reference/submodule/conformance/jsxCheckJsxNoTypeArgumentsAllowed.js.diff @@ -1,14 +1,14 @@ --- old.jsxCheckJsxNoTypeArgumentsAllowed.js +++ new.jsxCheckJsxNoTypeArgumentsAllowed.js -@@= skipped -20, +20 lines =@@ - //// [file.jsx] - "use strict"; +@@= skipped -53, +53 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); -var component_1 = require("./component"); --var React = require("react"); +-var React = __importStar(require("react")); -let x = , a={10} b="hi" />; // error, no type arguments in js -; +const component_1 = require("./component"); -+const React = require("react"); ++const React = __importStar(require("react")); +let x = (, a={10} b="hi" />; // error, no type arguments in js +); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.js b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.js index cab937e479..e7577e743c 100644 --- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.js +++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.js @@ -33,9 +33,42 @@ export interface Thing {} // not exported in export map, inaccessible under new //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; -const a = async () => (await Promise.resolve().then(() => require("inner"))).x(); +const a = async () => (await Promise.resolve().then(() => __importStar(require("inner")))).x(); exports.a = a; diff --git a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.js.diff b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.js.diff index c49f2d13e9..ae5d3a4f1b 100644 --- a/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.js.diff +++ b/testdata/baselines/reference/submodule/conformance/legacyNodeModulesExportsSpecifierGenerationConditions.js.diff @@ -1,9 +1,9 @@ --- old.legacyNodeModulesExportsSpecifierGenerationConditions.js +++ new.legacyNodeModulesExportsSpecifierGenerationConditions.js -@@= skipped -32, +32 lines =@@ - - //// [index.js] - "use strict"; +@@= skipped -65, +65 lines =@@ + return result; + }; + })(); -var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { - function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } - return new (P || (P = Promise))(function (resolve, reject) { @@ -15,8 +15,8 @@ -}; Object.defineProperty(exports, "__esModule", { value: true }); exports.a = void 0; --const a = () => __awaiter(void 0, void 0, void 0, function* () { return (yield Promise.resolve().then(function () { return require("inner"); })).x(); }); -+const a = async () => (await Promise.resolve().then(() => require("inner"))).x(); +-const a = () => __awaiter(void 0, void 0, void 0, function* () { return (yield Promise.resolve().then(function () { return __importStar(require("inner")); })).x(); }); ++const a = async () => (await Promise.resolve().then(() => __importStar(require("inner")))).x(); exports.a = a; + + diff --git a/testdata/baselines/reference/submodule/conformance/methodsReturningThis.errors.txt b/testdata/baselines/reference/submodule/conformance/methodsReturningThis.errors.txt deleted file mode 100644 index 491cea734e..0000000000 --- a/testdata/baselines/reference/submodule/conformance/methodsReturningThis.errors.txt +++ /dev/null @@ -1,28 +0,0 @@ -error TS5055: Cannot write file 'input.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'input.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== input.js (0 errors) ==== - function Class() - { - } - - // error: 'Class' doesn't have property 'notPresent' - Class.prototype.containsError = function () { return this.notPresent; }; - - // lots of methods that return this, which caused out-of-memory in #9527 - Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; }; - Class.prototype.m2 = function (x, y) { return this; }; - Class.prototype.m3 = function (x, y) { return this; }; - Class.prototype.m4 = function (angle) { return this; }; - Class.prototype.m5 = function (matrix) { return this; }; - Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; }; - Class.prototype.m7 = function(matrix) { return this; }; - Class.prototype.m8 = function() { return this; }; - Class.prototype.m9 = function () { return this; }; - - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/methodsReturningThis.symbols b/testdata/baselines/reference/submodule/conformance/methodsReturningThis.symbols deleted file mode 100644 index cc898b3de6..0000000000 --- a/testdata/baselines/reference/submodule/conformance/methodsReturningThis.symbols +++ /dev/null @@ -1,83 +0,0 @@ -//// [tests/cases/conformance/salsa/methodsReturningThis.ts] //// - -=== input.js === -function Class() ->Class : Symbol(Class, Decl(input.js, 0, 0)) -{ -} - -// error: 'Class' doesn't have property 'notPresent' -Class.prototype.containsError = function () { return this.notPresent; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - -// lots of methods that return this, which caused out-of-memory in #9527 -Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->a : Symbol(a, Decl(input.js, 8, 31)) ->b : Symbol(b, Decl(input.js, 8, 33)) ->c : Symbol(c, Decl(input.js, 8, 36)) ->d : Symbol(d, Decl(input.js, 8, 39)) ->tx : Symbol(tx, Decl(input.js, 8, 42)) ->ty : Symbol(ty, Decl(input.js, 8, 46)) - -Class.prototype.m2 = function (x, y) { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->x : Symbol(x, Decl(input.js, 9, 31)) ->y : Symbol(y, Decl(input.js, 9, 33)) - -Class.prototype.m3 = function (x, y) { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->x : Symbol(x, Decl(input.js, 10, 31)) ->y : Symbol(y, Decl(input.js, 10, 33)) - -Class.prototype.m4 = function (angle) { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->angle : Symbol(angle, Decl(input.js, 11, 31)) - -Class.prototype.m5 = function (matrix) { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->matrix : Symbol(matrix, Decl(input.js, 12, 31)) - -Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->x : Symbol(x, Decl(input.js, 13, 31)) ->y : Symbol(y, Decl(input.js, 13, 33)) ->pivotX : Symbol(pivotX, Decl(input.js, 13, 36)) ->pivotY : Symbol(pivotY, Decl(input.js, 13, 44)) ->scaleX : Symbol(scaleX, Decl(input.js, 13, 52)) ->scaleY : Symbol(scaleY, Decl(input.js, 13, 60)) ->rotation : Symbol(rotation, Decl(input.js, 13, 68)) ->skewX : Symbol(skewX, Decl(input.js, 13, 78)) ->skewY : Symbol(skewY, Decl(input.js, 13, 85)) - -Class.prototype.m7 = function(matrix) { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->matrix : Symbol(matrix, Decl(input.js, 14, 30)) - -Class.prototype.m8 = function() { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - -Class.prototype.m9 = function () { return this; }; ->Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->Class : Symbol(Class, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - - diff --git a/testdata/baselines/reference/submodule/conformance/methodsReturningThis.symbols.diff b/testdata/baselines/reference/submodule/conformance/methodsReturningThis.symbols.diff deleted file mode 100644 index 15ba67e4bd..0000000000 --- a/testdata/baselines/reference/submodule/conformance/methodsReturningThis.symbols.diff +++ /dev/null @@ -1,106 +0,0 @@ ---- old.methodsReturningThis.symbols -+++ new.methodsReturningThis.symbols -@@= skipped -7, +7 lines =@@ - - // error: 'Class' doesn't have property 'notPresent' - Class.prototype.containsError = function () { return this.notPresent; }; -->Class.prototype : Symbol(Class.containsError, Decl(input.js, 2, 1)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->containsError : Symbol(Class.containsError, Decl(input.js, 2, 1)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - // lots of methods that return this, which caused out-of-memory in #9527 - Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; }; -->Class.prototype : Symbol(Class.m1, Decl(input.js, 5, 72)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m1 : Symbol(Class.m1, Decl(input.js, 5, 72)) - >a : Symbol(a, Decl(input.js, 8, 31)) - >b : Symbol(b, Decl(input.js, 8, 33)) - >c : Symbol(c, Decl(input.js, 8, 36)) - >d : Symbol(d, Decl(input.js, 8, 39)) - >tx : Symbol(tx, Decl(input.js, 8, 42)) - >ty : Symbol(ty, Decl(input.js, 8, 46)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - Class.prototype.m2 = function (x, y) { return this; }; -->Class.prototype : Symbol(Class.m2, Decl(input.js, 8, 68)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m2 : Symbol(Class.m2, Decl(input.js, 8, 68)) - >x : Symbol(x, Decl(input.js, 9, 31)) - >y : Symbol(y, Decl(input.js, 9, 33)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - Class.prototype.m3 = function (x, y) { return this; }; -->Class.prototype : Symbol(Class.m3, Decl(input.js, 9, 54)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m3 : Symbol(Class.m3, Decl(input.js, 9, 54)) - >x : Symbol(x, Decl(input.js, 10, 31)) - >y : Symbol(y, Decl(input.js, 10, 33)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - Class.prototype.m4 = function (angle) { return this; }; -->Class.prototype : Symbol(Class.m4, Decl(input.js, 10, 54)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m4 : Symbol(Class.m4, Decl(input.js, 10, 54)) - >angle : Symbol(angle, Decl(input.js, 11, 31)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - Class.prototype.m5 = function (matrix) { return this; }; -->Class.prototype : Symbol(Class.m5, Decl(input.js, 11, 55)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m5 : Symbol(Class.m5, Decl(input.js, 11, 55)) - >matrix : Symbol(matrix, Decl(input.js, 12, 31)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; }; -->Class.prototype : Symbol(Class.m6, Decl(input.js, 12, 56)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m6 : Symbol(Class.m6, Decl(input.js, 12, 56)) - >x : Symbol(x, Decl(input.js, 13, 31)) - >y : Symbol(y, Decl(input.js, 13, 33)) - >pivotX : Symbol(pivotX, Decl(input.js, 13, 36)) -@@= skipped -68, +55 lines =@@ - >rotation : Symbol(rotation, Decl(input.js, 13, 68)) - >skewX : Symbol(skewX, Decl(input.js, 13, 78)) - >skewY : Symbol(skewY, Decl(input.js, 13, 85)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - Class.prototype.m7 = function(matrix) { return this; }; -->Class.prototype : Symbol(Class.m7, Decl(input.js, 13, 110)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m7 : Symbol(Class.m7, Decl(input.js, 13, 110)) - >matrix : Symbol(matrix, Decl(input.js, 14, 30)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - Class.prototype.m8 = function() { return this; }; -->Class.prototype : Symbol(Class.m8, Decl(input.js, 14, 55)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m8 : Symbol(Class.m8, Decl(input.js, 14, 55)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - - Class.prototype.m9 = function () { return this; }; -->Class.prototype : Symbol(Class.m9, Decl(input.js, 15, 49)) -+>Class.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >Class : Symbol(Class, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m9 : Symbol(Class.m9, Decl(input.js, 15, 49)) -->this : Symbol(Class, Decl(input.js, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/conformance/methodsReturningThis.types b/testdata/baselines/reference/submodule/conformance/methodsReturningThis.types deleted file mode 100644 index 7c519159c2..0000000000 --- a/testdata/baselines/reference/submodule/conformance/methodsReturningThis.types +++ /dev/null @@ -1,135 +0,0 @@ -//// [tests/cases/conformance/salsa/methodsReturningThis.ts] //// - -=== input.js === -function Class() ->Class : () => void -{ -} - -// error: 'Class' doesn't have property 'notPresent' -Class.prototype.containsError = function () { return this.notPresent; }; ->Class.prototype.containsError = function () { return this.notPresent; } : () => any ->Class.prototype.containsError : any ->Class.prototype : any ->Class : () => void ->prototype : any ->containsError : any ->function () { return this.notPresent; } : () => any ->this.notPresent : any ->this : any ->notPresent : any - -// lots of methods that return this, which caused out-of-memory in #9527 -Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; }; ->Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; } : (a: any, b: any, c: any, d: any, tx: any, ty: any) => any ->Class.prototype.m1 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m1 : any ->function (a, b, c, d, tx, ty) { return this; } : (a: any, b: any, c: any, d: any, tx: any, ty: any) => any ->a : any ->b : any ->c : any ->d : any ->tx : any ->ty : any ->this : any - -Class.prototype.m2 = function (x, y) { return this; }; ->Class.prototype.m2 = function (x, y) { return this; } : (x: any, y: any) => any ->Class.prototype.m2 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m2 : any ->function (x, y) { return this; } : (x: any, y: any) => any ->x : any ->y : any ->this : any - -Class.prototype.m3 = function (x, y) { return this; }; ->Class.prototype.m3 = function (x, y) { return this; } : (x: any, y: any) => any ->Class.prototype.m3 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m3 : any ->function (x, y) { return this; } : (x: any, y: any) => any ->x : any ->y : any ->this : any - -Class.prototype.m4 = function (angle) { return this; }; ->Class.prototype.m4 = function (angle) { return this; } : (angle: any) => any ->Class.prototype.m4 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m4 : any ->function (angle) { return this; } : (angle: any) => any ->angle : any ->this : any - -Class.prototype.m5 = function (matrix) { return this; }; ->Class.prototype.m5 = function (matrix) { return this; } : (matrix: any) => any ->Class.prototype.m5 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m5 : any ->function (matrix) { return this; } : (matrix: any) => any ->matrix : any ->this : any - -Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; }; ->Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; } : (x: any, y: any, pivotX: any, pivotY: any, scaleX: any, scaleY: any, rotation: any, skewX: any, skewY: any) => any ->Class.prototype.m6 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m6 : any ->function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; } : (x: any, y: any, pivotX: any, pivotY: any, scaleX: any, scaleY: any, rotation: any, skewX: any, skewY: any) => any ->x : any ->y : any ->pivotX : any ->pivotY : any ->scaleX : any ->scaleY : any ->rotation : any ->skewX : any ->skewY : any ->this : any - -Class.prototype.m7 = function(matrix) { return this; }; ->Class.prototype.m7 = function(matrix) { return this; } : (matrix: any) => any ->Class.prototype.m7 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m7 : any ->function(matrix) { return this; } : (matrix: any) => any ->matrix : any ->this : any - -Class.prototype.m8 = function() { return this; }; ->Class.prototype.m8 = function() { return this; } : () => any ->Class.prototype.m8 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m8 : any ->function() { return this; } : () => any ->this : any - -Class.prototype.m9 = function () { return this; }; ->Class.prototype.m9 = function () { return this; } : () => any ->Class.prototype.m9 : any ->Class.prototype : any ->Class : () => void ->prototype : any ->m9 : any ->function () { return this; } : () => any ->this : any - - diff --git a/testdata/baselines/reference/submodule/conformance/multiline.js b/testdata/baselines/reference/submodule/conformance/multiline.js index 5bec1fa437..ca522bea33 100644 --- a/testdata/baselines/reference/submodule/conformance/multiline.js +++ b/testdata/baselines/reference/submodule/conformance/multiline.js @@ -69,9 +69,42 @@ exports.texts.push(100); exports.texts.push("100"); //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.MyComponent = MyComponent; -const React = require("react"); +const React = __importStar(require("react")); function MyComponent(props) { return React.createElement("div", null); } diff --git a/testdata/baselines/reference/submodule/conformance/multiline.js.diff b/testdata/baselines/reference/submodule/conformance/multiline.js.diff index 602ecb8a61..6921fa037b 100644 --- a/testdata/baselines/reference/submodule/conformance/multiline.js.diff +++ b/testdata/baselines/reference/submodule/conformance/multiline.js.diff @@ -1,11 +1,11 @@ --- old.multiline.js +++ new.multiline.js -@@= skipped -70, +70 lines =@@ - "use strict"; +@@= skipped -103, +103 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.MyComponent = MyComponent; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); function MyComponent(props) { return React.createElement("div", null); } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/multipleDeclarations.errors.txt b/testdata/baselines/reference/submodule/conformance/multipleDeclarations.errors.txt deleted file mode 100644 index f34f1d6bf5..0000000000 --- a/testdata/baselines/reference/submodule/conformance/multipleDeclarations.errors.txt +++ /dev/null @@ -1,44 +0,0 @@ -error TS5055: Cannot write file 'input.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'input.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== input.js (0 errors) ==== - function C() { - this.m = null; - } - C.prototype.m = function() { - this.nothing(); - } - class X { - constructor() { - this.m = this.m.bind(this); - this.mistake = 'frankly, complete nonsense'; - } - m() { - } - mistake() { - } - } - let x = new X(); - X.prototype.mistake = false; - x.m(); - x.mistake; - class Y { - mistake() { - } - m() { - } - constructor() { - this.m = this.m.bind(this); - this.mistake = 'even more nonsense'; - } - } - Y.prototype.mistake = true; - let y = new Y(); - y.m(); - y.mistake(); - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/multipleDeclarations.symbols b/testdata/baselines/reference/submodule/conformance/multipleDeclarations.symbols deleted file mode 100644 index 674b28fe89..0000000000 --- a/testdata/baselines/reference/submodule/conformance/multipleDeclarations.symbols +++ /dev/null @@ -1,111 +0,0 @@ -//// [tests/cases/conformance/salsa/multipleDeclarations.ts] //// - -=== input.js === -function C() { ->C : Symbol(C, Decl(input.js, 0, 0)) - - this.m = null; -} -C.prototype.m = function() { ->C.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) ->C : Symbol(C, Decl(input.js, 0, 0)) ->prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - - this.nothing(); -} -class X { ->X : Symbol(X, Decl(input.js, 5, 1)) - - constructor() { - this.m = this.m.bind(this); ->this.m : Symbol(X.m, Decl(input.js, 10, 5)) ->this : Symbol(X, Decl(input.js, 5, 1)) ->m : Symbol(X.m, Decl(input.js, 10, 5)) ->this.m.bind : Symbol(Function.bind, Decl(lib.es5.d.ts, --, --)) ->this.m : Symbol(X.m, Decl(input.js, 10, 5)) ->this : Symbol(X, Decl(input.js, 5, 1)) ->m : Symbol(X.m, Decl(input.js, 10, 5)) ->bind : Symbol(Function.bind, Decl(lib.es5.d.ts, --, --)) ->this : Symbol(X, Decl(input.js, 5, 1)) - - this.mistake = 'frankly, complete nonsense'; ->this.mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) ->this : Symbol(X, Decl(input.js, 5, 1)) ->mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - } - m() { ->m : Symbol(X.m, Decl(input.js, 10, 5)) - } - mistake() { ->mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - } -} -let x = new X(); ->x : Symbol(x, Decl(input.js, 16, 3)) ->X : Symbol(X, Decl(input.js, 5, 1)) - -X.prototype.mistake = false; ->X.prototype.mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) ->X.prototype : Symbol(X.prototype) ->X : Symbol(X, Decl(input.js, 5, 1)) ->prototype : Symbol(X.prototype) ->mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - -x.m(); ->x.m : Symbol(X.m, Decl(input.js, 10, 5)) ->x : Symbol(x, Decl(input.js, 16, 3)) ->m : Symbol(X.m, Decl(input.js, 10, 5)) - -x.mistake; ->x.mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) ->x : Symbol(x, Decl(input.js, 16, 3)) ->mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - -class Y { ->Y : Symbol(Y, Decl(input.js, 19, 10)) - - mistake() { ->mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - } - m() { ->m : Symbol(Y.m, Decl(input.js, 22, 5)) - } - constructor() { - this.m = this.m.bind(this); ->this.m : Symbol(Y.m, Decl(input.js, 22, 5)) ->this : Symbol(Y, Decl(input.js, 19, 10)) ->m : Symbol(Y.m, Decl(input.js, 22, 5)) ->this.m.bind : Symbol(Function.bind, Decl(lib.es5.d.ts, --, --)) ->this.m : Symbol(Y.m, Decl(input.js, 22, 5)) ->this : Symbol(Y, Decl(input.js, 19, 10)) ->m : Symbol(Y.m, Decl(input.js, 22, 5)) ->bind : Symbol(Function.bind, Decl(lib.es5.d.ts, --, --)) ->this : Symbol(Y, Decl(input.js, 19, 10)) - - this.mistake = 'even more nonsense'; ->this.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) ->this : Symbol(Y, Decl(input.js, 19, 10)) ->mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - } -} -Y.prototype.mistake = true; ->Y.prototype.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) ->Y.prototype : Symbol(Y.prototype) ->Y : Symbol(Y, Decl(input.js, 19, 10)) ->prototype : Symbol(Y.prototype) ->mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - -let y = new Y(); ->y : Symbol(y, Decl(input.js, 31, 3)) ->Y : Symbol(Y, Decl(input.js, 19, 10)) - -y.m(); ->y.m : Symbol(Y.m, Decl(input.js, 22, 5)) ->y : Symbol(y, Decl(input.js, 31, 3)) ->m : Symbol(Y.m, Decl(input.js, 22, 5)) - -y.mistake(); ->y.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) ->y : Symbol(y, Decl(input.js, 31, 3)) ->mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - diff --git a/testdata/baselines/reference/submodule/conformance/multipleDeclarations.symbols.diff b/testdata/baselines/reference/submodule/conformance/multipleDeclarations.symbols.diff deleted file mode 100644 index d2ac2c44d9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/multipleDeclarations.symbols.diff +++ /dev/null @@ -1,116 +0,0 @@ ---- old.multipleDeclarations.symbols -+++ new.multipleDeclarations.symbols -@@= skipped -4, +4 lines =@@ - >C : Symbol(C, Decl(input.js, 0, 0)) - - this.m = null; -->this.m : Symbol(C.m, Decl(input.js, 0, 14)) -->this : Symbol(C, Decl(input.js, 0, 0)) -->m : Symbol(C.m, Decl(input.js, 0, 14)) - } - C.prototype.m = function() { -->C.prototype : Symbol(C.m, Decl(input.js, 2, 1)) -+>C.prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) - >C : Symbol(C, Decl(input.js, 0, 0)) - >prototype : Symbol(Function.prototype, Decl(lib.es5.d.ts, --, --)) -->m : Symbol(C.m, Decl(input.js, 2, 1)) - - this.nothing(); -->this : Symbol(C, Decl(input.js, 0, 0)) - } - class X { - >X : Symbol(X, Decl(input.js, 5, 1)) -@@= skipped -20, +15 lines =@@ - this.m = this.m.bind(this); - >this.m : Symbol(X.m, Decl(input.js, 10, 5)) - >this : Symbol(X, Decl(input.js, 5, 1)) -->m : Symbol(X.m, Decl(input.js, 7, 19)) -+>m : Symbol(X.m, Decl(input.js, 10, 5)) - >this.m.bind : Symbol(Function.bind, Decl(lib.es5.d.ts, --, --)) - >this.m : Symbol(X.m, Decl(input.js, 10, 5)) - >this : Symbol(X, Decl(input.js, 5, 1)) -@@= skipped -9, +9 lines =@@ - >this : Symbol(X, Decl(input.js, 5, 1)) - - this.mistake = 'frankly, complete nonsense'; -->this.mistake : Symbol(X.mistake, Decl(input.js, 12, 5), Decl(input.js, 16, 16)) -+>this.mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - >this : Symbol(X, Decl(input.js, 5, 1)) -->mistake : Symbol(X.mistake, Decl(input.js, 8, 35)) -+>mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - } - m() { - >m : Symbol(X.m, Decl(input.js, 10, 5)) - } - mistake() { -->mistake : Symbol(X.mistake, Decl(input.js, 12, 5), Decl(input.js, 16, 16)) -+>mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - } - } - let x = new X(); -@@= skipped -16, +16 lines =@@ - >X : Symbol(X, Decl(input.js, 5, 1)) - - X.prototype.mistake = false; -->X.prototype.mistake : Symbol(X.mistake, Decl(input.js, 12, 5), Decl(input.js, 16, 16)) -->X.prototype : Symbol(X.mistake, Decl(input.js, 12, 5), Decl(input.js, 16, 16)) -+>X.prototype.mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) -+>X.prototype : Symbol(X.prototype) - >X : Symbol(X, Decl(input.js, 5, 1)) - >prototype : Symbol(X.prototype) -->mistake : Symbol(X.mistake, Decl(input.js, 12, 5), Decl(input.js, 16, 16)) -+>mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - - x.m(); - >x.m : Symbol(X.m, Decl(input.js, 10, 5)) -@@= skipped -12, +12 lines =@@ - >m : Symbol(X.m, Decl(input.js, 10, 5)) - - x.mistake; -->x.mistake : Symbol(X.mistake, Decl(input.js, 12, 5), Decl(input.js, 16, 16)) -+>x.mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - >x : Symbol(x, Decl(input.js, 16, 3)) -->mistake : Symbol(X.mistake, Decl(input.js, 12, 5), Decl(input.js, 16, 16)) -+>mistake : Symbol(X.mistake, Decl(input.js, 12, 5)) - - class Y { - >Y : Symbol(Y, Decl(input.js, 19, 10)) - - mistake() { -->mistake : Symbol(Y.mistake, Decl(input.js, 20, 9), Decl(input.js, 29, 1)) -+>mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - } - m() { - >m : Symbol(Y.m, Decl(input.js, 22, 5)) -@@= skipped -26, +26 lines =@@ - >this : Symbol(Y, Decl(input.js, 19, 10)) - - this.mistake = 'even more nonsense'; -->this.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9), Decl(input.js, 29, 1)) -+>this.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - >this : Symbol(Y, Decl(input.js, 19, 10)) -->mistake : Symbol(Y.mistake, Decl(input.js, 20, 9), Decl(input.js, 29, 1)) -+>mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - } - } - Y.prototype.mistake = true; -->Y.prototype.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9), Decl(input.js, 29, 1)) -->Y.prototype : Symbol(Y.mistake, Decl(input.js, 20, 9), Decl(input.js, 29, 1)) -+>Y.prototype.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) -+>Y.prototype : Symbol(Y.prototype) - >Y : Symbol(Y, Decl(input.js, 19, 10)) - >prototype : Symbol(Y.prototype) -->mistake : Symbol(Y.mistake, Decl(input.js, 20, 9), Decl(input.js, 29, 1)) -+>mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - - let y = new Y(); - >y : Symbol(y, Decl(input.js, 31, 3)) -@@= skipped -22, +22 lines =@@ - >m : Symbol(Y.m, Decl(input.js, 22, 5)) - - y.mistake(); -->y.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9), Decl(input.js, 29, 1)) -+>y.mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) - >y : Symbol(y, Decl(input.js, 31, 3)) -->mistake : Symbol(Y.mistake, Decl(input.js, 20, 9), Decl(input.js, 29, 1)) -+>mistake : Symbol(Y.mistake, Decl(input.js, 20, 9)) diff --git a/testdata/baselines/reference/submodule/conformance/multipleDeclarations.types b/testdata/baselines/reference/submodule/conformance/multipleDeclarations.types deleted file mode 100644 index 5451a4dac4..0000000000 --- a/testdata/baselines/reference/submodule/conformance/multipleDeclarations.types +++ /dev/null @@ -1,140 +0,0 @@ -//// [tests/cases/conformance/salsa/multipleDeclarations.ts] //// - -=== input.js === -function C() { ->C : () => void - - this.m = null; ->this.m = null : null ->this.m : any ->this : any ->m : any -} -C.prototype.m = function() { ->C.prototype.m = function() { this.nothing();} : () => void ->C.prototype.m : any ->C.prototype : any ->C : () => void ->prototype : any ->m : any ->function() { this.nothing();} : () => void - - this.nothing(); ->this.nothing() : any ->this.nothing : any ->this : any ->nothing : any -} -class X { ->X : X - - constructor() { - this.m = this.m.bind(this); ->this.m = this.m.bind(this) : any ->this.m : () => void ->this : this ->m : () => void ->this.m.bind(this) : any ->this.m.bind : (this: Function, thisArg: any, ...argArray: any[]) => any ->this.m : () => void ->this : this ->m : () => void ->bind : (this: Function, thisArg: any, ...argArray: any[]) => any ->this : this - - this.mistake = 'frankly, complete nonsense'; ->this.mistake = 'frankly, complete nonsense' : "frankly, complete nonsense" ->this.mistake : () => void ->this : this ->mistake : () => void ->'frankly, complete nonsense' : "frankly, complete nonsense" - } - m() { ->m : () => void - } - mistake() { ->mistake : () => void - } -} -let x = new X(); ->x : X ->new X() : X ->X : typeof X - -X.prototype.mistake = false; ->X.prototype.mistake = false : false ->X.prototype.mistake : () => void ->X.prototype : X ->X : typeof X ->prototype : X ->mistake : () => void ->false : false - -x.m(); ->x.m() : void ->x.m : () => void ->x : X ->m : () => void - -x.mistake; ->x.mistake : () => void ->x : X ->mistake : () => void - -class Y { ->Y : Y - - mistake() { ->mistake : () => void - } - m() { ->m : () => void - } - constructor() { - this.m = this.m.bind(this); ->this.m = this.m.bind(this) : any ->this.m : () => void ->this : this ->m : () => void ->this.m.bind(this) : any ->this.m.bind : (this: Function, thisArg: any, ...argArray: any[]) => any ->this.m : () => void ->this : this ->m : () => void ->bind : (this: Function, thisArg: any, ...argArray: any[]) => any ->this : this - - this.mistake = 'even more nonsense'; ->this.mistake = 'even more nonsense' : "even more nonsense" ->this.mistake : () => void ->this : this ->mistake : () => void ->'even more nonsense' : "even more nonsense" - } -} -Y.prototype.mistake = true; ->Y.prototype.mistake = true : true ->Y.prototype.mistake : () => void ->Y.prototype : Y ->Y : typeof Y ->prototype : Y ->mistake : () => void ->true : true - -let y = new Y(); ->y : Y ->new Y() : Y ->Y : typeof Y - -y.m(); ->y.m() : void ->y.m : () => void ->y : Y ->m : () => void - -y.mistake(); ->y.mistake() : void ->y.mistake : () => void ->y : Y ->mistake : () => void - diff --git a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports01.js b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports01.js index 80fde4da82..f05e251cd5 100644 --- a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports01.js +++ b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports01.js @@ -30,6 +30,9 @@ var x = 10; exports.default = x; //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("./m1"); +const m1_1 = __importDefault(require("./m1")); (0, m1_1.default)(); diff --git a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports01.js.diff b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports01.js.diff index 31fdb9d2f3..d94be71d34 100644 --- a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports01.js.diff +++ b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports01.js.diff @@ -1,9 +1,9 @@ --- old.multipleDefaultExports01.js +++ new.multipleDefaultExports01.js -@@= skipped -30, +30 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -33, +33 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("./m1"); -+const m1_1 = require("./m1"); +-var m1_1 = __importDefault(require("./m1")); ++const m1_1 = __importDefault(require("./m1")); (0, m1_1.default)(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports02.js b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports02.js index 6cf30b6345..c4869009b6 100644 --- a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports02.js +++ b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports02.js @@ -25,6 +25,9 @@ function bar() { } //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("./m1"); +const m1_1 = __importDefault(require("./m1")); (0, m1_1.default)(); diff --git a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports02.js.diff b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports02.js.diff index a75658c50d..a98e3fd0b3 100644 --- a/testdata/baselines/reference/submodule/conformance/multipleDefaultExports02.js.diff +++ b/testdata/baselines/reference/submodule/conformance/multipleDefaultExports02.js.diff @@ -1,9 +1,9 @@ --- old.multipleDefaultExports02.js +++ new.multipleDefaultExports02.js -@@= skipped -25, +25 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -28, +28 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("./m1"); -+const m1_1 = require("./m1"); +-var m1_1 = __importDefault(require("./m1")); ++const m1_1 = __importDefault(require("./m1")); (0, m1_1.default)(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/namespaceMemberAccess.js b/testdata/baselines/reference/submodule/conformance/namespaceMemberAccess.js index 92c22fbc7f..86c356578a 100644 --- a/testdata/baselines/reference/submodule/conformance/namespaceMemberAccess.js +++ b/testdata/baselines/reference/submodule/conformance/namespaceMemberAccess.js @@ -17,7 +17,40 @@ class A { } //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const types = require("./a"); +const types = __importStar(require("./a")); types.A; const { A } = types; diff --git a/testdata/baselines/reference/submodule/conformance/namespaceMemberAccess.js.diff b/testdata/baselines/reference/submodule/conformance/namespaceMemberAccess.js.diff index ed530ab720..6e18419986 100644 --- a/testdata/baselines/reference/submodule/conformance/namespaceMemberAccess.js.diff +++ b/testdata/baselines/reference/submodule/conformance/namespaceMemberAccess.js.diff @@ -8,8 +8,11 @@ } //// [b.js] "use strict"; +@@= skipped -37, +38 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var types = require("./a"); -+const types = require("./a"); +-var types = __importStar(require("./a")); ++const types = __importStar(require("./a")); types.A; const { A } = types; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.errors.txt b/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.errors.txt deleted file mode 100644 index b16c7108d3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.errors.txt +++ /dev/null @@ -1,20 +0,0 @@ -/index.ts(1,10): error TS2305: Module '"pkg"' has no exported member 'pkg'. - - -==== /node_modules/pkg/package.json (0 errors) ==== - { - "name": "pkg", - "version": "1.0.0", - "exports": { - ".": "./definitely-not-index.js" - } - } - -==== /node_modules/pkg/definitely-not-index.d.ts (0 errors) ==== - export {}; - -==== /index.ts (1 errors) ==== - import { pkg } from "pkg"; - ~~~ -!!! error TS2305: Module '"pkg"' has no exported member 'pkg'. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.trace.json b/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.trace.json deleted file mode 100644 index af2c3d7476..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10AlternateResult_noResolution.trace.json +++ /dev/null @@ -1,15 +0,0 @@ -======== Resolving module 'pkg' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/package.json' does not exist. -Loading module 'pkg' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Found 'package.json' at '/node_modules/pkg/package.json'. -Using 'exports' subpath '.' with target './definitely-not-index.js'. -File name '/node_modules/pkg/definitely-not-index.js' has a '.js' extension - stripping it. -File '/node_modules/pkg/definitely-not-index.ts' does not exist. -File '/node_modules/pkg/definitely-not-index.tsx' does not exist. -File '/node_modules/pkg/definitely-not-index.d.ts' exists - use it as a name resolution result. -'package.json' does not have a 'peerDependencies' field. -Resolving real path for '/node_modules/pkg/definitely-not-index.d.ts', result '/node_modules/pkg/definitely-not-index.d.ts'. -======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID 'pkg/definitely-not-index.d.ts@1.0.0'. ======== diff --git a/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.errors.txt b/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.errors.txt deleted file mode 100644 index c576a45745..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.errors.txt +++ /dev/null @@ -1,24 +0,0 @@ -/index.ts(1,10): error TS2305: Module '"pkg"' has no exported member 'pkg'. - - -==== /node_modules/pkg/package.json (0 errors) ==== - { - "name": "pkg", - "version": "1.0.0", - "main": "./untyped.js", - "exports": { - ".": "./definitely-not-index.js" - } - } - -==== /node_modules/pkg/untyped.js (0 errors) ==== - export {}; - -==== /node_modules/pkg/definitely-not-index.d.ts (0 errors) ==== - export {}; - -==== /index.ts (1 errors) ==== - import { pkg } from "pkg"; - ~~~ -!!! error TS2305: Module '"pkg"' has no exported member 'pkg'. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.trace.json b/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.trace.json deleted file mode 100644 index af2c3d7476..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10Alternateresult_noTypes.trace.json +++ /dev/null @@ -1,15 +0,0 @@ -======== Resolving module 'pkg' from '/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/package.json' does not exist. -Loading module 'pkg' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Found 'package.json' at '/node_modules/pkg/package.json'. -Using 'exports' subpath '.' with target './definitely-not-index.js'. -File name '/node_modules/pkg/definitely-not-index.js' has a '.js' extension - stripping it. -File '/node_modules/pkg/definitely-not-index.ts' does not exist. -File '/node_modules/pkg/definitely-not-index.tsx' does not exist. -File '/node_modules/pkg/definitely-not-index.d.ts' exists - use it as a name resolution result. -'package.json' does not have a 'peerDependencies' field. -Resolving real path for '/node_modules/pkg/definitely-not-index.d.ts', result '/node_modules/pkg/definitely-not-index.d.ts'. -======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/definitely-not-index.d.ts' with Package ID 'pkg/definitely-not-index.d.ts@1.0.0'. ======== diff --git a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/node10IsNode_node.errors.txt.diff deleted file mode 100644 index 2dd569a21b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.node10IsNode_node.errors.txt -+++ new.node10IsNode_node.errors.txt -@@= skipped -0, +0 lines =@@ --error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. --==== /node_modules/fancy-lib/package.json (0 errors) ==== -- { -- "name": "fancy-lib", -- "version": "1.0.0", -- "main": "index.js", -- "exports": { -- ".": "./definitely-not-index.js" -- } -- } -- --==== /node_modules/fancy-lib/index.d.ts (0 errors) ==== -- export declare const fancy: "feast"; -- --==== /node_modules/fancy-lib/definitely-not-index.d.ts (0 errors) ==== -- export declare const fancy: "ketchup"; -- --==== /main.ts (0 errors) ==== -- import { fancy } from "fancy-lib"; -- fancy; -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.symbols b/testdata/baselines/reference/submodule/conformance/node10IsNode_node.symbols deleted file mode 100644 index 11e2b7eff6..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/node10IsNode_node.ts] //// - -=== /node_modules/fancy-lib/index.d.ts === -export declare const fancy: "feast"; ->fancy : Symbol(fancy, Decl(index.d.ts, 0, 20)) - -=== /node_modules/fancy-lib/definitely-not-index.d.ts === -export declare const fancy: "ketchup"; ->fancy : Symbol(fancy, Decl(definitely-not-index.d.ts, 0, 20)) - -=== /main.ts === -import { fancy } from "fancy-lib"; ->fancy : Symbol(fancy, Decl(main.ts, 0, 8)) - -fancy; ->fancy : Symbol(fancy, Decl(main.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.trace.json b/testdata/baselines/reference/submodule/conformance/node10IsNode_node.trace.json deleted file mode 100644 index 9b2d7aeefb..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.trace.json +++ /dev/null @@ -1,15 +0,0 @@ -======== Resolving module 'fancy-lib' from '/main.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/package.json' does not exist. -Loading module 'fancy-lib' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Found 'package.json' at '/node_modules/fancy-lib/package.json'. -Using 'exports' subpath '.' with target './definitely-not-index.js'. -File name '/node_modules/fancy-lib/definitely-not-index.js' has a '.js' extension - stripping it. -File '/node_modules/fancy-lib/definitely-not-index.ts' does not exist. -File '/node_modules/fancy-lib/definitely-not-index.tsx' does not exist. -File '/node_modules/fancy-lib/definitely-not-index.d.ts' exists - use it as a name resolution result. -'package.json' does not have a 'peerDependencies' field. -Resolving real path for '/node_modules/fancy-lib/definitely-not-index.d.ts', result '/node_modules/fancy-lib/definitely-not-index.d.ts'. -======== Module name 'fancy-lib' was successfully resolved to '/node_modules/fancy-lib/definitely-not-index.d.ts' with Package ID 'fancy-lib/definitely-not-index.d.ts@1.0.0'. ======== diff --git a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.types b/testdata/baselines/reference/submodule/conformance/node10IsNode_node.types deleted file mode 100644 index 08e43cff90..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.types +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/node10IsNode_node.ts] //// - -=== /node_modules/fancy-lib/index.d.ts === -export declare const fancy: "feast"; ->fancy : "feast" - -=== /node_modules/fancy-lib/definitely-not-index.d.ts === -export declare const fancy: "ketchup"; ->fancy : "ketchup" - -=== /main.ts === -import { fancy } from "fancy-lib"; ->fancy : "ketchup" - -fancy; ->fancy : "ketchup" - diff --git a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.types.diff b/testdata/baselines/reference/submodule/conformance/node10IsNode_node.types.diff deleted file mode 100644 index 7f9b8f4af3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/node10IsNode_node.types.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.node10IsNode_node.types -+++ new.node10IsNode_node.types -@@= skipped -9, +9 lines =@@ - - === /main.ts === - import { fancy } from "fancy-lib"; -->fancy : "feast" -+>fancy : "ketchup" - - fancy; -->fancy : "feast" -+>fancy : "ketchup" diff --git a/testdata/baselines/reference/submodule/conformance/packageJsonExportsOptionsCompat.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/packageJsonExportsOptionsCompat.errors.txt.diff deleted file mode 100644 index 9f056c81a9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/packageJsonExportsOptionsCompat.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.packageJsonExportsOptionsCompat.errors.txt -+++ new.packageJsonExportsOptionsCompat.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(4,5): error TS5098: Option 'customConditions' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --/tsconfig.json(5,5): error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --/tsconfig.json(6,5): error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. -- -- --==== /tsconfig.json (3 errors) ==== -- { -- "compilerOptions": { -- "moduleResolution": "classic", -- "customConditions": ["webpack", "browser"], -- ~~~~~~~~~~~~~~~~~~ --!!! error TS5098: Option 'customConditions' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. -- "resolvePackageJsonExports": true, -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ --!!! error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. -- "resolvePackageJsonImports": true, -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~ --!!! error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. -- "noEmit": true -- } -- } -- --==== /index.ts (0 errors) ==== -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt.diff deleted file mode 100644 index 0322ca7a34..0000000000 --- a/testdata/baselines/reference/submodule/conformance/packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt -+++ new.packageJsonImportsExportsOptionCompat(moduleresolution=classic).errors.txt -@@= skipped -0, +0 lines =@@ --error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. -- -- --!!! error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --!!! error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --==== index.ts (0 errors) ==== -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt.diff deleted file mode 100644 index 627302df32..0000000000 --- a/testdata/baselines/reference/submodule/conformance/packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt -+++ new.packageJsonImportsExportsOptionCompat(moduleresolution=node).errors.txt -@@= skipped -0, +0 lines =@@ --error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --!!! error TS5098: Option 'resolvePackageJsonExports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --!!! error TS5098: Option 'resolvePackageJsonImports' can only be used when 'moduleResolution' is set to 'node16', 'nodenext', or 'bundler'. --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. --==== index.ts (0 errors) ==== -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.errors.txt.diff index 98a406b1e1..df4f459d08 100644 --- a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.errors.txt.diff +++ b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.errors.txt.diff @@ -16,7 +16,7 @@ -!!! error TS2807: This syntax requires an imported helper named '__classPrivateFieldGet' with 4 parameters, which is not compatible with the one in 'tslib'. Consider upgrading your version of 'tslib'. - } - --==== tslib.d.ts (0 errors) ==== +-==== node_modules/tslib/index.d.ts (0 errors) ==== - // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields - export declare function __classPrivateFieldGet(receiver: T, state: any): V; - export declare function __classPrivateFieldSet(receiver: T, state: any, value: V): V; diff --git a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.js b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.js index 9dc03d8f06..5c2c0e3d46 100644 --- a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.js +++ b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.js @@ -7,7 +7,7 @@ export class C { set #c(v: number) { this.#a += v; } } -//// [tslib.d.ts] +//// [index.d.ts] // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields export declare function __classPrivateFieldGet(receiver: T, state: any): V; export declare function __classPrivateFieldSet(receiver: T, state: any, value: V): V; diff --git a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.symbols b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.symbols index e854a4e3aa..b13f751203 100644 --- a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.symbols +++ b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.symbols @@ -20,25 +20,25 @@ export class C { >v : Symbol(v, Decl(main.ts, 3, 11)) } -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields export declare function __classPrivateFieldGet(receiver: T, state: any): V; ->__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(tslib.d.ts, 0, 0)) ->T : Symbol(T, Decl(tslib.d.ts, 1, 47)) ->V : Symbol(V, Decl(tslib.d.ts, 1, 64)) ->receiver : Symbol(receiver, Decl(tslib.d.ts, 1, 68)) ->T : Symbol(T, Decl(tslib.d.ts, 1, 47)) ->state : Symbol(state, Decl(tslib.d.ts, 1, 80)) ->V : Symbol(V, Decl(tslib.d.ts, 1, 64)) +>__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(index.d.ts, 0, 0)) +>T : Symbol(T, Decl(index.d.ts, 1, 47)) +>V : Symbol(V, Decl(index.d.ts, 1, 64)) +>receiver : Symbol(receiver, Decl(index.d.ts, 1, 68)) +>T : Symbol(T, Decl(index.d.ts, 1, 47)) +>state : Symbol(state, Decl(index.d.ts, 1, 80)) +>V : Symbol(V, Decl(index.d.ts, 1, 64)) export declare function __classPrivateFieldSet(receiver: T, state: any, value: V): V; ->__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(tslib.d.ts, 1, 96)) ->T : Symbol(T, Decl(tslib.d.ts, 2, 47)) ->V : Symbol(V, Decl(tslib.d.ts, 2, 64)) ->receiver : Symbol(receiver, Decl(tslib.d.ts, 2, 68)) ->T : Symbol(T, Decl(tslib.d.ts, 2, 47)) ->state : Symbol(state, Decl(tslib.d.ts, 2, 80)) ->value : Symbol(value, Decl(tslib.d.ts, 2, 92)) ->V : Symbol(V, Decl(tslib.d.ts, 2, 64)) ->V : Symbol(V, Decl(tslib.d.ts, 2, 64)) +>__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(index.d.ts, 1, 96)) +>T : Symbol(T, Decl(index.d.ts, 2, 47)) +>V : Symbol(V, Decl(index.d.ts, 2, 64)) +>receiver : Symbol(receiver, Decl(index.d.ts, 2, 68)) +>T : Symbol(T, Decl(index.d.ts, 2, 47)) +>state : Symbol(state, Decl(index.d.ts, 2, 80)) +>value : Symbol(value, Decl(index.d.ts, 2, 92)) +>V : Symbol(V, Decl(index.d.ts, 2, 64)) +>V : Symbol(V, Decl(index.d.ts, 2, 64)) diff --git a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.symbols.diff b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.symbols.diff deleted file mode 100644 index 129bf9928b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.symbols.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- old.privateNameEmitHelpers.symbols -+++ new.privateNameEmitHelpers.symbols -@@= skipped -22, +22 lines =@@ - === tslib.d.ts === - // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields - export declare function __classPrivateFieldGet(receiver: T, state: any): V; -->__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(tslib.d.ts, --, --)) -->T : Symbol(T, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -->receiver : Symbol(receiver, Decl(tslib.d.ts, --, --)) -->T : Symbol(T, Decl(tslib.d.ts, --, --)) -->state : Symbol(state, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -+>__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(tslib.d.ts, 0, 0)) -+>T : Symbol(T, Decl(tslib.d.ts, 1, 47)) -+>V : Symbol(V, Decl(tslib.d.ts, 1, 64)) -+>receiver : Symbol(receiver, Decl(tslib.d.ts, 1, 68)) -+>T : Symbol(T, Decl(tslib.d.ts, 1, 47)) -+>state : Symbol(state, Decl(tslib.d.ts, 1, 80)) -+>V : Symbol(V, Decl(tslib.d.ts, 1, 64)) - - export declare function __classPrivateFieldSet(receiver: T, state: any, value: V): V; -->__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(tslib.d.ts, --, --)) -->T : Symbol(T, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -->receiver : Symbol(receiver, Decl(tslib.d.ts, --, --)) -->T : Symbol(T, Decl(tslib.d.ts, --, --)) -->state : Symbol(state, Decl(tslib.d.ts, --, --)) -->value : Symbol(value, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -+>__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(tslib.d.ts, 1, 96)) -+>T : Symbol(T, Decl(tslib.d.ts, 2, 47)) -+>V : Symbol(V, Decl(tslib.d.ts, 2, 64)) -+>receiver : Symbol(receiver, Decl(tslib.d.ts, 2, 68)) -+>T : Symbol(T, Decl(tslib.d.ts, 2, 47)) -+>state : Symbol(state, Decl(tslib.d.ts, 2, 80)) -+>value : Symbol(value, Decl(tslib.d.ts, 2, 92)) -+>V : Symbol(V, Decl(tslib.d.ts, 2, 64)) -+>V : Symbol(V, Decl(tslib.d.ts, 2, 64)) diff --git a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.types b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.types index 410bc6e162..0baa8e8d2d 100644 --- a/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.types +++ b/testdata/baselines/reference/submodule/conformance/privateNameEmitHelpers.types @@ -24,7 +24,7 @@ export class C { >v : number } -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields export declare function __classPrivateFieldGet(receiver: T, state: any): V; >__classPrivateFieldGet : (receiver: T, state: any) => V diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.errors.txt.diff index abbe80866c..bdb7eaecbc 100644 --- a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.errors.txt.diff +++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.errors.txt.diff @@ -16,7 +16,7 @@ -!!! error TS2807: This syntax requires an imported helper named '__classPrivateFieldGet' with 4 parameters, which is not compatible with the one in 'tslib'. Consider upgrading your version of 'tslib'. - } - --==== tslib.d.ts (0 errors) ==== +-==== node_modules/tslib/index.d.ts (0 errors) ==== - // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields - export declare function __classPrivateFieldGet(receiver: T, state: any): V; - export declare function __classPrivateFieldSet(receiver: T, state: any, value: V): V; diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.js b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.js index 4ede9aa8b5..1eaf306686 100644 --- a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.js +++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.js @@ -7,7 +7,7 @@ export class S { static get #c() { return S.#b(); } } -//// [tslib.d.ts] +//// [index.d.ts] // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields export declare function __classPrivateFieldGet(receiver: T, state: any): V; export declare function __classPrivateFieldSet(receiver: T, state: any, value: V): V; diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.symbols b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.symbols index 6ccb4740e4..681c0bd0ef 100644 --- a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.symbols +++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.symbols @@ -18,25 +18,25 @@ export class S { >S : Symbol(S, Decl(main.ts, 0, 0)) } -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields export declare function __classPrivateFieldGet(receiver: T, state: any): V; ->__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(tslib.d.ts, 0, 0)) ->T : Symbol(T, Decl(tslib.d.ts, 1, 47)) ->V : Symbol(V, Decl(tslib.d.ts, 1, 64)) ->receiver : Symbol(receiver, Decl(tslib.d.ts, 1, 68)) ->T : Symbol(T, Decl(tslib.d.ts, 1, 47)) ->state : Symbol(state, Decl(tslib.d.ts, 1, 80)) ->V : Symbol(V, Decl(tslib.d.ts, 1, 64)) +>__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(index.d.ts, 0, 0)) +>T : Symbol(T, Decl(index.d.ts, 1, 47)) +>V : Symbol(V, Decl(index.d.ts, 1, 64)) +>receiver : Symbol(receiver, Decl(index.d.ts, 1, 68)) +>T : Symbol(T, Decl(index.d.ts, 1, 47)) +>state : Symbol(state, Decl(index.d.ts, 1, 80)) +>V : Symbol(V, Decl(index.d.ts, 1, 64)) export declare function __classPrivateFieldSet(receiver: T, state: any, value: V): V; ->__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(tslib.d.ts, 1, 96)) ->T : Symbol(T, Decl(tslib.d.ts, 2, 47)) ->V : Symbol(V, Decl(tslib.d.ts, 2, 64)) ->receiver : Symbol(receiver, Decl(tslib.d.ts, 2, 68)) ->T : Symbol(T, Decl(tslib.d.ts, 2, 47)) ->state : Symbol(state, Decl(tslib.d.ts, 2, 80)) ->value : Symbol(value, Decl(tslib.d.ts, 2, 92)) ->V : Symbol(V, Decl(tslib.d.ts, 2, 64)) ->V : Symbol(V, Decl(tslib.d.ts, 2, 64)) +>__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(index.d.ts, 1, 96)) +>T : Symbol(T, Decl(index.d.ts, 2, 47)) +>V : Symbol(V, Decl(index.d.ts, 2, 64)) +>receiver : Symbol(receiver, Decl(index.d.ts, 2, 68)) +>T : Symbol(T, Decl(index.d.ts, 2, 47)) +>state : Symbol(state, Decl(index.d.ts, 2, 80)) +>value : Symbol(value, Decl(index.d.ts, 2, 92)) +>V : Symbol(V, Decl(index.d.ts, 2, 64)) +>V : Symbol(V, Decl(index.d.ts, 2, 64)) diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.symbols.diff b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.symbols.diff deleted file mode 100644 index 348d76f59f..0000000000 --- a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.symbols.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- old.privateNameStaticEmitHelpers.symbols -+++ new.privateNameStaticEmitHelpers.symbols -@@= skipped -20, +20 lines =@@ - === tslib.d.ts === - // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields - export declare function __classPrivateFieldGet(receiver: T, state: any): V; -->__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(tslib.d.ts, --, --)) -->T : Symbol(T, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -->receiver : Symbol(receiver, Decl(tslib.d.ts, --, --)) -->T : Symbol(T, Decl(tslib.d.ts, --, --)) -->state : Symbol(state, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -+>__classPrivateFieldGet : Symbol(__classPrivateFieldGet, Decl(tslib.d.ts, 0, 0)) -+>T : Symbol(T, Decl(tslib.d.ts, 1, 47)) -+>V : Symbol(V, Decl(tslib.d.ts, 1, 64)) -+>receiver : Symbol(receiver, Decl(tslib.d.ts, 1, 68)) -+>T : Symbol(T, Decl(tslib.d.ts, 1, 47)) -+>state : Symbol(state, Decl(tslib.d.ts, 1, 80)) -+>V : Symbol(V, Decl(tslib.d.ts, 1, 64)) - - export declare function __classPrivateFieldSet(receiver: T, state: any, value: V): V; -->__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(tslib.d.ts, --, --)) -->T : Symbol(T, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -->receiver : Symbol(receiver, Decl(tslib.d.ts, --, --)) -->T : Symbol(T, Decl(tslib.d.ts, --, --)) -->state : Symbol(state, Decl(tslib.d.ts, --, --)) -->value : Symbol(value, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -->V : Symbol(V, Decl(tslib.d.ts, --, --)) -+>__classPrivateFieldSet : Symbol(__classPrivateFieldSet, Decl(tslib.d.ts, 1, 96)) -+>T : Symbol(T, Decl(tslib.d.ts, 2, 47)) -+>V : Symbol(V, Decl(tslib.d.ts, 2, 64)) -+>receiver : Symbol(receiver, Decl(tslib.d.ts, 2, 68)) -+>T : Symbol(T, Decl(tslib.d.ts, 2, 47)) -+>state : Symbol(state, Decl(tslib.d.ts, 2, 80)) -+>value : Symbol(value, Decl(tslib.d.ts, 2, 92)) -+>V : Symbol(V, Decl(tslib.d.ts, 2, 64)) -+>V : Symbol(V, Decl(tslib.d.ts, 2, 64)) diff --git a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.types b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.types index ab26c905f1..3e63d2c151 100644 --- a/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.types +++ b/testdata/baselines/reference/submodule/conformance/privateNameStaticEmitHelpers.types @@ -22,7 +22,7 @@ export class S { >S : typeof S } -=== tslib.d.ts === +=== node_modules/tslib/index.d.ts === // these are pre-TS4.3 versions of emit helpers, which only supported private instance fields export declare function __classPrivateFieldGet(receiver: T, state: any): V; >__classPrivateFieldGet : (receiver: T, state: any) => V diff --git a/testdata/baselines/reference/submodule/conformance/reExportDefaultExport.js b/testdata/baselines/reference/submodule/conformance/reExportDefaultExport.js index 0c216872ad..ee1e11e0e4 100644 --- a/testdata/baselines/reference/submodule/conformance/reExportDefaultExport.js +++ b/testdata/baselines/reference/submodule/conformance/reExportDefaultExport.js @@ -22,8 +22,11 @@ function f() { } //// [m2.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const m1_1 = require("./m1"); +const m1_1 = __importDefault(require("./m1")); const m1_2 = require("./m1"); (0, m1_2.f)(); (0, m1_1.default)(); diff --git a/testdata/baselines/reference/submodule/conformance/reExportDefaultExport.js.diff b/testdata/baselines/reference/submodule/conformance/reExportDefaultExport.js.diff index 508f9f7b91..529ec3c813 100644 --- a/testdata/baselines/reference/submodule/conformance/reExportDefaultExport.js.diff +++ b/testdata/baselines/reference/submodule/conformance/reExportDefaultExport.js.diff @@ -1,12 +1,12 @@ --- old.reExportDefaultExport.js +++ new.reExportDefaultExport.js -@@= skipped -22, +22 lines =@@ - //// [m2.js] - "use strict"; +@@= skipped -25, +25 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var m1_1 = require("./m1"); +-var m1_1 = __importDefault(require("./m1")); -var m1_2 = require("./m1"); -+const m1_1 = require("./m1"); ++const m1_1 = __importDefault(require("./m1")); +const m1_2 = require("./m1"); (0, m1_2.f)(); (0, m1_1.default)(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.js b/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.js index 1c1c8328fd..de8ae0c44d 100644 --- a/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.js +++ b/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.js @@ -18,7 +18,40 @@ module.exports = { }; //// [constants.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.tsConstants = void 0; -const tsConstants = require("../lib/constants"); +const tsConstants = __importStar(require("../lib/constants")); exports.tsConstants = tsConstants; diff --git a/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.js.diff b/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.js.diff index fd62e1eeac..ab880a75a3 100644 --- a/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.js.diff +++ b/testdata/baselines/reference/submodule/conformance/reExportJsFromTs.js.diff @@ -10,10 +10,10 @@ module.exports = { str: 'x', }; -@@= skipped -7, +10 lines =@@ - "use strict"; +@@= skipped -40, +43 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.tsConstants = void 0; --var tsConstants = require("../lib/constants"); -+const tsConstants = require("../lib/constants"); +-var tsConstants = __importStar(require("../lib/constants")); ++const tsConstants = __importStar(require("../lib/constants")); exports.tsConstants = tsConstants; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.errors.txt b/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.errors.txt deleted file mode 100644 index ea97dc1d9e..0000000000 --- a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -test/file1.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations. - - -==== test/file1.ts (1 errors) ==== - import foo = require('foo'); - ~~~~~ -!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. - import other = require('./other'); - import relMod = require('./sub/relMod'); - - if(foo.M2.x){ - var x = new relMod(other.M2.x.charCodeAt(0)); - } - -==== test/foo.d.ts (0 errors) ==== - export declare module M2 { - export var x: boolean; - } - -==== test/other.d.ts (0 errors) ==== - export declare module M2 { - export var x: string; - } - -==== test/sub/relMod.d.ts (0 errors) ==== - declare class Test { - constructor(x: number); - } - export = Test; - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.errors.txt.diff deleted file mode 100644 index e6415062fd..0000000000 --- a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.relativePathToDeclarationFile.errors.txt -+++ new.relativePathToDeclarationFile.errors.txt -@@= skipped -0, +0 lines =@@ -- -+test/file1.ts(1,22): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+ -+ -+==== test/file1.ts (1 errors) ==== -+ import foo = require('foo'); -+ ~~~~~ -+!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations. -+ import other = require('./other'); -+ import relMod = require('./sub/relMod'); -+ -+ if(foo.M2.x){ -+ var x = new relMod(other.M2.x.charCodeAt(0)); -+ } -+ -+==== test/foo.d.ts (0 errors) ==== -+ export declare module M2 { -+ export var x: boolean; -+ } -+ -+==== test/other.d.ts (0 errors) ==== -+ export declare module M2 { -+ export var x: string; -+ } -+ -+==== test/sub/relMod.d.ts (0 errors) ==== -+ declare class Test { -+ constructor(x: number); -+ } -+ export = Test; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.js b/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.js deleted file mode 100644 index 2c3361af42..0000000000 --- a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.js +++ /dev/null @@ -1,37 +0,0 @@ -//// [tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts] //// - -//// [foo.d.ts] -export declare module M2 { - export var x: boolean; -} - -//// [other.d.ts] -export declare module M2 { - export var x: string; -} - -//// [relMod.d.ts] -declare class Test { - constructor(x: number); -} -export = Test; - -//// [file1.ts] -import foo = require('foo'); -import other = require('./other'); -import relMod = require('./sub/relMod'); - -if(foo.M2.x){ - var x = new relMod(other.M2.x.charCodeAt(0)); -} - - -//// [file1.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const foo = require("foo"); -const other = require("./other"); -const relMod = require("./sub/relMod"); -if (foo.M2.x) { - var x = new relMod(other.M2.x.charCodeAt(0)); -} diff --git a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.js.diff b/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.js.diff deleted file mode 100644 index 0e4cf31015..0000000000 --- a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.js.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.relativePathToDeclarationFile.js -+++ new.relativePathToDeclarationFile.js -@@= skipped -28, +28 lines =@@ - //// [file1.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --var foo = require("foo"); --var other = require("./other"); --var relMod = require("./sub/relMod"); -+const foo = require("foo"); -+const other = require("./other"); -+const relMod = require("./sub/relMod"); - if (foo.M2.x) { - var x = new relMod(other.M2.x.charCodeAt(0)); - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.symbols b/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.symbols deleted file mode 100644 index 84c6133ea9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.symbols +++ /dev/null @@ -1,45 +0,0 @@ -//// [tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts] //// - -=== test/file1.ts === -import foo = require('foo'); ->foo : Symbol(foo, Decl(file1.ts, 0, 0)) - -import other = require('./other'); ->other : Symbol(other, Decl(file1.ts, 0, 28)) - -import relMod = require('./sub/relMod'); ->relMod : Symbol(relMod, Decl(file1.ts, 1, 34)) - -if(foo.M2.x){ ->foo : Symbol(foo, Decl(file1.ts, 0, 0)) - - var x = new relMod(other.M2.x.charCodeAt(0)); ->x : Symbol(x, Decl(file1.ts, 5, 4)) ->relMod : Symbol(relMod, Decl(file1.ts, 1, 34)) ->other.M2.x.charCodeAt : Symbol(String.charCodeAt, Decl(lib.es5.d.ts, --, --)) ->other.M2.x : Symbol(other.M2.x, Decl(other.d.ts, 1, 11)) ->other.M2 : Symbol(other.M2, Decl(other.d.ts, 0, 0)) ->other : Symbol(other, Decl(file1.ts, 0, 28)) ->M2 : Symbol(other.M2, Decl(other.d.ts, 0, 0)) ->x : Symbol(other.M2.x, Decl(other.d.ts, 1, 11)) ->charCodeAt : Symbol(String.charCodeAt, Decl(lib.es5.d.ts, --, --)) -} - -=== test/other.d.ts === -export declare module M2 { ->M2 : Symbol(M2, Decl(other.d.ts, 0, 0)) - - export var x: string; ->x : Symbol(x, Decl(other.d.ts, 1, 11)) -} - -=== test/sub/relMod.d.ts === -declare class Test { ->Test : Symbol(Test, Decl(relMod.d.ts, 0, 0)) - - constructor(x: number); ->x : Symbol(x, Decl(relMod.d.ts, 1, 13)) -} -export = Test; ->Test : Symbol(Test, Decl(relMod.d.ts, 0, 0)) - diff --git a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.symbols.diff b/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.symbols.diff deleted file mode 100644 index de69ebb4dc..0000000000 --- a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.symbols.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.relativePathToDeclarationFile.symbols -+++ new.relativePathToDeclarationFile.symbols -@@= skipped -10, +10 lines =@@ - >relMod : Symbol(relMod, Decl(file1.ts, 1, 34)) - - if(foo.M2.x){ -->foo.M2.x : Symbol(foo.M2.x, Decl(foo.d.ts, 1, 11)) -->foo.M2 : Symbol(foo.M2, Decl(foo.d.ts, 0, 0)) - >foo : Symbol(foo, Decl(file1.ts, 0, 0)) -->M2 : Symbol(foo.M2, Decl(foo.d.ts, 0, 0)) -->x : Symbol(foo.M2.x, Decl(foo.d.ts, 1, 11)) - - var x = new relMod(other.M2.x.charCodeAt(0)); - >x : Symbol(x, Decl(file1.ts, 5, 4)) -@@= skipped -16, +12 lines =@@ - >M2 : Symbol(other.M2, Decl(other.d.ts, 0, 0)) - >x : Symbol(other.M2.x, Decl(other.d.ts, 1, 11)) - >charCodeAt : Symbol(String.charCodeAt, Decl(lib.es5.d.ts, --, --)) --} -- --=== test/foo.d.ts === --export declare module M2 { -->M2 : Symbol(M2, Decl(foo.d.ts, 0, 0)) -- -- export var x: boolean; -->x : Symbol(x, Decl(foo.d.ts, 1, 11)) - } - - === test/other.d.ts === \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.types b/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.types deleted file mode 100644 index b1339c7703..0000000000 --- a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.types +++ /dev/null @@ -1,52 +0,0 @@ -//// [tests/cases/conformance/externalModules/relativePathToDeclarationFile.ts] //// - -=== test/file1.ts === -import foo = require('foo'); ->foo : any - -import other = require('./other'); ->other : typeof other - -import relMod = require('./sub/relMod'); ->relMod : typeof relMod - -if(foo.M2.x){ ->foo.M2.x : any ->foo.M2 : any ->foo : any ->M2 : any ->x : any - - var x = new relMod(other.M2.x.charCodeAt(0)); ->x : relMod ->new relMod(other.M2.x.charCodeAt(0)) : relMod ->relMod : typeof relMod ->other.M2.x.charCodeAt(0) : number ->other.M2.x.charCodeAt : (index: number) => number ->other.M2.x : string ->other.M2 : typeof other.M2 ->other : typeof other ->M2 : typeof other.M2 ->x : string ->charCodeAt : (index: number) => number ->0 : 0 -} - -=== test/other.d.ts === -export declare module M2 { ->M2 : typeof M2 - - export var x: string; ->x : string -} - -=== test/sub/relMod.d.ts === -declare class Test { ->Test : Test - - constructor(x: number); ->x : number -} -export = Test; ->Test : Test - diff --git a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.types.diff b/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.types.diff deleted file mode 100644 index a4ccbee002..0000000000 --- a/testdata/baselines/reference/submodule/conformance/relativePathToDeclarationFile.types.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- old.relativePathToDeclarationFile.types -+++ new.relativePathToDeclarationFile.types -@@= skipped -1, +1 lines =@@ - - === test/file1.ts === - import foo = require('foo'); -->foo : typeof foo -+>foo : any - - import other = require('./other'); - >other : typeof other -@@= skipped -9, +9 lines =@@ - >relMod : typeof relMod - - if(foo.M2.x){ -->foo.M2.x : boolean -->foo.M2 : typeof foo.M2 -->foo : typeof foo -->M2 : typeof foo.M2 -->x : boolean -+>foo.M2.x : any -+>foo.M2 : any -+>foo : any -+>M2 : any -+>x : any - - var x = new relMod(other.M2.x.charCodeAt(0)); - >x : relMod -@@= skipped -19, +19 lines =@@ - >x : string - >charCodeAt : (index: number) => number - >0 : 0 --} -- --=== test/foo.d.ts === --export declare module M2 { -->M2 : typeof M2 -- -- export var x: boolean; -->x : boolean - } - - === test/other.d.ts === \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).errors.txt.diff deleted file mode 100644 index b5a75340f1..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).errors.txt.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- old.resolutionModeImportType1(moduleresolution=classic).errors.txt -+++ new.resolutionModeImportType1(moduleresolution=classic).errors.txt -@@= skipped -0, +0 lines =@@ --error TS2688: Cannot find type definition file for 'foo'. -- The file is in the program because: -- Entry point for implicit type library 'foo' --/app.ts(1,30): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --/app.ts(2,29): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --/app.ts(3,30): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -- -- --!!! error TS2688: Cannot find type definition file for 'foo'. --!!! error TS2688: The file is in the program because: --!!! error TS2688: Entry point for implicit type library 'foo' --==== /node_modules/@types/foo/package.json (0 errors) ==== -- { -- "name": "@types/foo", -- "version": "1.0.0", -- "exports": { -- ".": { -- "import": "./index.d.mts", -- "require": "./index.d.cts" -- } -- } -- } -- --==== /node_modules/@types/foo/index.d.mts (0 errors) ==== -- export declare const x: "module"; -- --==== /node_modules/@types/foo/index.d.cts (0 errors) ==== -- export declare const x: "script"; -- --==== /app.ts (3 errors) ==== -- type Default = typeof import("foo").x; -- ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -- type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x; -- ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -- type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x; -- ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -- // resolution-mode does not enforce file extension in `bundler`, just sets conditions -- type ImportRelative = typeof import("./other", { assert: { "resolution-mode": "import" } }).x; -- type RequireRelative = typeof import("./other", { assert: { "resolution-mode": "require" } }).x; -- --==== /other.ts (0 errors) ==== -- export const x = "other"; -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols deleted file mode 100644 index 3b36b51d0a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols +++ /dev/null @@ -1,36 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/resolutionModeImportType1.ts] //// - -=== /node_modules/@types/foo/index.d.mts === -export declare const x: "module"; ->x : Symbol(x, Decl(index.d.mts, 0, 20)) - -=== /node_modules/@types/foo/index.d.cts === -export declare const x: "script"; ->x : Symbol(x, Decl(index.d.cts, 0, 20)) - -=== /app.ts === -type Default = typeof import("foo").x; ->Default : Symbol(Default, Decl(app.ts, 0, 0)) ->x : Symbol(x, Decl(index.d.mts, 0, 20)) - -type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x; ->Import : Symbol(Import, Decl(app.ts, 0, 38)) ->x : Symbol(x, Decl(index.d.mts, 0, 20)) - -type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x; ->Require : Symbol(Require, Decl(app.ts, 1, 82)) ->x : Symbol(x, Decl(index.d.cts, 0, 20)) - -// resolution-mode does not enforce file extension in `bundler`, just sets conditions -type ImportRelative = typeof import("./other", { assert: { "resolution-mode": "import" } }).x; ->ImportRelative : Symbol(ImportRelative, Decl(app.ts, 2, 84)) ->x : Symbol(x, Decl(other.ts, 0, 12)) - -type RequireRelative = typeof import("./other", { assert: { "resolution-mode": "require" } }).x; ->RequireRelative : Symbol(RequireRelative, Decl(app.ts, 4, 94)) ->x : Symbol(x, Decl(other.ts, 0, 12)) - -=== /other.ts === -export const x = "other"; ->x : Symbol(x, Decl(other.ts, 0, 12)) - diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols.diff deleted file mode 100644 index 32f63277bd..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).symbols.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.resolutionModeImportType1(moduleresolution=classic).symbols -+++ new.resolutionModeImportType1(moduleresolution=classic).symbols -@@= skipped -10, +10 lines =@@ - === /app.ts === - type Default = typeof import("foo").x; - >Default : Symbol(Default, Decl(app.ts, 0, 0)) -+>x : Symbol(x, Decl(index.d.mts, 0, 20)) - - type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x; - >Import : Symbol(Import, Decl(app.ts, 0, 38)) -+>x : Symbol(x, Decl(index.d.mts, 0, 20)) - - type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x; - >Require : Symbol(Require, Decl(app.ts, 1, 82)) -+>x : Symbol(x, Decl(index.d.cts, 0, 20)) - - // resolution-mode does not enforce file extension in `bundler`, just sets conditions - type ImportRelative = typeof import("./other", { assert: { "resolution-mode": "import" } }).x; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types deleted file mode 100644 index 376327dbeb..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types +++ /dev/null @@ -1,37 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/resolutionModeImportType1.ts] //// - -=== /node_modules/@types/foo/index.d.mts === -export declare const x: "module"; ->x : "module" - -=== /node_modules/@types/foo/index.d.cts === -export declare const x: "script"; ->x : "script" - -=== /app.ts === -type Default = typeof import("foo").x; ->Default : "module" ->x : any - -type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x; ->Import : "module" ->x : any - -type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x; ->Require : "script" ->x : any - -// resolution-mode does not enforce file extension in `bundler`, just sets conditions -type ImportRelative = typeof import("./other", { assert: { "resolution-mode": "import" } }).x; ->ImportRelative : "other" ->x : any - -type RequireRelative = typeof import("./other", { assert: { "resolution-mode": "require" } }).x; ->RequireRelative : "other" ->x : any - -=== /other.ts === -export const x = "other"; ->x : "other" ->"other" : "other" - diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types.diff deleted file mode 100644 index 79150fc301..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeImportType1(moduleresolution=classic).types.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.resolutionModeImportType1(moduleresolution=classic).types -+++ new.resolutionModeImportType1(moduleresolution=classic).types -@@= skipped -9, +9 lines =@@ - - === /app.ts === - type Default = typeof import("foo").x; -->Default : any -+>Default : "module" - >x : any - - type Import = typeof import("foo", { assert: { "resolution-mode": "import" } }).x; -->Import : any -+>Import : "module" - >x : any - - type Require = typeof import("foo", { assert: { "resolution-mode": "require" } }).x; -->Require : any -+>Require : "script" - >x : any - - // resolution-mode does not enforce file extension in `bundler`, just sets conditions \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt deleted file mode 100644 index d508d82d20..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt +++ /dev/null @@ -1,45 +0,0 @@ -/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'? - - -==== /tsconfig.json (0 errors) ==== - { - "compilerOptions": { - "module": "esnext", - "moduleResolution": "node10", - "noEmit": true, - "types": [] - } - } - -==== /app.ts (1 errors) ==== - /// - MODULE; // error - SCRIPT; // error - ~~~~~~ -!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'? -!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here. - -==== /node_modules/@types/foo/package.json (0 errors) ==== - { - "name": "@types/foo", - "version": "1.0.0", - "exports": { - ".": { - "import": "./index.d.mts", - "require": "./index.d.cts" - } - } - } - -==== /node_modules/@types/foo/index.d.mts (0 errors) ==== - export {}; - declare global { - const MODULE: any; - } - -==== /node_modules/@types/foo/index.d.cts (0 errors) ==== - export {}; - declare global { - const SCRIPT: any; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt.diff deleted file mode 100644 index 21390f0820..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash4.errors.txt.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- old.resolutionModeTripleSlash4.errors.txt -+++ new.resolutionModeTripleSlash4.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(4,25): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. --/app.ts(1,23): error TS2688: Cannot find type definition file for 'foo'. --/app.ts(2,1): error TS2304: Cannot find name 'MODULE'. - /app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'? - - --==== /tsconfig.json (1 errors) ==== -+==== /tsconfig.json (0 errors) ==== - { - "compilerOptions": { - "module": "esnext", - "moduleResolution": "node10", -- ~~~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - "noEmit": true, - "types": [] - } - } - --==== /app.ts (3 errors) ==== -+==== /app.ts (1 errors) ==== - /// -- ~~~ --!!! error TS2688: Cannot find type definition file for 'foo'. - MODULE; // error -- ~~~~~~ --!!! error TS2304: Cannot find name 'MODULE'. - SCRIPT; // error - ~~~~~~ - !!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'? \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt deleted file mode 100644 index 6618295aa9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt +++ /dev/null @@ -1,45 +0,0 @@ -/app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'? - - -==== /tsconfig.json (0 errors) ==== - { - "compilerOptions": { - "module": "esnext", - "moduleResolution": "node10", - "noEmit": true, - "types": [] - } - } - -==== /app.ts (1 errors) ==== - /// - MODULE; // ok - SCRIPT; // error - ~~~~~~ -!!! error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'? -!!! related TS2728 lib.scripthost.d.ts:--:--: 'WScript' is declared here. - -==== /node_modules/@types/foo/package.json (0 errors) ==== - { - "name": "@types/foo", - "version": "1.0.0", - "exports": { - ".": { - "import": "./index.d.mts", - "require": "./index.d.cts" - } - } - } - -==== /node_modules/@types/foo/index.d.mts (0 errors) ==== - export {}; - declare global { - const MODULE: any; - } - -==== /node_modules/@types/foo/index.d.cts (0 errors) ==== - export {}; - declare global { - const SCRIPT: any; - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt.diff deleted file mode 100644 index 9ab160155c..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTripleSlash5.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.resolutionModeTripleSlash5.errors.txt -+++ new.resolutionModeTripleSlash5.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(4,25): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - /app.ts(3,1): error TS2552: Cannot find name 'SCRIPT'. Did you mean 'WScript'? - - --==== /tsconfig.json (1 errors) ==== -+==== /tsconfig.json (0 errors) ==== - { - "compilerOptions": { - "module": "esnext", - "moduleResolution": "node10", -- ~~~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - "noEmit": true, - "types": [] - } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt.diff deleted file mode 100644 index 8646a662fd..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt.diff +++ /dev/null @@ -1,64 +0,0 @@ ---- old.resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt -+++ new.resolutionModeTypeOnlyImport1(moduleresolution=classic).errors.txt -@@= skipped -0, +0 lines =@@ --error TS2688: Cannot find type definition file for 'foo'. -- The file is in the program because: -- Entry point for implicit type library 'foo' --/app.ts(1,35): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --/app.ts(2,34): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? --/app.ts(3,35): error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -- -- --!!! error TS2688: Cannot find type definition file for 'foo'. --!!! error TS2688: The file is in the program because: --!!! error TS2688: Entry point for implicit type library 'foo' --==== /node_modules/@types/foo/package.json (0 errors) ==== -- { -- "name": "@types/foo", -- "version": "1.0.0", -- "exports": { -- ".": { -- "import": "./index.d.mts", -- "require": "./index.d.cts" -- } -- } -- } -- --==== /node_modules/@types/foo/index.d.mts (0 errors) ==== -- export declare const x: "module"; -- --==== /node_modules/@types/foo/index.d.cts (0 errors) ==== -- export declare const x: "script"; -- --==== /app.ts (3 errors) ==== -- import type { x as Default } from "foo"; -- ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -- import type { x as Import } from "foo" assert { "resolution-mode": "import" }; -- ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -- import type { x as Require } from "foo" assert { "resolution-mode": "require" }; -- ~~~~~ --!!! error TS2792: Cannot find module 'foo'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -- type _Default = typeof Default; -- type _Import = typeof Import; -- type _Require = typeof Require; -- -- // resolution-mode does not enforce file extension in `bundler`, just sets conditions -- import type { x as ImportRelative } from "./other" assert { "resolution-mode": "import" }; -- import type { x as RequireRelative } from "./other" assert { "resolution-mode": "require" }; -- type _ImportRelative = typeof ImportRelative; -- type _RequireRelative = typeof RequireRelative; -- -- export { -- _Default, -- _Import, -- _Require, -- _ImportRelative, -- _RequireRelative -- } -- --==== /other.ts (0 errors) ==== -- export const x = "other"; -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).js b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).js deleted file mode 100644 index 961512bfab..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).js +++ /dev/null @@ -1,62 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/resolutionModeTypeOnlyImport1.ts] //// - -//// [package.json] -{ - "name": "@types/foo", - "version": "1.0.0", - "exports": { - ".": { - "import": "./index.d.mts", - "require": "./index.d.cts" - } - } -} - -//// [index.d.mts] -export declare const x: "module"; - -//// [index.d.cts] -export declare const x: "script"; - -//// [app.ts] -import type { x as Default } from "foo"; -import type { x as Import } from "foo" assert { "resolution-mode": "import" }; -import type { x as Require } from "foo" assert { "resolution-mode": "require" }; -type _Default = typeof Default; -type _Import = typeof Import; -type _Require = typeof Require; - -// resolution-mode does not enforce file extension in `bundler`, just sets conditions -import type { x as ImportRelative } from "./other" assert { "resolution-mode": "import" }; -import type { x as RequireRelative } from "./other" assert { "resolution-mode": "require" }; -type _ImportRelative = typeof ImportRelative; -type _RequireRelative = typeof RequireRelative; - -export { - _Default, - _Import, - _Require, - _ImportRelative, - _RequireRelative -} - -//// [other.ts] -export const x = "other"; - - - - -//// [other.d.ts] -export declare const x = "other"; -//// [app.d.ts] -import type { x as Default } from "foo"; -import type { x as Import } from "foo" assert { "resolution-mode": "import" }; -import type { x as Require } from "foo" assert { "resolution-mode": "require" }; -type _Default = typeof Default; -type _Import = typeof Import; -type _Require = typeof Require; -import type { x as ImportRelative } from "./other" assert { "resolution-mode": "import" }; -import type { x as RequireRelative } from "./other" assert { "resolution-mode": "require" }; -type _ImportRelative = typeof ImportRelative; -type _RequireRelative = typeof RequireRelative; -export { _Default, _Import, _Require, _ImportRelative, _RequireRelative }; diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols deleted file mode 100644 index 1d28242ebf..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols +++ /dev/null @@ -1,73 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/resolutionModeTypeOnlyImport1.ts] //// - -=== /node_modules/@types/foo/index.d.mts === -export declare const x: "module"; ->x : Symbol(x, Decl(index.d.mts, 0, 20)) - -=== /node_modules/@types/foo/index.d.cts === -export declare const x: "script"; ->x : Symbol(x, Decl(index.d.cts, 0, 20)) - -=== /app.ts === -import type { x as Default } from "foo"; ->x : Symbol(Default, Decl(index.d.mts, 0, 20)) ->Default : Symbol(Default, Decl(app.ts, 0, 13)) - -import type { x as Import } from "foo" assert { "resolution-mode": "import" }; ->x : Symbol(Default, Decl(index.d.mts, 0, 20)) ->Import : Symbol(Import, Decl(app.ts, 1, 13)) - -import type { x as Require } from "foo" assert { "resolution-mode": "require" }; ->x : Symbol(Require, Decl(index.d.cts, 0, 20)) ->Require : Symbol(Require, Decl(app.ts, 2, 13)) - -type _Default = typeof Default; ->_Default : Symbol(_Default, Decl(app.ts, 2, 80)) ->Default : Symbol(Default, Decl(app.ts, 0, 13)) - -type _Import = typeof Import; ->_Import : Symbol(_Import, Decl(app.ts, 3, 31)) ->Import : Symbol(Import, Decl(app.ts, 1, 13)) - -type _Require = typeof Require; ->_Require : Symbol(_Require, Decl(app.ts, 4, 29)) ->Require : Symbol(Require, Decl(app.ts, 2, 13)) - -// resolution-mode does not enforce file extension in `bundler`, just sets conditions -import type { x as ImportRelative } from "./other" assert { "resolution-mode": "import" }; ->x : Symbol(ImportRelative, Decl(other.ts, 0, 12)) ->ImportRelative : Symbol(ImportRelative, Decl(app.ts, 8, 13)) - -import type { x as RequireRelative } from "./other" assert { "resolution-mode": "require" }; ->x : Symbol(ImportRelative, Decl(other.ts, 0, 12)) ->RequireRelative : Symbol(RequireRelative, Decl(app.ts, 9, 13)) - -type _ImportRelative = typeof ImportRelative; ->_ImportRelative : Symbol(_ImportRelative, Decl(app.ts, 9, 92)) ->ImportRelative : Symbol(ImportRelative, Decl(app.ts, 8, 13)) - -type _RequireRelative = typeof RequireRelative; ->_RequireRelative : Symbol(_RequireRelative, Decl(app.ts, 10, 45)) ->RequireRelative : Symbol(RequireRelative, Decl(app.ts, 9, 13)) - -export { - _Default, ->_Default : Symbol(_Default, Decl(app.ts, 13, 8)) - - _Import, ->_Import : Symbol(_Import, Decl(app.ts, 14, 11)) - - _Require, ->_Require : Symbol(_Require, Decl(app.ts, 15, 10)) - - _ImportRelative, ->_ImportRelative : Symbol(_ImportRelative, Decl(app.ts, 16, 11)) - - _RequireRelative ->_RequireRelative : Symbol(_RequireRelative, Decl(app.ts, 17, 18)) -} - -=== /other.ts === -export const x = "other"; ->x : Symbol(x, Decl(other.ts, 0, 12)) - diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols.diff deleted file mode 100644 index a297cc4f28..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols -+++ new.resolutionModeTypeOnlyImport1(moduleresolution=classic).symbols -@@= skipped -9, +9 lines =@@ - - === /app.ts === - import type { x as Default } from "foo"; -+>x : Symbol(Default, Decl(index.d.mts, 0, 20)) - >Default : Symbol(Default, Decl(app.ts, 0, 13)) - - import type { x as Import } from "foo" assert { "resolution-mode": "import" }; -+>x : Symbol(Default, Decl(index.d.mts, 0, 20)) - >Import : Symbol(Import, Decl(app.ts, 1, 13)) - - import type { x as Require } from "foo" assert { "resolution-mode": "require" }; -+>x : Symbol(Require, Decl(index.d.cts, 0, 20)) - >Require : Symbol(Require, Decl(app.ts, 2, 13)) - - type _Default = typeof Default; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types deleted file mode 100644 index 404083065a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types +++ /dev/null @@ -1,74 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/resolutionModeTypeOnlyImport1.ts] //// - -=== /node_modules/@types/foo/index.d.mts === -export declare const x: "module"; ->x : "module" - -=== /node_modules/@types/foo/index.d.cts === -export declare const x: "script"; ->x : "script" - -=== /app.ts === -import type { x as Default } from "foo"; ->x : "module" ->Default : any - -import type { x as Import } from "foo" assert { "resolution-mode": "import" }; ->x : "module" ->Import : any - -import type { x as Require } from "foo" assert { "resolution-mode": "require" }; ->x : "script" ->Require : any - -type _Default = typeof Default; ->_Default : "module" ->Default : "module" - -type _Import = typeof Import; ->_Import : "module" ->Import : "module" - -type _Require = typeof Require; ->_Require : "script" ->Require : "script" - -// resolution-mode does not enforce file extension in `bundler`, just sets conditions -import type { x as ImportRelative } from "./other" assert { "resolution-mode": "import" }; ->x : "other" ->ImportRelative : any - -import type { x as RequireRelative } from "./other" assert { "resolution-mode": "require" }; ->x : "other" ->RequireRelative : any - -type _ImportRelative = typeof ImportRelative; ->_ImportRelative : "other" ->ImportRelative : "other" - -type _RequireRelative = typeof RequireRelative; ->_RequireRelative : "other" ->RequireRelative : "other" - -export { - _Default, ->_Default : any - - _Import, ->_Import : any - - _Require, ->_Require : any - - _ImportRelative, ->_ImportRelative : any - - _RequireRelative ->_RequireRelative : any -} - -=== /other.ts === -export const x = "other"; ->x : "other" ->"other" : "other" - diff --git a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types.diff b/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types.diff deleted file mode 100644 index ff63038fa6..0000000000 --- a/testdata/baselines/reference/submodule/conformance/resolutionModeTypeOnlyImport1(moduleresolution=classic).types.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- old.resolutionModeTypeOnlyImport1(moduleresolution=classic).types -+++ new.resolutionModeTypeOnlyImport1(moduleresolution=classic).types -@@= skipped -9, +9 lines =@@ - - === /app.ts === - import type { x as Default } from "foo"; -->x : any -+>x : "module" - >Default : any - - import type { x as Import } from "foo" assert { "resolution-mode": "import" }; -->x : any -+>x : "module" - >Import : any - - import type { x as Require } from "foo" assert { "resolution-mode": "require" }; -->x : any -+>x : "script" - >Require : any - - type _Default = typeof Default; -->_Default : any -->Default : any -+>_Default : "module" -+>Default : "module" - - type _Import = typeof Import; -->_Import : any -->Import : any -+>_Import : "module" -+>Import : "module" - - type _Require = typeof Require; -->_Require : any -->Require : any -+>_Require : "script" -+>Require : "script" - - // resolution-mode does not enforce file extension in `bundler`, just sets conditions - import type { x as ImportRelative } from "./other" assert { "resolution-mode": "import" }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.js b/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.js deleted file mode 100644 index 9257fc8c7a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.js +++ /dev/null @@ -1,12 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/scopedPackagesClassic.ts] //// - -//// [index.d.ts] -export const x = 0; - -//// [a.ts] -import { x } from "@see/saw"; - - -//// [a.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.symbols b/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.symbols deleted file mode 100644 index 6eea828314..0000000000 --- a/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/scopedPackagesClassic.ts] //// - -=== /a.ts === -import { x } from "@see/saw"; ->x : Symbol(x, Decl(a.ts, 0, 8)) - -=== /node_modules/@types/see__saw/index.d.ts === -export const x = 0; ->x : Symbol(x, Decl(index.d.ts, 0, 12)) - diff --git a/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.trace.json b/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.trace.json deleted file mode 100644 index 450b2bb7ee..0000000000 --- a/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.trace.json +++ /dev/null @@ -1,12 +0,0 @@ -======== Resolving module '@see/saw' from '/a.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/package.json' does not exist. -Loading module '@see/saw' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Scoped package detected, looking in 'see__saw' -File '/node_modules/@types/see__saw/package.json' does not exist. -File '/node_modules/@types/see__saw.d.ts' does not exist. -File '/node_modules/@types/see__saw/index.d.ts' exists - use it as a name resolution result. -Resolving real path for '/node_modules/@types/see__saw/index.d.ts', result '/node_modules/@types/see__saw/index.d.ts'. -======== Module name '@see/saw' was successfully resolved to '/node_modules/@types/see__saw/index.d.ts'. ======== diff --git a/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.types b/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.types deleted file mode 100644 index 94bd050b55..0000000000 --- a/testdata/baselines/reference/submodule/conformance/scopedPackagesClassic.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/scopedPackagesClassic.ts] //// - -=== /a.ts === -import { x } from "@see/saw"; ->x : 0 - -=== /node_modules/@types/see__saw/index.d.ts === -export const x = 0; ->x : 0 ->0 : 0 - diff --git a/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.errors.txt b/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.errors.txt new file mode 100644 index 0000000000..65be56f386 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.errors.txt @@ -0,0 +1,14 @@ +index.ts(3,8): error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. + + +==== index.ts (1 errors) ==== + // await disallowed in import= + declare var require: any; + import await = require("./other"); + ~~~~~ +!!! error TS1262: Identifier expected. 'await' is a reserved word at the top-level of a module. + +==== other.ts (0 errors) ==== + declare const _await: any; + export { _await as await }; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.js b/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.js new file mode 100644 index 0000000000..c332d24bd0 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.js @@ -0,0 +1,19 @@ +//// [tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts] //// + +//// [index.ts] +// await disallowed in import= +declare var require: any; +import await = require("./other"); + +//// [other.ts] +declare const _await: any; +export { _await as await }; + + +//// [other.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.await = void 0; +//// [index.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.symbols b/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.symbols new file mode 100644 index 0000000000..ab5f2f1ce5 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.symbols @@ -0,0 +1,18 @@ +//// [tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts] //// + +=== index.ts === +// await disallowed in import= +declare var require: any; +>require : Symbol(require, Decl(index.ts, 1, 11)) + +import await = require("./other"); +>await : Symbol(await, Decl(index.ts, 1, 25)) + +=== other.ts === +declare const _await: any; +>_await : Symbol(_await, Decl(other.ts, 0, 13)) + +export { _await as await }; +>_await : Symbol(_await, Decl(other.ts, 0, 13)) +>await : Symbol(await, Decl(other.ts, 1, 8)) + diff --git a/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.types b/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.types new file mode 100644 index 0000000000..8663d617ac --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/topLevelAwaitErrors.11.types @@ -0,0 +1,18 @@ +//// [tests/cases/conformance/externalModules/topLevelAwaitErrors.11.ts] //// + +=== index.ts === +// await disallowed in import= +declare var require: any; +>require : any + +import await = require("./other"); +>await : typeof await + +=== other.ts === +declare const _await: any; +>_await : any + +export { _await as await }; +>_await : any +>await : any + diff --git a/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.errors.txt b/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.errors.txt deleted file mode 100644 index 8c29a825ed..0000000000 --- a/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.errors.txt +++ /dev/null @@ -1,27 +0,0 @@ -error TS5055: Cannot write file 'a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5055: Cannot write file 'b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -a.js(3,1): error TS2304: Cannot find name 'a'. -b.js(2,1): error TS2304: Cannot find name 'a'. - - -!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== a.js (1 errors) ==== - this.a = 10; - this.a; - a; - ~ -!!! error TS2304: Cannot find name 'a'. - -==== b.js (1 errors) ==== - this.a; - a; - ~ -!!! error TS2304: Cannot find name 'a'. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.symbols b/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.symbols deleted file mode 100644 index 4e4a58edf3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.symbols +++ /dev/null @@ -1,17 +0,0 @@ -//// [tests/cases/conformance/salsa/topLevelThisAssignment.ts] //// - -=== a.js === -this.a = 10; ->this : Symbol(globalThis) - -this.a; ->this : Symbol(globalThis) - -a; - -=== b.js === -this.a; ->this : Symbol(globalThis) - -a; - diff --git a/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.symbols.diff b/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.symbols.diff deleted file mode 100644 index d34b9e4c23..0000000000 --- a/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.symbols.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.topLevelThisAssignment.symbols -+++ new.topLevelThisAssignment.symbols -@@= skipped -1, +1 lines =@@ - - === a.js === - this.a = 10; -->this.a : Symbol(a, Decl(a.js, 0, 0)) - >this : Symbol(globalThis) -->a : Symbol(a, Decl(a.js, 0, 0)) - - this.a; -->this.a : Symbol(a, Decl(a.js, 0, 0)) - >this : Symbol(globalThis) -->a : Symbol(a, Decl(a.js, 0, 0)) - - a; -->a : Symbol(a, Decl(a.js, 0, 0)) - - === b.js === - this.a; -->this.a : Symbol(a, Decl(a.js, 0, 0)) - >this : Symbol(globalThis) -->a : Symbol(a, Decl(a.js, 0, 0)) - - a; -->a : Symbol(a, Decl(a.js, 0, 0)) diff --git a/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.types b/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.types deleted file mode 100644 index 51586c545b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/topLevelThisAssignment.types +++ /dev/null @@ -1,27 +0,0 @@ -//// [tests/cases/conformance/salsa/topLevelThisAssignment.ts] //// - -=== a.js === -this.a = 10; ->this.a = 10 : 10 ->this.a : any ->this : typeof globalThis ->a : any ->10 : 10 - -this.a; ->this.a : any ->this : typeof globalThis ->a : any - -a; ->a : any - -=== b.js === -this.a; ->this.a : any ->this : typeof globalThis ->a : any - -a; ->a : any - diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.errors.txt b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.errors.txt new file mode 100644 index 0000000000..5a2d2cd061 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.errors.txt @@ -0,0 +1,35 @@ +file.tsx(11,14): error TS2322: Type 'string' is not assignable to type 'boolean'. + + +==== react.d.ts (0 errors) ==== + declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } + } + +==== file.tsx (1 errors) ==== + export class MyComponent { + render() { + } + + props: { + [s: string]: boolean; + } + } + + // Should be an error + ; + ~~~ +!!! error TS2322: Type 'string' is not assignable to type 'boolean'. +!!! related TS6501 file.tsx:6:4: The expected type comes from this index signature. + + // Should be OK + ; + + // Should be ok + ; + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.js b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.js new file mode 100644 index 0000000000..59e615aa7e --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.js @@ -0,0 +1,48 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution10.tsx] //// + +//// [react.d.ts] +declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } +} + +//// [file.tsx] +export class MyComponent { + render() { + } + + props: { + [s: string]: boolean; + } +} + +// Should be an error +; + +// Should be OK +; + +// Should be ok +; + + +//// [file.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MyComponent = void 0; +class MyComponent { + render() { + } + props; +} +exports.MyComponent = MyComponent; +// Should be an error +; +// Should be OK +; +// Should be ok +; diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.js.diff b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.js.diff new file mode 100644 index 0000000000..f71f026e5a --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.js.diff @@ -0,0 +1,10 @@ +--- old.tsxAttributeResolution10.js ++++ new.tsxAttributeResolution10.js +@@= skipped -36, +36 lines =@@ + class MyComponent { + render() { + } ++ props; + } + exports.MyComponent = MyComponent; + // Should be an error \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.symbols b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.symbols new file mode 100644 index 0000000000..58293e8c51 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.symbols @@ -0,0 +1,51 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution10.tsx] //// + +=== react.d.ts === +declare module JSX { +>JSX : Symbol(JSX, Decl(react.d.ts, 0, 0)) + + interface Element { } +>Element : Symbol(Element, Decl(react.d.ts, 0, 20)) + + interface IntrinsicElements { +>IntrinsicElements : Symbol(IntrinsicElements, Decl(react.d.ts, 1, 22)) + } + interface ElementAttributesProperty { +>ElementAttributesProperty : Symbol(ElementAttributesProperty, Decl(react.d.ts, 3, 2)) + + props; +>props : Symbol(ElementAttributesProperty.props, Decl(react.d.ts, 4, 38)) + } +} + +=== file.tsx === +export class MyComponent { +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) + + render() { +>render : Symbol(MyComponent.render, Decl(file.tsx, 0, 26)) + } + + props: { +>props : Symbol(MyComponent.props, Decl(file.tsx, 2, 3)) + + [s: string]: boolean; +>s : Symbol(s, Decl(file.tsx, 5, 4)) + } +} + +// Should be an error +; +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) +>bar : Symbol(bar, Decl(file.tsx, 10, 12)) + +// Should be OK +; +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) +>bar : Symbol(bar, Decl(file.tsx, 13, 12)) + +// Should be ok +; +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) +>data-bar : Symbol(data-bar, Decl(file.tsx, 16, 12)) + diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.types b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.types new file mode 100644 index 0000000000..742dd6368b --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution10.types @@ -0,0 +1,48 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution10.tsx] //// + +=== react.d.ts === +declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; +>props : any + } +} + +=== file.tsx === +export class MyComponent { +>MyComponent : MyComponent + + render() { +>render : () => void + } + + props: { +>props : { [s: string]: boolean; } + + [s: string]: boolean; +>s : string + } +} + +// Should be an error +; +> : JSX.Element +>MyComponent : typeof MyComponent +>bar : string + +// Should be OK +; +> : JSX.Element +>MyComponent : typeof MyComponent +>bar : true +>true : true + +// Should be ok +; +> : JSX.Element +>MyComponent : typeof MyComponent +>data-bar : string + diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.errors.txt b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.errors.txt new file mode 100644 index 0000000000..bad7b2842e --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.errors.txt @@ -0,0 +1,34 @@ +file.tsx(11,22): error TS2322: Type '{ bar: string; }' is not assignable to type 'IntrinsicAttributes & { ref?: string; }'. + Property 'bar' does not exist on type 'IntrinsicAttributes & { ref?: string; }'. + + +==== react.d.ts (0 errors) ==== + declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } + interface IntrinsicAttributes { + ref?: string; + } + } + +==== file.tsx (1 errors) ==== + class MyComponent { + render() { + } + + props: { + ref?: string; + } + } + + // Should be an OK + var x = ; + ~~~ +!!! error TS2322: Type '{ bar: string; }' is not assignable to type 'IntrinsicAttributes & { ref?: string; }'. +!!! error TS2322: Property 'bar' does not exist on type 'IntrinsicAttributes & { ref?: string; }'. + + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.js b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.js new file mode 100644 index 0000000000..34ddc7ba05 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.js @@ -0,0 +1,38 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution11.tsx] //// + +//// [react.d.ts] +declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } + interface IntrinsicAttributes { + ref?: string; + } +} + +//// [file.tsx] +class MyComponent { + render() { + } + + props: { + ref?: string; + } +} + +// Should be an OK +var x = ; + + + +//// [file.jsx] +class MyComponent { + render() { + } + props; +} +// Should be an OK +var x = ; diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.js.diff b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.js.diff new file mode 100644 index 0000000000..28e4f42fd6 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.js.diff @@ -0,0 +1,10 @@ +--- old.tsxAttributeResolution11.js ++++ new.tsxAttributeResolution11.js +@@= skipped -31, +31 lines =@@ + class MyComponent { + render() { + } ++ props; + } + // Should be an OK + var x = ; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.symbols b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.symbols new file mode 100644 index 0000000000..fc39fce34d --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.symbols @@ -0,0 +1,49 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution11.tsx] //// + +=== react.d.ts === +declare module JSX { +>JSX : Symbol(JSX, Decl(react.d.ts, 0, 0)) + + interface Element { } +>Element : Symbol(Element, Decl(react.d.ts, 0, 20)) + + interface IntrinsicElements { +>IntrinsicElements : Symbol(IntrinsicElements, Decl(react.d.ts, 1, 22)) + } + interface ElementAttributesProperty { +>ElementAttributesProperty : Symbol(ElementAttributesProperty, Decl(react.d.ts, 3, 2)) + + props; +>props : Symbol(ElementAttributesProperty.props, Decl(react.d.ts, 4, 38)) + } + interface IntrinsicAttributes { +>IntrinsicAttributes : Symbol(IntrinsicAttributes, Decl(react.d.ts, 6, 2)) + + ref?: string; +>ref : Symbol(IntrinsicAttributes.ref, Decl(react.d.ts, 7, 32)) + } +} + +=== file.tsx === +class MyComponent { +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) + + render() { +>render : Symbol(MyComponent.render, Decl(file.tsx, 0, 19)) + } + + props: { +>props : Symbol(MyComponent.props, Decl(file.tsx, 2, 3)) + + ref?: string; +>ref : Symbol(ref, Decl(file.tsx, 4, 10)) + } +} + +// Should be an OK +var x = ; +>x : Symbol(x, Decl(file.tsx, 10, 3)) +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) +>bar : Symbol(bar, Decl(file.tsx, 10, 20)) + + diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.types b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.types new file mode 100644 index 0000000000..e5b6326844 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution11.types @@ -0,0 +1,41 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution11.tsx] //// + +=== react.d.ts === +declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; +>props : any + } + interface IntrinsicAttributes { + ref?: string; +>ref : string + } +} + +=== file.tsx === +class MyComponent { +>MyComponent : MyComponent + + render() { +>render : () => void + } + + props: { +>props : { ref?: string; } + + ref?: string; +>ref : string + } +} + +// Should be an OK +var x = ; +>x : JSX.Element +> : JSX.Element +>MyComponent : typeof MyComponent +>bar : string + + diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.errors.txt b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.errors.txt new file mode 100644 index 0000000000..b20cb15130 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.errors.txt @@ -0,0 +1,38 @@ +file.tsx(13,28): error TS2322: Type 'number' is not assignable to type 'string'. +file.tsx(15,28): error TS2322: Type 'boolean' is not assignable to type 'string | number'. + + +==== react.d.ts (0 errors) ==== + declare module JSX { + interface Element { } + interface IntrinsicElements { + div: any; + } + interface ElementAttributesProperty { prop: any } + } + +==== file.tsx (2 errors) ==== + interface IProps { + primaryText: string, + [propName: string]: string | number + } + + function VerticalNavMenuItem(prop: IProps) { + return
props.primaryText
+ } + + function VerticalNav() { + return ( +
+ // error + ~~~~~~~~~~~ +!!! error TS2322: Type 'number' is not assignable to type 'string'. +!!! related TS6500 file.tsx:2:3: The expected type comes from property 'primaryText' which is declared here on type 'IProps' + // ok + // error + ~~~~~~~~~~~~~~~ +!!! error TS2322: Type 'boolean' is not assignable to type 'string | number'. +!!! related TS6501 file.tsx:3:3: The expected type comes from this index signature. +
+ ) + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.js b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.js new file mode 100644 index 0000000000..26633239d3 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.js @@ -0,0 +1,45 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution14.tsx] //// + +//// [react.d.ts] +declare module JSX { + interface Element { } + interface IntrinsicElements { + div: any; + } + interface ElementAttributesProperty { prop: any } +} + +//// [file.tsx] +interface IProps { + primaryText: string, + [propName: string]: string | number +} + +function VerticalNavMenuItem(prop: IProps) { + return
props.primaryText
+} + +function VerticalNav() { + return ( +
+ // error + // ok + // error +
+ ) +} + +//// [file.jsx] +function VerticalNavMenuItem(prop) { + return
props.primaryText
; +} +function VerticalNav() { + return (
+ // error + // error + // ok + // ok + // error + // error +
); +} diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.symbols b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.symbols new file mode 100644 index 0000000000..4ab14a0ce6 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.symbols @@ -0,0 +1,67 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution14.tsx] //// + +=== react.d.ts === +declare module JSX { +>JSX : Symbol(JSX, Decl(react.d.ts, 0, 0)) + + interface Element { } +>Element : Symbol(Element, Decl(react.d.ts, 0, 20)) + + interface IntrinsicElements { +>IntrinsicElements : Symbol(IntrinsicElements, Decl(react.d.ts, 1, 22)) + + div: any; +>div : Symbol(IntrinsicElements.div, Decl(react.d.ts, 2, 30)) + } + interface ElementAttributesProperty { prop: any } +>ElementAttributesProperty : Symbol(ElementAttributesProperty, Decl(react.d.ts, 4, 2)) +>prop : Symbol(ElementAttributesProperty.prop, Decl(react.d.ts, 5, 41)) +} + +=== file.tsx === +interface IProps { +>IProps : Symbol(IProps, Decl(file.tsx, 0, 0)) + + primaryText: string, +>primaryText : Symbol(IProps.primaryText, Decl(file.tsx, 0, 18)) + + [propName: string]: string | number +>propName : Symbol(propName, Decl(file.tsx, 2, 3)) +} + +function VerticalNavMenuItem(prop: IProps) { +>VerticalNavMenuItem : Symbol(VerticalNavMenuItem, Decl(file.tsx, 3, 1)) +>prop : Symbol(prop, Decl(file.tsx, 5, 29)) +>IProps : Symbol(IProps, Decl(file.tsx, 0, 0)) + + return
props.primaryText
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2, 30)) +>div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2, 30)) +} + +function VerticalNav() { +>VerticalNav : Symbol(VerticalNav, Decl(file.tsx, 7, 1)) + + return ( +
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2, 30)) + + // error +>VerticalNavMenuItem : Symbol(VerticalNavMenuItem, Decl(file.tsx, 3, 1)) +>primaryText : Symbol(primaryText, Decl(file.tsx, 12, 26)) + + // ok +>VerticalNavMenuItem : Symbol(VerticalNavMenuItem, Decl(file.tsx, 3, 1)) +>justRandomProp : Symbol(justRandomProp, Decl(file.tsx, 13, 26)) +>primaryText : Symbol(primaryText, Decl(file.tsx, 13, 45)) + + // error +>VerticalNavMenuItem : Symbol(VerticalNavMenuItem, Decl(file.tsx, 3, 1)) +>justRandomProp1 : Symbol(justRandomProp1, Decl(file.tsx, 14, 26)) +>primaryText : Symbol(primaryText, Decl(file.tsx, 14, 49)) + +
+>div : Symbol(JSX.IntrinsicElements.div, Decl(react.d.ts, 2, 30)) + + ) +} diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.types b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.types new file mode 100644 index 0000000000..8fc6f6c52b --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution14.types @@ -0,0 +1,69 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution14.tsx] //// + +=== react.d.ts === +declare module JSX { + interface Element { } + interface IntrinsicElements { + div: any; +>div : any + } + interface ElementAttributesProperty { prop: any } +>prop : any +} + +=== file.tsx === +interface IProps { + primaryText: string, +>primaryText : string + + [propName: string]: string | number +>propName : string +} + +function VerticalNavMenuItem(prop: IProps) { +>VerticalNavMenuItem : (prop: IProps) => JSX.Element +>prop : IProps + + return
props.primaryText
+>
props.primaryText
: JSX.Element +>div : any +>div : any +} + +function VerticalNav() { +>VerticalNav : () => JSX.Element + + return ( +>(
// error // ok // error
) : JSX.Element + +
+>
// error // ok // error
: JSX.Element +>div : any + + // error +> : JSX.Element +>VerticalNavMenuItem : (prop: IProps) => JSX.Element +>primaryText : number +>2 : 2 + + // ok +> : JSX.Element +>VerticalNavMenuItem : (prop: IProps) => JSX.Element +>justRandomProp : number +>2 : 2 +>primaryText : string +>"hello" : "hello" + + // error +> : JSX.Element +>VerticalNavMenuItem : (prop: IProps) => JSX.Element +>justRandomProp1 : boolean +>true : true +>primaryText : string +>"hello" : "hello" + +
+>div : any + + ) +} diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.errors.txt b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.errors.txt new file mode 100644 index 0000000000..2339359950 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.errors.txt @@ -0,0 +1,31 @@ +file.tsx(9,14): error TS2322: Type 'number' is not assignable to type 'string'. + + +==== react.d.ts (0 errors) ==== + declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } + } + + interface Props { + foo: string; + } + +==== file.tsx (1 errors) ==== + export class MyComponent { + render() { + } + + props: { foo: string; } + } + + ; // ok + ; // should be an error + ~~~ +!!! error TS2322: Type 'number' is not assignable to type 'string'. +!!! related TS6500 file.tsx:5:12: The expected type comes from property 'foo' which is declared here on type '{ foo: string; }' + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.js b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.js new file mode 100644 index 0000000000..7f26c12c0e --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.js @@ -0,0 +1,40 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution9.tsx] //// + +//// [react.d.ts] +declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; + } +} + +interface Props { + foo: string; +} + +//// [file.tsx] +export class MyComponent { + render() { + } + + props: { foo: string; } +} + +; // ok +; // should be an error + + +//// [file.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MyComponent = void 0; +class MyComponent { + render() { + } + props; +} +exports.MyComponent = MyComponent; +; // ok +; // should be an error diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.js.diff b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.js.diff new file mode 100644 index 0000000000..0f018fda46 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.js.diff @@ -0,0 +1,10 @@ +--- old.tsxAttributeResolution9.js ++++ new.tsxAttributeResolution9.js +@@= skipped -32, +32 lines =@@ + class MyComponent { + render() { + } ++ props; + } + exports.MyComponent = MyComponent; + ; // ok \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.symbols b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.symbols new file mode 100644 index 0000000000..3bfc66bf67 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.symbols @@ -0,0 +1,48 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution9.tsx] //// + +=== react.d.ts === +declare module JSX { +>JSX : Symbol(JSX, Decl(react.d.ts, 0, 0)) + + interface Element { } +>Element : Symbol(Element, Decl(react.d.ts, 0, 20)) + + interface IntrinsicElements { +>IntrinsicElements : Symbol(IntrinsicElements, Decl(react.d.ts, 1, 22)) + } + interface ElementAttributesProperty { +>ElementAttributesProperty : Symbol(ElementAttributesProperty, Decl(react.d.ts, 3, 2)) + + props; +>props : Symbol(ElementAttributesProperty.props, Decl(react.d.ts, 4, 38)) + } +} + +interface Props { +>Props : Symbol(Props, Decl(react.d.ts, 7, 1)) + + foo: string; +>foo : Symbol(Props.foo, Decl(react.d.ts, 9, 17)) +} + +=== file.tsx === +export class MyComponent { +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) + + render() { +>render : Symbol(MyComponent.render, Decl(file.tsx, 0, 26)) + } + + props: { foo: string; } +>props : Symbol(MyComponent.props, Decl(file.tsx, 2, 3)) +>foo : Symbol(foo, Decl(file.tsx, 4, 10)) +} + +; // ok +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) +>foo : Symbol(foo, Decl(file.tsx, 7, 12)) + +; // should be an error +>MyComponent : Symbol(MyComponent, Decl(file.tsx, 0, 0)) +>foo : Symbol(foo, Decl(file.tsx, 8, 12)) + diff --git a/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.types b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.types new file mode 100644 index 0000000000..462db8a823 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxAttributeResolution9.types @@ -0,0 +1,42 @@ +//// [tests/cases/conformance/jsx/tsxAttributeResolution9.tsx] //// + +=== react.d.ts === +declare module JSX { + interface Element { } + interface IntrinsicElements { + } + interface ElementAttributesProperty { + props; +>props : any + } +} + +interface Props { + foo: string; +>foo : string +} + +=== file.tsx === +export class MyComponent { +>MyComponent : MyComponent + + render() { +>render : () => void + } + + props: { foo: string; } +>props : { foo: string; } +>foo : string +} + +; // ok +> : JSX.Element +>MyComponent : typeof MyComponent +>foo : string + +; // should be an error +> : JSX.Element +>MyComponent : typeof MyComponent +>foo : number +>0 : 0 + diff --git a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName5.js b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName5.js index ab0acea61f..d333dc91fe 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName5.js +++ b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName5.js @@ -20,9 +20,42 @@ export class Text extends React.Component<{}, {}> { //// [app.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Text = void 0; -const React = require("react"); +const React = __importStar(require("react")); class Text extends React.Component { _tagName = 'div'; render() { diff --git a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName5.js.diff b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName5.js.diff index 8b3791148a..9f9727ad48 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName5.js.diff +++ b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName5.js.diff @@ -1,11 +1,11 @@ --- old.tsxDynamicTagName5.js +++ new.tsxDynamicTagName5.js -@@= skipped -21, +21 lines =@@ - "use strict"; +@@= skipped -54, +54 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Text = void 0; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); class Text extends React.Component { - constructor() { - super(...arguments); diff --git a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName7.js b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName7.js index 880acd1ed2..54fb21d210 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName7.js +++ b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName7.js @@ -20,9 +20,42 @@ export class Text extends React.Component<{}, {}> { //// [app.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Text = void 0; -const React = require("react"); +const React = __importStar(require("react")); class Text extends React.Component { _tagName = 'div'; render() { diff --git a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName7.js.diff b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName7.js.diff index d300173d96..ed980eb0f0 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName7.js.diff +++ b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName7.js.diff @@ -1,11 +1,11 @@ --- old.tsxDynamicTagName7.js +++ new.tsxDynamicTagName7.js -@@= skipped -21, +21 lines =@@ - "use strict"; +@@= skipped -54, +54 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Text = void 0; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); class Text extends React.Component { - constructor() { - super(...arguments); diff --git a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName8.js b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName8.js index ff90465586..a6f6d36899 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName8.js +++ b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName8.js @@ -20,9 +20,42 @@ export class Text extends React.Component<{}, {}> { //// [app.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Text = void 0; -const React = require("react"); +const React = __importStar(require("react")); class Text extends React.Component { _tagName = 'div'; render() { diff --git a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName8.js.diff b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName8.js.diff index e906dc3dc5..95b06f0074 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName8.js.diff +++ b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName8.js.diff @@ -1,11 +1,11 @@ --- old.tsxDynamicTagName8.js +++ new.tsxDynamicTagName8.js -@@= skipped -21, +21 lines =@@ - "use strict"; +@@= skipped -54, +54 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Text = void 0; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); class Text extends React.Component { - constructor() { - super(...arguments); diff --git a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName9.js b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName9.js index 87436fb1c7..c9eb03c1f6 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName9.js +++ b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName9.js @@ -20,9 +20,42 @@ export class Text extends React.Component<{}, {}> { //// [app.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Text = void 0; -const React = require("react"); +const React = __importStar(require("react")); class Text extends React.Component { _tagName = 'div'; render() { diff --git a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName9.js.diff b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName9.js.diff index 5789ef22d2..78677cef24 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName9.js.diff +++ b/testdata/baselines/reference/submodule/conformance/tsxDynamicTagName9.js.diff @@ -1,11 +1,11 @@ --- old.tsxDynamicTagName9.js +++ new.tsxDynamicTagName9.js -@@= skipped -21, +21 lines =@@ - "use strict"; +@@= skipped -54, +54 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Text = void 0; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); class Text extends React.Component { - constructor() { - super(...arguments); diff --git a/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.js b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.js new file mode 100644 index 0000000000..d92bc190ae --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.js @@ -0,0 +1,68 @@ +//// [tests/cases/conformance/jsx/tsxElementResolution19.tsx] //// + +//// [react.d.ts] +declare module "react" { + +} + +//// [file1.tsx] +declare module JSX { + interface Element { } +} +export class MyClass { } + +//// [file2.tsx] +// Should not elide React import +import * as React from 'react'; +import {MyClass} from './file1'; + +; + + +//// [file1.js] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MyClass = void 0; +class MyClass { +} +exports.MyClass = MyClass; +//// [file2.js] +"use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +Object.defineProperty(exports, "__esModule", { value: true }); +// Should not elide React import +const React = __importStar(require("react")); +const file1_1 = require("./file1"); +React.createElement(file1_1.MyClass, null); diff --git a/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.js.diff b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.js.diff new file mode 100644 index 0000000000..13734f9ea6 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.js.diff @@ -0,0 +1,11 @@ +--- old.tsxElementResolution19.js ++++ new.tsxElementResolution19.js +@@= skipped -62, +62 lines =@@ + })(); + Object.defineProperty(exports, "__esModule", { value: true }); + // Should not elide React import +-var React = __importStar(require("react")); +-var file1_1 = require("./file1"); ++const React = __importStar(require("react")); ++const file1_1 = require("./file1"); + React.createElement(file1_1.MyClass, null); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.symbols b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.symbols new file mode 100644 index 0000000000..e437b2d312 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.symbols @@ -0,0 +1,29 @@ +//// [tests/cases/conformance/jsx/tsxElementResolution19.tsx] //// + +=== react.d.ts === +declare module "react" { +>"react" : Symbol("react", Decl(react.d.ts, 0, 0)) + +} + +=== file1.tsx === +declare module JSX { +>JSX : Symbol(JSX, Decl(file1.tsx, 0, 0)) + + interface Element { } +>Element : Symbol(Element, Decl(file1.tsx, 0, 20)) +} +export class MyClass { } +>MyClass : Symbol(MyClass, Decl(file1.tsx, 2, 1)) + +=== file2.tsx === +// Should not elide React import +import * as React from 'react'; +>React : Symbol(React, Decl(file2.tsx, 1, 6)) + +import {MyClass} from './file1'; +>MyClass : Symbol(MyClass, Decl(file2.tsx, 2, 8)) + +; +>MyClass : Symbol(MyClass, Decl(file2.tsx, 2, 8)) + diff --git a/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.types b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.types new file mode 100644 index 0000000000..239629be63 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.types @@ -0,0 +1,27 @@ +//// [tests/cases/conformance/jsx/tsxElementResolution19.tsx] //// + +=== react.d.ts === +declare module "react" { +>"react" : typeof import("react") + +} + +=== file1.tsx === +declare module JSX { + interface Element { } +} +export class MyClass { } +>MyClass : MyClass + +=== file2.tsx === +// Should not elide React import +import * as React from 'react'; +>React : typeof React + +import {MyClass} from './file1'; +>MyClass : typeof MyClass + +; +> : any +>MyClass : typeof MyClass + diff --git a/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.types.diff b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.types.diff new file mode 100644 index 0000000000..d7bcb9c49b --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxElementResolution19.types.diff @@ -0,0 +1,9 @@ +--- old.tsxElementResolution19.types ++++ new.tsxElementResolution19.types +@@= skipped -21, +21 lines =@@ + >MyClass : typeof MyClass + + ; +-> : error ++> : any + >MyClass : typeof MyClass diff --git a/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit1.js b/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit1.js index a3dc49ff95..7a83398916 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit1.js +++ b/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit1.js @@ -32,9 +32,42 @@ export class Button extends React.Component { //// [button.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Button = void 0; -const React = require("react"); +const React = __importStar(require("react")); class Button extends React.Component { render() { return ; @@ -43,9 +76,42 @@ class Button extends React.Component { exports.Button = Button; //// [app.jsx] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.App = void 0; -const React = require("react"); +const React = __importStar(require("react")); // Should see var button_1 = require('./button') here const button_1 = require("./button"); class App extends React.Component { diff --git a/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit1.js.diff b/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit1.js.diff index 456a125e00..1b7535e354 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit1.js.diff +++ b/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit1.js.diff @@ -1,20 +1,20 @@ --- old.tsxExternalModuleEmit1.js +++ new.tsxExternalModuleEmit1.js -@@= skipped -33, +33 lines =@@ - "use strict"; +@@= skipped -66, +66 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Button = void 0; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); class Button extends React.Component { render() { return ; -@@= skipped -11, +11 lines =@@ - "use strict"; +@@= skipped -44, +44 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); exports.App = void 0; --var React = require("react"); -+const React = require("react"); +-var React = __importStar(require("react")); ++const React = __importStar(require("react")); // Should see var button_1 = require('./button') here -var button_1 = require("./button"); +const button_1 = require("./button"); diff --git a/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit2.js b/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit2.js index 13b136d219..bf90371a66 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit2.js +++ b/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit2.js @@ -29,8 +29,11 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const mod_1 = require("mod"); +const mod_1 = __importDefault(require("mod")); // Should see mod_1['default'] in emit here React.createElement(Foo, { handler: mod_1.default }); // Should see mod_1['default'] in emit here diff --git a/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit2.js.diff b/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit2.js.diff index eaa8490d6b..e2caf49b28 100644 --- a/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit2.js.diff +++ b/testdata/baselines/reference/submodule/conformance/tsxExternalModuleEmit2.js.diff @@ -1,11 +1,11 @@ --- old.tsxExternalModuleEmit2.js +++ new.tsxExternalModuleEmit2.js -@@= skipped -29, +29 lines =@@ - return __assign.apply(this, arguments); +@@= skipped -32, +32 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); --var mod_1 = require("mod"); -+const mod_1 = require("mod"); +-var mod_1 = __importDefault(require("mod")); ++const mod_1 = __importDefault(require("mod")); // Should see mod_1['default'] in emit here React.createElement(Foo, { handler: mod_1.default }); // Should see mod_1['default'] in emit here \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.errors.txt b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.errors.txt new file mode 100644 index 0000000000..5826a14fcd --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.errors.txt @@ -0,0 +1,23 @@ +file.tsx(9,14): error TS2786: 'Foo' cannot be used as a JSX component. + Its return type 'undefined' is not a valid JSX element. +file.tsx(10,12): error TS2786: 'Greet' cannot be used as a JSX component. + Its return type 'undefined' is not a valid JSX element. + + +==== file.tsx (2 errors) ==== + import React = require('react'); + + const Foo = (props: any) => undefined; + function Greet(x: {name?: string}) { + return undefined; + } + + // Error + const foo = ; + ~~~ +!!! error TS2786: 'Foo' cannot be used as a JSX component. +!!! error TS2786: Its return type 'undefined' is not a valid JSX element. + const G = ; + ~~~~~ +!!! error TS2786: 'Greet' cannot be used as a JSX component. +!!! error TS2786: Its return type 'undefined' is not a valid JSX element. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.js b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.js new file mode 100644 index 0000000000..b8735dd73c --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.js @@ -0,0 +1,25 @@ +//// [tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx] //// + +//// [file.tsx] +import React = require('react'); + +const Foo = (props: any) => undefined; +function Greet(x: {name?: string}) { + return undefined; +} + +// Error +const foo = ; +const G = ; + +//// [file.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const React = require("react"); +const Foo = (props) => undefined; +function Greet(x) { + return undefined; +} +// Error +const foo = ; +const G = ; diff --git a/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.js.diff b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.js.diff new file mode 100644 index 0000000000..07fe1bb435 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.js.diff @@ -0,0 +1,11 @@ +--- old.tsxSfcReturnUndefinedStrictNullChecks.js ++++ new.tsxSfcReturnUndefinedStrictNullChecks.js +@@= skipped -14, +14 lines =@@ + //// [file.jsx] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-var React = require("react"); ++const React = require("react"); + const Foo = (props) => undefined; + function Greet(x) { + return undefined; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.symbols b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.symbols new file mode 100644 index 0000000000..91d7762217 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.symbols @@ -0,0 +1,29 @@ +//// [tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx] //// + +=== file.tsx === +import React = require('react'); +>React : Symbol(React, Decl(file.tsx, 0, 0)) + +const Foo = (props: any) => undefined; +>Foo : Symbol(Foo, Decl(file.tsx, 2, 5)) +>props : Symbol(props, Decl(file.tsx, 2, 13)) +>undefined : Symbol(undefined) + +function Greet(x: {name?: string}) { +>Greet : Symbol(Greet, Decl(file.tsx, 2, 38)) +>x : Symbol(x, Decl(file.tsx, 3, 15)) +>name : Symbol(name, Decl(file.tsx, 3, 19)) + + return undefined; +>undefined : Symbol(undefined) +} + +// Error +const foo = ; +>foo : Symbol(foo, Decl(file.tsx, 8, 5)) +>Foo : Symbol(Foo, Decl(file.tsx, 2, 5)) + +const G = ; +>G : Symbol(G, Decl(file.tsx, 9, 5)) +>Greet : Symbol(Greet, Decl(file.tsx, 2, 38)) + diff --git a/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.types b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.types new file mode 100644 index 0000000000..3e702b87b5 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.types @@ -0,0 +1,32 @@ +//// [tests/cases/conformance/jsx/tsxSfcReturnUndefinedStrictNullChecks.tsx] //// + +=== file.tsx === +import React = require('react'); +>React : typeof React + +const Foo = (props: any) => undefined; +>Foo : (props: any) => undefined +>(props: any) => undefined : (props: any) => undefined +>props : any +>undefined : undefined + +function Greet(x: {name?: string}) { +>Greet : (x: { name?: string | undefined; }) => undefined +>x : { name?: string | undefined; } +>name : string | undefined + + return undefined; +>undefined : undefined +} + +// Error +const foo = ; +>foo : JSX.Element +> : JSX.Element +>Foo : (props: any) => undefined + +const G = ; +>G : JSX.Element +> : JSX.Element +>Greet : (x: { name?: string | undefined; }) => undefined + diff --git a/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.types.diff b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.types.diff new file mode 100644 index 0000000000..f5111867c7 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxSfcReturnUndefinedStrictNullChecks.types.diff @@ -0,0 +1,19 @@ +--- old.tsxSfcReturnUndefinedStrictNullChecks.types ++++ new.tsxSfcReturnUndefinedStrictNullChecks.types +@@= skipped -10, +10 lines =@@ + >undefined : undefined + + function Greet(x: {name?: string}) { +->Greet : (x: { name?: string; }) => undefined +->x : { name?: string; } ++>Greet : (x: { name?: string | undefined; }) => undefined ++>x : { name?: string | undefined; } + >name : string | undefined + + return undefined; +@@= skipped -17, +17 lines =@@ + const G = ; + >G : JSX.Element + > : JSX.Element +->Greet : (x: { name?: string; }) => undefined ++>Greet : (x: { name?: string | undefined; }) => undefined diff --git a/testdata/baselines/reference/submodule/conformance/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt.diff deleted file mode 100644 index f48d3c13b3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt -+++ new.tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es2015).errors.txt -@@= skipped -0, +0 lines =@@ --tsxSpreadChildrenInvalidType.tsx(17,12): error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+tsxSpreadChildrenInvalidType.tsx(17,12): error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - tsxSpreadChildrenInvalidType.tsx(21,9): error TS2609: JSX spread child must be an array type. - - -@@= skipped -20, +20 lines =@@ - function Todo(prop: { key: number, todo: string }) { - return
{prop.key.toString() + prop.todo}
; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --!!! error TS2792: Cannot find module 'react/jsx-runtime'. Did you mean to set the 'moduleResolution' option to 'nodenext', or to add aliases to the 'paths' option? -+!!! error TS2875: This JSX tag requires the module path 'react/jsx-runtime' to exist, but none could be found. Make sure you have types for the appropriate package installed. - } - function TodoList({ todos }: TodoListProps) { - return
\ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.errors.txt b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.errors.txt new file mode 100644 index 0000000000..81a5807ab3 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.errors.txt @@ -0,0 +1,144 @@ +file.tsx(12,22): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. + Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. +file.tsx(13,13): error TS2769: No overload matches this call. + The last overload gave the following error. + Property 'yy1' is missing in type '{ yy: number; }' but required in type '{ yy: number; yy1: string; }'. +file.tsx(14,31): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'boolean' is not assignable to type 'string'. +file.tsx(16,31): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ yy: number; yy1: string; y1: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. + Property 'y1' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. +file.tsx(17,13): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ yy1: string; yy: boolean; }' is not assignable to type '{ yy: number; yy1: string; }'. + Types of property 'yy' are incompatible. + Type 'boolean' is not assignable to type 'number'. +file.tsx(25,13): error TS2769: No overload matches this call. + The last overload gave the following error. + Property 'yy' is missing in type '{ "extra-data": true; }' but required in type '{ yy: string; direction?: number; }'. +file.tsx(26,40): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'string' is not assignable to type 'number'. +file.tsx(33,32): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'string' is not assignable to type 'boolean'. +file.tsx(34,29): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'string' is not assignable to type 'boolean'. +file.tsx(35,29): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'string' is not assignable to type 'boolean'. +file.tsx(36,29): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'string' is not assignable to type 'boolean'. + + +==== file.tsx (11 errors) ==== + import React = require('react') + declare function OneThing(): JSX.Element; + declare function OneThing(l: {yy: number, yy1: string}): JSX.Element; + + let obj = { + yy: 10, + yy1: "hello" + } + let obj2: any; + + // Error + const c0 = ; // extra property; + ~~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. +!!! error TS2769: Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. +!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c1 = ; // missing property; + ~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Property 'yy1' is missing in type '{ yy: number; }' but required in type '{ yy: number; yy1: string; }'. +!!! related TS2728 file.tsx:3:43: 'yy1' is declared here. +!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c2 = ; // type incompatible; + ~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +!!! related TS6500 file.tsx:3:43: The expected type comes from property 'yy1' which is declared here on type 'IntrinsicAttributes & { yy: number; yy1: string; }' +!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c3 = ; // This is OK because all attribute are spread + const c4 = ; // extra property; + ~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ yy: number; yy1: string; y1: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. +!!! error TS2769: Property 'y1' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. +!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c5 = ; // type incompatible; + ~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ yy1: string; yy: boolean; }' is not assignable to type '{ yy: number; yy1: string; }'. +!!! error TS2769: Types of property 'yy' are incompatible. +!!! error TS2769: Type 'boolean' is not assignable to type 'number'. +!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c6 = ; // Should error as there is extra attribute that doesn't match any. Current it is not + const c7 = ; // Should error as there is extra attribute that doesn't match any. Current it is not + + declare function TestingOneThing(j: {"extra-data": string}): JSX.Element; + declare function TestingOneThing(n: {yy: string, direction?: number}): JSX.Element; + + // Error + const d1 = + ~~~~~~~~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Property 'yy' is missing in type '{ "extra-data": true; }' but required in type '{ yy: string; direction?: number; }'. +!!! related TS2728 file.tsx:22:38: 'yy' is declared here. +!!! related TS2771 file.tsx:22:18: The last overload is declared here. + const d2 = + ~~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'string' is not assignable to type 'number'. +!!! related TS6500 file.tsx:22:50: The expected type comes from property 'direction' which is declared here on type 'IntrinsicAttributes & { yy: string; direction?: number; }' +!!! related TS2771 file.tsx:22:18: The last overload is declared here. + + declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element; + declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Element}): JSX.Element; + declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JSX.Element; + + // Error + const e1 = + ~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'string' is not assignable to type 'boolean'. +!!! related TS6500 file.tsx:30:64: The expected type comes from property 'y3' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' +!!! related TS2771 file.tsx:30:18: The last overload is declared here. + const e2 = + ~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'string' is not assignable to type 'boolean'. +!!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' +!!! related TS2771 file.tsx:30:18: The last overload is declared here. + const e3 = + ~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'string' is not assignable to type 'boolean'. +!!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' +!!! related TS2771 file.tsx:30:18: The last overload is declared here. + const e4 = Hi + ~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'string' is not assignable to type 'boolean'. +!!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' +!!! related TS2771 file.tsx:30:18: The last overload is declared here. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.errors.txt.diff new file mode 100644 index 0000000000..bdb9658190 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.errors.txt.diff @@ -0,0 +1,254 @@ +--- old.tsxStatelessFunctionComponentOverload4.errors.txt ++++ new.tsxStatelessFunctionComponentOverload4.errors.txt +@@= skipped -0, +0 lines =@@ + file.tsx(12,22): error TS2769: No overload matches this call. +- Overload 1 of 2, '(): Element', gave the following error. +- Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes'. +- Property 'extraProp' does not exist on type 'IntrinsicAttributes'. +- Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++ The last overload gave the following error. + Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. + Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. + file.tsx(13,13): error TS2769: No overload matches this call. +- Overload 1 of 2, '(): Element', gave the following error. +- Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes'. +- Property 'yy' does not exist on type 'IntrinsicAttributes'. +- Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++ The last overload gave the following error. + Property 'yy1' is missing in type '{ yy: number; }' but required in type '{ yy: number; yy1: string; }'. + file.tsx(14,31): error TS2769: No overload matches this call. +- Overload 1 of 2, '(): Element', gave the following error. +- Type '{ yy: number; yy1: true; }' is not assignable to type 'IntrinsicAttributes'. +- Property 'yy1' does not exist on type 'IntrinsicAttributes'. +- Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++ The last overload gave the following error. + Type 'boolean' is not assignable to type 'string'. + file.tsx(16,31): error TS2769: No overload matches this call. +- Overload 1 of 2, '(): Element', gave the following error. +- Type '{ yy: number; yy1: string; y1: number; }' is not assignable to type 'IntrinsicAttributes'. +- Property 'y1' does not exist on type 'IntrinsicAttributes'. +- Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++ The last overload gave the following error. + Type '{ yy: number; yy1: string; y1: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. + Property 'y1' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. + file.tsx(17,13): error TS2769: No overload matches this call. +- Overload 1 of 2, '(): Element', gave the following error. +- Type '{ yy1: string; yy: boolean; }' has no properties in common with type 'IntrinsicAttributes'. +- Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++ The last overload gave the following error. + Type '{ yy1: string; yy: boolean; }' is not assignable to type '{ yy: number; yy1: string; }'. + Types of property 'yy' are incompatible. + Type 'boolean' is not assignable to type 'number'. + file.tsx(25,13): error TS2769: No overload matches this call. +- Overload 1 of 2, '(j: { "extra-data": string; }): Element', gave the following error. +- Type '{ "extra-data": true; }' is not assignable to type '{ "extra-data": string; }'. +- Types of property '"extra-data"' are incompatible. +- Type 'boolean' is not assignable to type 'string'. +- Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error. ++ The last overload gave the following error. + Property 'yy' is missing in type '{ "extra-data": true; }' but required in type '{ yy: string; direction?: number; }'. +-file.tsx(26,13): error TS2769: No overload matches this call. +- Overload 1 of 2, '(j: { "extra-data": string; }): Element', gave the following error. +- Type '{ yy: string; direction: string; }' is not assignable to type 'IntrinsicAttributes & { "extra-data": string; }'. +- Property 'yy' does not exist on type 'IntrinsicAttributes & { "extra-data": string; }'. +- Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error. ++file.tsx(26,40): error TS2769: No overload matches this call. ++ The last overload gave the following error. + Type 'string' is not assignable to type 'number'. +-file.tsx(33,13): error TS2769: No overload matches this call. +- Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. +- Type 'boolean' is not assignable to type 'string'. +- Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. +- Type 'boolean' is not assignable to type 'string'. +- Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. +- Type 'string' is not assignable to type 'boolean'. +-file.tsx(34,13): error TS2769: No overload matches this call. +- Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. +- Type '{ y1: string; y2: number; y3: true; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +- Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +- Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. +- Type '{ y1: string; y2: number; y3: true; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'. +- Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'. +- Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. +- Type 'string' is not assignable to type 'boolean'. +-file.tsx(35,13): error TS2769: No overload matches this call. +- Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. +- Type '{ y1: string; y2: number; children: string; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +- Property 'children' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +- Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. +- Type 'string' is not assignable to type 'Element'. +- Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. +- Type 'string' is not assignable to type 'boolean'. +-file.tsx(36,13): error TS2769: No overload matches this call. +- Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. +- Type '{ y1: string; y2: number; children: string; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +- Property 'children' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +- Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. +- 'TestingOptional' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element'. +- Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. ++file.tsx(33,32): error TS2769: No overload matches this call. ++ The last overload gave the following error. ++ Type 'string' is not assignable to type 'boolean'. ++file.tsx(34,29): error TS2769: No overload matches this call. ++ The last overload gave the following error. ++ Type 'string' is not assignable to type 'boolean'. ++file.tsx(35,29): error TS2769: No overload matches this call. ++ The last overload gave the following error. ++ Type 'string' is not assignable to type 'boolean'. ++file.tsx(36,29): error TS2769: No overload matches this call. ++ The last overload gave the following error. + Type 'string' is not assignable to type 'boolean'. + + +@@= skipped -92, +51 lines =@@ + const c0 = ; // extra property; + ~~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(): Element', gave the following error. +-!!! error TS2769: Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes'. +-!!! error TS2769: Property 'extraProp' does not exist on type 'IntrinsicAttributes'. +-!!! error TS2769: Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ extraProp: true; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. + !!! error TS2769: Property 'extraProp' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. ++!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c1 = ; // missing property; + ~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(): Element', gave the following error. +-!!! error TS2769: Type '{ yy: number; }' is not assignable to type 'IntrinsicAttributes'. +-!!! error TS2769: Property 'yy' does not exist on type 'IntrinsicAttributes'. +-!!! error TS2769: Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Property 'yy1' is missing in type '{ yy: number; }' but required in type '{ yy: number; yy1: string; }'. + !!! related TS2728 file.tsx:3:43: 'yy1' is declared here. ++!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c2 = ; // type incompatible; + ~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(): Element', gave the following error. +-!!! error TS2769: Type '{ yy: number; yy1: true; }' is not assignable to type 'IntrinsicAttributes'. +-!!! error TS2769: Property 'yy1' does not exist on type 'IntrinsicAttributes'. +-!!! error TS2769: Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type 'boolean' is not assignable to type 'string'. + !!! related TS6500 file.tsx:3:43: The expected type comes from property 'yy1' which is declared here on type 'IntrinsicAttributes & { yy: number; yy1: string; }' ++!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c3 = ; // This is OK because all attribute are spread + const c4 = ; // extra property; + ~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(): Element', gave the following error. +-!!! error TS2769: Type '{ yy: number; yy1: string; y1: number; }' is not assignable to type 'IntrinsicAttributes'. +-!!! error TS2769: Property 'y1' does not exist on type 'IntrinsicAttributes'. +-!!! error TS2769: Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ yy: number; yy1: string; y1: number; }' is not assignable to type 'IntrinsicAttributes & { yy: number; yy1: string; }'. + !!! error TS2769: Property 'y1' does not exist on type 'IntrinsicAttributes & { yy: number; yy1: string; }'. ++!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c5 = ; // type incompatible; + ~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(): Element', gave the following error. +-!!! error TS2769: Type '{ yy1: string; yy: boolean; }' has no properties in common with type 'IntrinsicAttributes'. +-!!! error TS2769: Overload 2 of 2, '(l: { yy: number; yy1: string; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ yy1: string; yy: boolean; }' is not assignable to type '{ yy: number; yy1: string; }'. + !!! error TS2769: Types of property 'yy' are incompatible. + !!! error TS2769: Type 'boolean' is not assignable to type 'number'. ++!!! related TS2771 file.tsx:3:18: The last overload is declared here. + const c6 = ; // Should error as there is extra attribute that doesn't match any. Current it is not + const c7 = ; // Should error as there is extra attribute that doesn't match any. Current it is not + +@@= skipped -53, +44 lines =@@ + const d1 = + ~~~~~~~~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(j: { "extra-data": string; }): Element', gave the following error. +-!!! error TS2769: Type '{ "extra-data": true; }' is not assignable to type '{ "extra-data": string; }'. +-!!! error TS2769: Types of property '"extra-data"' are incompatible. +-!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +-!!! error TS2769: Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Property 'yy' is missing in type '{ "extra-data": true; }' but required in type '{ yy: string; direction?: number; }'. + !!! related TS2728 file.tsx:22:38: 'yy' is declared here. ++!!! related TS2771 file.tsx:22:18: The last overload is declared here. + const d2 = +- ~~~~~~~~~~~~~~~ ++ ~~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 2, '(j: { "extra-data": string; }): Element', gave the following error. +-!!! error TS2769: Type '{ yy: string; direction: string; }' is not assignable to type 'IntrinsicAttributes & { "extra-data": string; }'. +-!!! error TS2769: Property 'yy' does not exist on type 'IntrinsicAttributes & { "extra-data": string; }'. +-!!! error TS2769: Overload 2 of 2, '(n: { yy: string; direction?: number; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type 'string' is not assignable to type 'number'. + !!! related TS6500 file.tsx:22:50: The expected type comes from property 'direction' which is declared here on type 'IntrinsicAttributes & { yy: string; direction?: number; }' ++!!! related TS2771 file.tsx:22:18: The last overload is declared here. + + declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element; + declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Element}): JSX.Element; +@@= skipped -23, +18 lines =@@ + + // Error + const e1 = +- ~~~~~~~~~~~~~~~ ++ ~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. +-!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +-!!! error TS2769: Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. +-!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +-!!! error TS2769: Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type 'string' is not assignable to type 'boolean'. +-!!! related TS6500 file.tsx:28:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; }' +-!!! related TS6500 file.tsx:29:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }' + !!! related TS6500 file.tsx:30:64: The expected type comes from property 'y3' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' ++!!! related TS2771 file.tsx:30:18: The last overload is declared here. + const e2 = +- ~~~~~~~~~~~~~~~ ++ ~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. +-!!! error TS2769: Type '{ y1: string; y2: number; y3: true; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +-!!! error TS2769: Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +-!!! error TS2769: Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. +-!!! error TS2769: Type '{ y1: string; y2: number; y3: true; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'. +-!!! error TS2769: Property 'y3' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }'. +-!!! error TS2769: Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type 'string' is not assignable to type 'boolean'. + !!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' ++!!! related TS2771 file.tsx:30:18: The last overload is declared here. + const e3 = +- ~~~~~~~~~~~~~~~ ++ ~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. +-!!! error TS2769: Type '{ y1: string; y2: number; children: string; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +-!!! error TS2769: Property 'children' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +-!!! error TS2769: Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. +-!!! error TS2769: Type 'string' is not assignable to type 'Element'. +-!!! error TS2769: Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type 'string' is not assignable to type 'boolean'. +-!!! related TS6500 file.tsx:29:64: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }' + !!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' ++!!! related TS2771 file.tsx:30:18: The last overload is declared here. + const e4 = Hi +- ~~~~~~~~~~~~~~~ ++ ~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(a: { y1?: string; y2?: number; }): Element', gave the following error. +-!!! error TS2769: Type '{ y1: string; y2: number; children: string; }' is not assignable to type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +-!!! error TS2769: Property 'children' does not exist on type 'IntrinsicAttributes & { y1?: string; y2?: number; }'. +-!!! error TS2769: Overload 2 of 3, '(a: { y1?: string; y2?: number; children: Element; }): Element', gave the following error. +-!!! error TS2769: 'TestingOptional' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of 'children' is 'Element'. +-!!! error TS2769: Overload 3 of 3, '(a: { y1: boolean; y2?: number; y3: boolean; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type 'string' is not assignable to type 'boolean'. +-!!! related TS6500 file.tsx:29:64: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & { y1?: string; y2?: number; children: Element; }' + !!! related TS6500 file.tsx:30:38: The expected type comes from property 'y1' which is declared here on type 'IntrinsicAttributes & { y1: boolean; y2?: number; y3: boolean; }' ++!!! related TS2771 file.tsx:30:18: The last overload is declared here. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.js b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.js new file mode 100644 index 0000000000..d77bf94be3 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.js @@ -0,0 +1,67 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx] //// + +//// [file.tsx] +import React = require('react') +declare function OneThing(): JSX.Element; +declare function OneThing(l: {yy: number, yy1: string}): JSX.Element; + +let obj = { + yy: 10, + yy1: "hello" +} +let obj2: any; + +// Error +const c0 = ; // extra property; +const c1 = ; // missing property; +const c2 = ; // type incompatible; +const c3 = ; // This is OK because all attribute are spread +const c4 = ; // extra property; +const c5 = ; // type incompatible; +const c6 = ; // Should error as there is extra attribute that doesn't match any. Current it is not +const c7 = ; // Should error as there is extra attribute that doesn't match any. Current it is not + +declare function TestingOneThing(j: {"extra-data": string}): JSX.Element; +declare function TestingOneThing(n: {yy: string, direction?: number}): JSX.Element; + +// Error +const d1 = +const d2 = + +declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element; +declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Element}): JSX.Element; +declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JSX.Element; + +// Error +const e1 = +const e2 = +const e3 = +const e4 = Hi + + +//// [file.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const React = require("react"); +let obj = { + yy: 10, + yy1: "hello" +}; +let obj2; +// Error +const c0 = ; // extra property; +const c1 = ; // missing property; +const c2 = ; // type incompatible; +const c3 = ; // This is OK because all attribute are spread +const c4 = ; // extra property; +const c5 = ; // type incompatible; +const c6 = ; // Should error as there is extra attribute that doesn't match any. Current it is not +const c7 = ; // Should error as there is extra attribute that doesn't match any. Current it is not +// Error +const d1 = ; +const d2 = ; +// Error +const e1 = ; +const e2 = ; +const e3 = ; +const e4 = Hi; diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.js.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.js.diff new file mode 100644 index 0000000000..f973519b54 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.js.diff @@ -0,0 +1,11 @@ +--- old.tsxStatelessFunctionComponentOverload4.js ++++ new.tsxStatelessFunctionComponentOverload4.js +@@= skipped -41, +41 lines =@@ + //// [file.jsx] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-var React = require("react"); ++const React = require("react"); + let obj = { + yy: 10, + yy1: "hello" \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.symbols b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.symbols new file mode 100644 index 0000000000..b2d468e69d --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.symbols @@ -0,0 +1,161 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx] //// + +=== file.tsx === +import React = require('react') +>React : Symbol(React, Decl(file.tsx, 0, 0)) + +declare function OneThing(): JSX.Element; +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +declare function OneThing(l: {yy: number, yy1: string}): JSX.Element; +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>l : Symbol(l, Decl(file.tsx, 2, 26)) +>yy : Symbol(yy, Decl(file.tsx, 2, 30)) +>yy1 : Symbol(yy1, Decl(file.tsx, 2, 41)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +let obj = { +>obj : Symbol(obj, Decl(file.tsx, 4, 3)) + + yy: 10, +>yy : Symbol(yy, Decl(file.tsx, 4, 11)) + + yy1: "hello" +>yy1 : Symbol(yy1, Decl(file.tsx, 5, 11)) +} +let obj2: any; +>obj2 : Symbol(obj2, Decl(file.tsx, 8, 3)) + +// Error +const c0 = ; // extra property; +>c0 : Symbol(c0, Decl(file.tsx, 11, 5)) +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>extraProp : Symbol(extraProp, Decl(file.tsx, 11, 20)) + +const c1 = ; // missing property; +>c1 : Symbol(c1, Decl(file.tsx, 12, 5)) +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>yy : Symbol(yy, Decl(file.tsx, 12, 20)) + +const c2 = ; // type incompatible; +>c2 : Symbol(c2, Decl(file.tsx, 13, 5)) +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>obj : Symbol(obj, Decl(file.tsx, 4, 3)) +>yy1 : Symbol(yy1, Decl(file.tsx, 13, 29)) + +const c3 = ; // This is OK because all attribute are spread +>c3 : Symbol(c3, Decl(file.tsx, 14, 5)) +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>obj : Symbol(obj, Decl(file.tsx, 4, 3)) +>extra : Symbol(extra, Decl(file.tsx, 14, 35)) + +const c4 = ; // extra property; +>c4 : Symbol(c4, Decl(file.tsx, 15, 5)) +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>obj : Symbol(obj, Decl(file.tsx, 4, 3)) +>y1 : Symbol(y1, Decl(file.tsx, 15, 29)) + +const c5 = ; // type incompatible; +>c5 : Symbol(c5, Decl(file.tsx, 16, 5)) +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>obj : Symbol(obj, Decl(file.tsx, 4, 3)) +>yy : Symbol(yy, Decl(file.tsx, 16, 35)) + +const c6 = ; // Should error as there is extra attribute that doesn't match any. Current it is not +>c6 : Symbol(c6, Decl(file.tsx, 17, 5)) +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>obj2 : Symbol(obj2, Decl(file.tsx, 8, 3)) +>extra : Symbol(extra, Decl(file.tsx, 17, 36)) + +const c7 = ; // Should error as there is extra attribute that doesn't match any. Current it is not +>c7 : Symbol(c7, Decl(file.tsx, 18, 5)) +>OneThing : Symbol(OneThing, Decl(file.tsx, 0, 31), Decl(file.tsx, 1, 41)) +>obj2 : Symbol(obj2, Decl(file.tsx, 8, 3)) +>yy : Symbol(yy, Decl(file.tsx, 18, 30)) + +declare function TestingOneThing(j: {"extra-data": string}): JSX.Element; +>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73)) +>j : Symbol(j, Decl(file.tsx, 20, 33)) +>"extra-data" : Symbol("extra-data", Decl(file.tsx, 20, 37)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +declare function TestingOneThing(n: {yy: string, direction?: number}): JSX.Element; +>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73)) +>n : Symbol(n, Decl(file.tsx, 21, 33)) +>yy : Symbol(yy, Decl(file.tsx, 21, 37)) +>direction : Symbol(direction, Decl(file.tsx, 21, 48)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +// Error +const d1 = +>d1 : Symbol(d1, Decl(file.tsx, 24, 5)) +>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73)) +>extra-data : Symbol(extra-data, Decl(file.tsx, 24, 27)) + +const d2 = +>d2 : Symbol(d2, Decl(file.tsx, 25, 5)) +>TestingOneThing : Symbol(TestingOneThing, Decl(file.tsx, 18, 37), Decl(file.tsx, 20, 73)) +>yy : Symbol(yy, Decl(file.tsx, 25, 27)) +>direction : Symbol(direction, Decl(file.tsx, 25, 38)) + +declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element; +>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100)) +>a : Symbol(a, Decl(file.tsx, 27, 33)) +>y1 : Symbol(y1, Decl(file.tsx, 27, 37)) +>y2 : Symbol(y2, Decl(file.tsx, 27, 49)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Element}): JSX.Element; +>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100)) +>a : Symbol(a, Decl(file.tsx, 28, 33)) +>y1 : Symbol(y1, Decl(file.tsx, 28, 37)) +>y2 : Symbol(y2, Decl(file.tsx, 28, 49)) +>children : Symbol(children, Decl(file.tsx, 28, 62)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JSX.Element; +>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100)) +>a : Symbol(a, Decl(file.tsx, 29, 33)) +>y1 : Symbol(y1, Decl(file.tsx, 29, 37)) +>y2 : Symbol(y2, Decl(file.tsx, 29, 49)) +>y3 : Symbol(y3, Decl(file.tsx, 29, 62)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +// Error +const e1 = +>e1 : Symbol(e1, Decl(file.tsx, 32, 5)) +>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100)) +>y1 : Symbol(y1, Decl(file.tsx, 32, 27)) +>y3 : Symbol(y3, Decl(file.tsx, 32, 30)) + +const e2 = +>e2 : Symbol(e2, Decl(file.tsx, 33, 5)) +>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100)) +>y1 : Symbol(y1, Decl(file.tsx, 33, 27)) +>y2 : Symbol(y2, Decl(file.tsx, 33, 38)) +>y3 : Symbol(y3, Decl(file.tsx, 33, 48)) + +const e3 = +>e3 : Symbol(e3, Decl(file.tsx, 34, 5)) +>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100)) +>y1 : Symbol(y1, Decl(file.tsx, 34, 27)) +>y2 : Symbol(y2, Decl(file.tsx, 34, 38)) +>children : Symbol(children, Decl(file.tsx, 34, 48)) + +const e4 = Hi +>e4 : Symbol(e4, Decl(file.tsx, 35, 5)) +>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100)) +>y1 : Symbol(y1, Decl(file.tsx, 35, 27)) +>y2 : Symbol(y2, Decl(file.tsx, 35, 38)) +>TestingOptional : Symbol(TestingOptional, Decl(file.tsx, 25, 58), Decl(file.tsx, 27, 77), Decl(file.tsx, 28, 100)) + diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.types b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.types new file mode 100644 index 0000000000..2a66538ede --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload4.types @@ -0,0 +1,181 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload4.tsx] //// + +=== file.tsx === +import React = require('react') +>React : typeof React + +declare function OneThing(): JSX.Element; +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>JSX : any + +declare function OneThing(l: {yy: number, yy1: string}): JSX.Element; +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>l : { yy: number; yy1: string; } +>yy : number +>yy1 : string +>JSX : any + +let obj = { +>obj : { yy: number; yy1: string; } +>{ yy: 10, yy1: "hello"} : { yy: number; yy1: string; } + + yy: 10, +>yy : number +>10 : 10 + + yy1: "hello" +>yy1 : string +>"hello" : "hello" +} +let obj2: any; +>obj2 : any + +// Error +const c0 = ; // extra property; +>c0 : JSX.Element +> : JSX.Element +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>extraProp : true + +const c1 = ; // missing property; +>c1 : JSX.Element +> : JSX.Element +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>yy : number +>10 : 10 + +const c2 = ; // type incompatible; +>c2 : JSX.Element +> : JSX.Element +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>obj : { yy: number; yy1: string; } +>yy1 : true + +const c3 = ; // This is OK because all attribute are spread +>c3 : JSX.Element +> : JSX.Element +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>obj : { yy: number; yy1: string; } +>{extra: "extra attr"} : { extra: string; } +>extra : string +>"extra attr" : "extra attr" + +const c4 = ; // extra property; +>c4 : JSX.Element +> : JSX.Element +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>obj : { yy: number; yy1: string; } +>y1 : number +>10000 : 10000 + +const c5 = ; // type incompatible; +>c5 : JSX.Element +> : JSX.Element +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>obj : { yy: number; yy1: string; } +>{yy: true} : { yy: boolean; } +>yy : boolean +>true : true + +const c6 = ; // Should error as there is extra attribute that doesn't match any. Current it is not +>c6 : JSX.Element +> : JSX.Element +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>obj2 : any +>{extra: "extra attr"} : { extra: string; } +>extra : string +>"extra attr" : "extra attr" + +const c7 = ; // Should error as there is extra attribute that doesn't match any. Current it is not +>c7 : JSX.Element +> : JSX.Element +>OneThing : { (): JSX.Element; (l: { yy: number; yy1: string; }): JSX.Element; } +>obj2 : any +>yy : true + +declare function TestingOneThing(j: {"extra-data": string}): JSX.Element; +>TestingOneThing : { (j: { "extra-data": string; }): JSX.Element; (n: { yy: string; direction?: number; }): JSX.Element; } +>j : { "extra-data": string; } +>"extra-data" : string +>JSX : any + +declare function TestingOneThing(n: {yy: string, direction?: number}): JSX.Element; +>TestingOneThing : { (j: { "extra-data": string; }): JSX.Element; (n: { yy: string; direction?: number; }): JSX.Element; } +>n : { yy: string; direction?: number; } +>yy : string +>direction : number +>JSX : any + +// Error +const d1 = +>d1 : JSX.Element +> : JSX.Element +>TestingOneThing : { (j: { "extra-data": string; }): JSX.Element; (n: { yy: string; direction?: number; }): JSX.Element; } +>extra-data : true + +const d2 = +>d2 : JSX.Element +> : JSX.Element +>TestingOneThing : { (j: { "extra-data": string; }): JSX.Element; (n: { yy: string; direction?: number; }): JSX.Element; } +>yy : string +>direction : string + +declare function TestingOptional(a: {y1?: string, y2?: number}): JSX.Element; +>TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; } +>a : { y1?: string; y2?: number; } +>y1 : string +>y2 : number +>JSX : any + +declare function TestingOptional(a: {y1?: string, y2?: number, children: JSX.Element}): JSX.Element; +>TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; } +>a : { y1?: string; y2?: number; children: JSX.Element; } +>y1 : string +>y2 : number +>children : JSX.Element +>JSX : any +>JSX : any + +declare function TestingOptional(a: {y1: boolean, y2?: number, y3: boolean}): JSX.Element; +>TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; } +>a : { y1: boolean; y2?: number; y3: boolean; } +>y1 : boolean +>y2 : number +>y3 : boolean +>JSX : any + +// Error +const e1 = +>e1 : JSX.Element +> : JSX.Element +>TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; } +>y1 : true +>y3 : string + +const e2 = +>e2 : JSX.Element +> : JSX.Element +>TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; } +>y1 : string +>y2 : number +>1000 : 1000 +>y3 : true + +const e3 = +>e3 : JSX.Element +> : JSX.Element +>TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; } +>y1 : string +>y2 : number +>1000 : 1000 +>children : string + +const e4 = Hi +>e4 : JSX.Element +>Hi : JSX.Element +>TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; } +>y1 : string +>y2 : number +>1000 : 1000 +>TestingOptional : { (a: { y1?: string; y2?: number; }): JSX.Element; (a: { y1?: string; y2?: number; children: JSX.Element; }): JSX.Element; (a: { y1: boolean; y2?: number; y3: boolean; }): JSX.Element; } + diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.errors.txt b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.errors.txt new file mode 100644 index 0000000000..1ea47289a5 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.errors.txt @@ -0,0 +1,100 @@ +file.tsx(48,24): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ to: string; onClick: (e: MouseEvent) => void; children: string; }' is not assignable to type 'IntrinsicAttributes & HyphenProps'. + Property 'to' does not exist on type 'IntrinsicAttributes & HyphenProps'. +file.tsx(54,51): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'number' is not assignable to type 'string'. +file.tsx(55,68): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'boolean' is not assignable to type 'string'. +file.tsx(56,13): error TS2769: No overload matches this call. + The last overload gave the following error. + Type '{ "data-format": true; }' is not assignable to type 'HyphenProps'. + Types of property '"data-format"' are incompatible. + Type 'boolean' is not assignable to type 'string'. + + +==== file.tsx (4 errors) ==== + import React = require('react') + + export interface ClickableProps { + children?: string; + className?: string; + } + + export interface ButtonProps extends ClickableProps { + onClick: React.MouseEventHandler; + } + + export interface LinkProps extends ClickableProps { + to: string; + } + + export interface HyphenProps extends ClickableProps { + "data-format": string; + } + + let obj0 = { + to: "world" + }; + + let obj1 = { + children: "hi", + to: "boo" + } + + let obj2 = { + onClick: ()=>{} + } + + let obj3: any; + + export function MainButton(buttonProps: ButtonProps): JSX.Element; + export function MainButton(linkProps: LinkProps): JSX.Element; + export function MainButton(hyphenProps: HyphenProps): JSX.Element; + export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element { + const linkProps = props as LinkProps; + if(linkProps.to) { + return this._buildMainLink(props); + } + + return this._buildMainButton(props); + } + + // Error + const b0 = {}}>GO; // extra property; + ~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ to: string; onClick: (e: MouseEvent) => void; children: string; }' is not assignable to type 'IntrinsicAttributes & HyphenProps'. +!!! error TS2769: Property 'to' does not exist on type 'IntrinsicAttributes & HyphenProps'. +!!! related TS2771 file.tsx:37:17: The last overload is declared here. +!!! related TS2793 file.tsx:38:17: The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible. + const b1 = {}} {...obj0}>Hello world; // extra property; + const b2 = ; // extra property + const b3 = {}}} />; // extra property + const b4 = ; // Should error because Incorrect type; but attributes are any so everything is allowed + const b5 = ; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes + const b6 = ; // incorrect type for optional attribute + ~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'number' is not assignable to type 'string'. +!!! related TS6500 file.tsx:4:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & HyphenProps' +!!! related TS2771 file.tsx:37:17: The last overload is declared here. + const b7 = ; // incorrect type for optional attribute + ~~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +!!! related TS6500 file.tsx:5:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & HyphenProps' +!!! related TS2771 file.tsx:37:17: The last overload is declared here. + const b8 = ; // incorrect type for specified hyphanated name + ~~~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type '{ "data-format": true; }' is not assignable to type 'HyphenProps'. +!!! error TS2769: Types of property '"data-format"' are incompatible. +!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +!!! related TS2771 file.tsx:37:17: The last overload is declared here. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.errors.txt.diff new file mode 100644 index 0000000000..bfe548a208 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.errors.txt.diff @@ -0,0 +1,108 @@ +--- old.tsxStatelessFunctionComponentOverload5.errors.txt ++++ new.tsxStatelessFunctionComponentOverload5.errors.txt +@@= skipped -0, +0 lines =@@ +-file.tsx(48,13): error TS2769: No overload matches this call. +- Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. +- Type '{ to: string; onClick: (e: MouseEvent) => void; children: string; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +- Property 'to' does not exist on type 'IntrinsicAttributes & ButtonProps'. +- Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error. +- Type '{ to: string; onClick: (e: MouseEvent) => void; children: string; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. +- Property 'onClick' does not exist on type 'IntrinsicAttributes & LinkProps'. +- Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error. ++file.tsx(48,24): error TS2769: No overload matches this call. ++ The last overload gave the following error. + Type '{ to: string; onClick: (e: MouseEvent) => void; children: string; }' is not assignable to type 'IntrinsicAttributes & HyphenProps'. + Property 'to' does not exist on type 'IntrinsicAttributes & HyphenProps'. + file.tsx(54,51): error TS2769: No overload matches this call. +- Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. +- Type 'number' is not assignable to type 'string'. +- Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error. +- Type 'number' is not assignable to type 'string'. +- Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error. ++ The last overload gave the following error. + Type 'number' is not assignable to type 'string'. + file.tsx(55,68): error TS2769: No overload matches this call. +- Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. +- Type 'boolean' is not assignable to type 'string'. +- Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error. +- Type 'boolean' is not assignable to type 'string'. +- Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error. ++ The last overload gave the following error. + Type 'boolean' is not assignable to type 'string'. + file.tsx(56,13): error TS2769: No overload matches this call. +- Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. +- Property 'onClick' is missing in type '{ "data-format": true; }' but required in type 'ButtonProps'. +- Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error. +- Property 'to' is missing in type '{ "data-format": true; }' but required in type 'LinkProps'. +- Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error. ++ The last overload gave the following error. + Type '{ "data-format": true; }' is not assignable to type 'HyphenProps'. + Types of property '"data-format"' are incompatible. + Type 'boolean' is not assignable to type 'string'. +@@= skipped -81, +63 lines =@@ + + // Error + const b0 = {}}>GO; // extra property; +- ~~~~~~~~~~ ++ ~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. +-!!! error TS2769: Type '{ to: string; onClick: (e: MouseEvent) => void; children: string; }' is not assignable to type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Property 'to' does not exist on type 'IntrinsicAttributes & ButtonProps'. +-!!! error TS2769: Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error. +-!!! error TS2769: Type '{ to: string; onClick: (e: MouseEvent) => void; children: string; }' is not assignable to type 'IntrinsicAttributes & LinkProps'. +-!!! error TS2769: Property 'onClick' does not exist on type 'IntrinsicAttributes & LinkProps'. +-!!! error TS2769: Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ to: string; onClick: (e: MouseEvent) => void; children: string; }' is not assignable to type 'IntrinsicAttributes & HyphenProps'. + !!! error TS2769: Property 'to' does not exist on type 'IntrinsicAttributes & HyphenProps'. ++!!! related TS2771 file.tsx:37:17: The last overload is declared here. + !!! related TS2793 file.tsx:38:17: The call would have succeeded against this implementation, but implementation signatures of overloads are not externally visible. + const b1 = {}} {...obj0}>Hello world; // extra property; + const b2 = ; // extra property +@@= skipped -20, +15 lines =@@ + const b6 = ; // incorrect type for optional attribute + ~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. +-!!! error TS2769: Type 'number' is not assignable to type 'string'. +-!!! error TS2769: Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error. +-!!! error TS2769: Type 'number' is not assignable to type 'string'. +-!!! error TS2769: Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error. +-!!! error TS2769: Type 'number' is not assignable to type 'string'. +-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & ButtonProps' +-!!! related TS6500 file.tsx:4:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & LinkProps' ++!!! error TS2769: The last overload gave the following error. ++!!! error TS2769: Type 'number' is not assignable to type 'string'. + !!! related TS6500 file.tsx:4:5: The expected type comes from property 'children' which is declared here on type 'IntrinsicAttributes & HyphenProps' ++!!! related TS2771 file.tsx:37:17: The last overload is declared here. + const b7 = ; // incorrect type for optional attribute + ~~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. +-!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +-!!! error TS2769: Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error. +-!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +-!!! error TS2769: Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error. +-!!! error TS2769: Type 'boolean' is not assignable to type 'string'. +-!!! related TS6500 file.tsx:5:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & ButtonProps' +-!!! related TS6500 file.tsx:5:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & LinkProps' ++!!! error TS2769: The last overload gave the following error. ++!!! error TS2769: Type 'boolean' is not assignable to type 'string'. + !!! related TS6500 file.tsx:5:5: The expected type comes from property 'className' which is declared here on type 'IntrinsicAttributes & HyphenProps' ++!!! related TS2771 file.tsx:37:17: The last overload is declared here. + const b8 = ; // incorrect type for specified hyphanated name + ~~~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(buttonProps: ButtonProps): Element', gave the following error. +-!!! error TS2769: Property 'onClick' is missing in type '{ "data-format": true; }' but required in type 'ButtonProps'. +-!!! error TS2769: Overload 2 of 3, '(linkProps: LinkProps): Element', gave the following error. +-!!! error TS2769: Property 'to' is missing in type '{ "data-format": true; }' but required in type 'LinkProps'. +-!!! error TS2769: Overload 3 of 3, '(hyphenProps: HyphenProps): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type '{ "data-format": true; }' is not assignable to type 'HyphenProps'. + !!! error TS2769: Types of property '"data-format"' are incompatible. + !!! error TS2769: Type 'boolean' is not assignable to type 'string'. +-!!! related TS2728 file.tsx:9:5: 'onClick' is declared here. +-!!! related TS2728 file.tsx:13:5: 'to' is declared here. ++!!! related TS2771 file.tsx:37:17: The last overload is declared here. \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.js b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.js new file mode 100644 index 0000000000..2701ffdcbd --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.js @@ -0,0 +1,93 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx] //// + +//// [file.tsx] +import React = require('react') + +export interface ClickableProps { + children?: string; + className?: string; +} + +export interface ButtonProps extends ClickableProps { + onClick: React.MouseEventHandler; +} + +export interface LinkProps extends ClickableProps { + to: string; +} + +export interface HyphenProps extends ClickableProps { + "data-format": string; +} + +let obj0 = { + to: "world" +}; + +let obj1 = { + children: "hi", + to: "boo" +} + +let obj2 = { + onClick: ()=>{} +} + +let obj3: any; + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +export function MainButton(linkProps: LinkProps): JSX.Element; +export function MainButton(hyphenProps: HyphenProps): JSX.Element; +export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element { + const linkProps = props as LinkProps; + if(linkProps.to) { + return this._buildMainLink(props); + } + + return this._buildMainButton(props); +} + +// Error +const b0 = {}}>GO; // extra property; +const b1 = {}} {...obj0}>Hello world; // extra property; +const b2 = ; // extra property +const b3 = {}}} />; // extra property +const b4 = ; // Should error because Incorrect type; but attributes are any so everything is allowed +const b5 = ; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes +const b6 = ; // incorrect type for optional attribute +const b7 = ; // incorrect type for optional attribute +const b8 = ; // incorrect type for specified hyphanated name + +//// [file.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MainButton = MainButton; +const React = require("react"); +let obj0 = { + to: "world" +}; +let obj1 = { + children: "hi", + to: "boo" +}; +let obj2 = { + onClick: () => { } +}; +let obj3; +function MainButton(props) { + const linkProps = props; + if (linkProps.to) { + return this._buildMainLink(props); + } + return this._buildMainButton(props); +} +// Error +const b0 = { }}>GO; // extra property; +const b1 = { }} {...obj0}>Hello world; // extra property; +const b2 = ; // extra property +const b3 = { } }}/>; // extra property +const b4 = ; // Should error because Incorrect type; but attributes are any so everything is allowed +const b5 = ; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes +const b6 = ; // incorrect type for optional attribute +const b7 = ; // incorrect type for optional attribute +const b8 = ; // incorrect type for specified hyphanated name diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.js.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.js.diff new file mode 100644 index 0000000000..304b84c8a1 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.js.diff @@ -0,0 +1,11 @@ +--- old.tsxStatelessFunctionComponentOverload5.js ++++ new.tsxStatelessFunctionComponentOverload5.js +@@= skipped -61, +61 lines =@@ + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.MainButton = MainButton; +-var React = require("react"); ++const React = require("react"); + let obj0 = { + to: "world" + }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.symbols b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.symbols new file mode 100644 index 0000000000..4d5d3e21e4 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.symbols @@ -0,0 +1,181 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx] //// + +=== file.tsx === +import React = require('react') +>React : Symbol(React, Decl(file.tsx, 0, 0)) + +export interface ClickableProps { +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + children?: string; +>children : Symbol(ClickableProps.children, Decl(file.tsx, 2, 33)) + + className?: string; +>className : Symbol(ClickableProps.className, Decl(file.tsx, 3, 22)) +} + +export interface ButtonProps extends ClickableProps { +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + onClick: React.MouseEventHandler; +>onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 7, 53)) +>React : Symbol(React, Decl(file.tsx, 0, 0)) +>MouseEventHandler : Symbol(React.MouseEventHandler, Decl(react.d.ts, 389, 66)) +} + +export interface LinkProps extends ClickableProps { +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + to: string; +>to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51)) +} + +export interface HyphenProps extends ClickableProps { +>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1)) +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + "data-format": string; +>"data-format" : Symbol(HyphenProps["data-format"], Decl(file.tsx, 15, 53)) +} + +let obj0 = { +>obj0 : Symbol(obj0, Decl(file.tsx, 19, 3)) + + to: "world" +>to : Symbol(to, Decl(file.tsx, 19, 12)) + +}; + +let obj1 = { +>obj1 : Symbol(obj1, Decl(file.tsx, 23, 3)) + + children: "hi", +>children : Symbol(children, Decl(file.tsx, 23, 12)) + + to: "boo" +>to : Symbol(to, Decl(file.tsx, 24, 19)) +} + +let obj2 = { +>obj2 : Symbol(obj2, Decl(file.tsx, 28, 3)) + + onClick: ()=>{} +>onClick : Symbol(onClick, Decl(file.tsx, 28, 12)) +} + +let obj3: any; +>obj3 : Symbol(obj3, Decl(file.tsx, 32, 3)) + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>buttonProps : Symbol(buttonProps, Decl(file.tsx, 34, 27)) +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +export function MainButton(linkProps: LinkProps): JSX.Element; +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>linkProps : Symbol(linkProps, Decl(file.tsx, 35, 27)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +export function MainButton(hyphenProps: HyphenProps): JSX.Element; +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>hyphenProps : Symbol(hyphenProps, Decl(file.tsx, 36, 27)) +>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element { +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>props : Symbol(props, Decl(file.tsx, 37, 27)) +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + + const linkProps = props as LinkProps; +>linkProps : Symbol(linkProps, Decl(file.tsx, 38, 9)) +>props : Symbol(props, Decl(file.tsx, 37, 27)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) + + if(linkProps.to) { +>linkProps.to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51)) +>linkProps : Symbol(linkProps, Decl(file.tsx, 38, 9)) +>to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51)) + + return this._buildMainLink(props); +>props : Symbol(props, Decl(file.tsx, 37, 27)) + } + + return this._buildMainButton(props); +>props : Symbol(props, Decl(file.tsx, 37, 27)) +} + +// Error +const b0 = {}}>GO; // extra property; +>b0 : Symbol(b0, Decl(file.tsx, 47, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>to : Symbol(to, Decl(file.tsx, 47, 22)) +>onClick : Symbol(onClick, Decl(file.tsx, 47, 38)) +>e : Symbol(e, Decl(file.tsx, 47, 49)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) + +const b1 = {}} {...obj0}>Hello world; // extra property; +>b1 : Symbol(b1, Decl(file.tsx, 48, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>onClick : Symbol(onClick, Decl(file.tsx, 48, 22)) +>e : Symbol(e, Decl(file.tsx, 48, 33)) +>obj0 : Symbol(obj0, Decl(file.tsx, 19, 3)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) + +const b2 = ; // extra property +>b2 : Symbol(b2, Decl(file.tsx, 49, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>to : Symbol(to, Decl(file.tsx, 49, 28)) +>obj2 : Symbol(obj2, Decl(file.tsx, 28, 3)) + +const b3 = {}}} />; // extra property +>b3 : Symbol(b3, Decl(file.tsx, 50, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>to : Symbol(to, Decl(file.tsx, 50, 28)) +>onClick : Symbol(onClick, Decl(file.tsx, 50, 47)) +>k : Symbol(k, Decl(file.tsx, 50, 57)) + +const b4 = ; // Should error because Incorrect type; but attributes are any so everything is allowed +>b4 : Symbol(b4, Decl(file.tsx, 51, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>obj3 : Symbol(obj3, Decl(file.tsx, 32, 3)) +>to : Symbol(to, Decl(file.tsx, 51, 32)) + +const b5 = ; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes +>b5 : Symbol(b5, Decl(file.tsx, 52, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>onClick : Symbol(onClick, Decl(file.tsx, 52, 28)) +>e : Symbol(e, Decl(file.tsx, 52, 37)) +>obj0 : Symbol(obj0, Decl(file.tsx, 19, 3)) + +const b6 = ; // incorrect type for optional attribute +>b6 : Symbol(b6, Decl(file.tsx, 53, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>onClick : Symbol(onClick, Decl(file.tsx, 53, 28)) +>e : Symbol(e, Decl(file.tsx, 53, 37)) +>children : Symbol(children, Decl(file.tsx, 53, 49)) + +const b7 = ; // incorrect type for optional attribute +>b7 : Symbol(b7, Decl(file.tsx, 54, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>onClick : Symbol(onClick, Decl(file.tsx, 54, 28)) +>e : Symbol(e, Decl(file.tsx, 54, 37)) +>children : Symbol(children, Decl(file.tsx, 54, 49)) +>className : Symbol(className, Decl(file.tsx, 54, 66)) + +const b8 = ; // incorrect type for specified hyphanated name +>b8 : Symbol(b8, Decl(file.tsx, 55, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 32, 14), Decl(file.tsx, 34, 66), Decl(file.tsx, 35, 62), Decl(file.tsx, 36, 66)) +>data-format : Symbol(data-format, Decl(file.tsx, 55, 22)) + diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.types b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.types new file mode 100644 index 0000000000..de3315fb4a --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload5.types @@ -0,0 +1,195 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload5.tsx] //// + +=== file.tsx === +import React = require('react') +>React : typeof React + +export interface ClickableProps { + children?: string; +>children : string + + className?: string; +>className : string +} + +export interface ButtonProps extends ClickableProps { + onClick: React.MouseEventHandler; +>onClick : React.MouseEventHandler +>React : any +} + +export interface LinkProps extends ClickableProps { + to: string; +>to : string +} + +export interface HyphenProps extends ClickableProps { + "data-format": string; +>"data-format" : string +} + +let obj0 = { +>obj0 : { to: string; } +>{ to: "world"} : { to: string; } + + to: "world" +>to : string +>"world" : "world" + +}; + +let obj1 = { +>obj1 : { children: string; to: string; } +>{ children: "hi", to: "boo"} : { children: string; to: string; } + + children: "hi", +>children : string +>"hi" : "hi" + + to: "boo" +>to : string +>"boo" : "boo" +} + +let obj2 = { +>obj2 : { onClick: () => void; } +>{ onClick: ()=>{}} : { onClick: () => void; } + + onClick: ()=>{} +>onClick : () => void +>()=>{} : () => void +} + +let obj3: any; +>obj3 : any + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>buttonProps : ButtonProps +>JSX : any + +export function MainButton(linkProps: LinkProps): JSX.Element; +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>linkProps : LinkProps +>JSX : any + +export function MainButton(hyphenProps: HyphenProps): JSX.Element; +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>hyphenProps : HyphenProps +>JSX : any + +export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element { +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>props : ButtonProps | HyphenProps | LinkProps +>JSX : any + + const linkProps = props as LinkProps; +>linkProps : LinkProps +>props as LinkProps : LinkProps +>props : ButtonProps | HyphenProps | LinkProps + + if(linkProps.to) { +>linkProps.to : string +>linkProps : LinkProps +>to : string + + return this._buildMainLink(props); +>this._buildMainLink(props) : any +>this._buildMainLink : any +>this : any +>_buildMainLink : any +>props : ButtonProps | HyphenProps | LinkProps + } + + return this._buildMainButton(props); +>this._buildMainButton(props) : any +>this._buildMainButton : any +>this : any +>_buildMainButton : any +>props : ButtonProps | HyphenProps | LinkProps +} + +// Error +const b0 = {}}>GO; // extra property; +>b0 : JSX.Element +>{}}>GO : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>to : string +>onClick : (e: React.MouseEvent) => void +>(e)=>{} : (e: React.MouseEvent) => void +>e : React.MouseEvent +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } + +const b1 = {}} {...obj0}>Hello world; // extra property; +>b1 : JSX.Element +> {}} {...obj0}>Hello world : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>onClick : (e: any) => void +>(e: any)=> {} : (e: any) => void +>e : any +>obj0 : { to: string; } +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } + +const b2 = ; // extra property +>b2 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>{to: "10000"} : { to: string; } +>to : string +>"10000" : "10000" +>obj2 : { onClick: () => void; } + +const b3 = {}}} />; // extra property +>b3 : JSX.Element +> {}}} /> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>{to: "10000"} : { to: string; } +>to : string +>"10000" : "10000" +>{onClick: (k) => {}} : { onClick: (k: React.MouseEvent) => void; } +>onClick : (k: React.MouseEvent) => void +>(k) => {} : (k: React.MouseEvent) => void +>k : React.MouseEvent + +const b4 = ; // Should error because Incorrect type; but attributes are any so everything is allowed +>b4 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>obj3 : any +>to : true + +const b5 = ; // Spread retain method declaration (see GitHub #13365), so now there is an extra attributes +>b5 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>{ onClick(e: any) { } } : { onClick(e: any): void; } +>onClick : (e: any) => void +>e : any +>obj0 : { to: string; } + +const b6 = ; // incorrect type for optional attribute +>b6 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>{ onClick(e: any){} } : { onClick(e: any): void; } +>onClick : (e: any) => void +>e : any +>children : number +>10 : 10 + +const b7 = ; // incorrect type for optional attribute +>b7 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>{ onClick(e: any){} } : { onClick(e: any): void; } +>onClick : (e: any) => void +>e : any +>children : string +>className : true + +const b8 = ; // incorrect type for specified hyphanated name +>b8 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>data-format : true + diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.js b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.js new file mode 100644 index 0000000000..70290dc1cf --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.js @@ -0,0 +1,95 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx] //// + +//// [file.tsx] +import React = require('react') + +export interface ClickableProps { + children?: string; + className?: string; +} + +export interface ButtonProps extends ClickableProps { + onClick: React.MouseEventHandler; +} + +export interface LinkProps extends ClickableProps { + to: string; +} + +export interface HyphenProps extends ClickableProps { + "data-format": string; +} + +let obj = { + children: "hi", + to: "boo" +} +let obj1: any; +let obj2 = { + onClick: () => {} +} + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +export function MainButton(linkProps: LinkProps): JSX.Element; +export function MainButton(hyphenProps: HyphenProps): JSX.Element; +export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element { + const linkProps = props as LinkProps; + if(linkProps.to) { + return this._buildMainLink(props); + } + + return this._buildMainButton(props); +} + +// OK +const b0 = GO; +const b1 = {}}>Hello world; +const b2 = ; +const b3 = ; +const b4 = ; // any; just pick the first overload +const b5 = ; // should pick the second overload +const b6 = ; +const b7 = { console.log("hi") }}} />; +const b8 = ; // OK; method declaration get retained (See GitHub #13365) +const b9 = GO; +const b10 = ; +const b11 = {}} className="hello" data-format>Hello world; +const b12 = + + + + +//// [file.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.MainButton = MainButton; +const React = require("react"); +let obj = { + children: "hi", + to: "boo" +}; +let obj1; +let obj2 = { + onClick: () => { } +}; +function MainButton(props) { + const linkProps = props; + if (linkProps.to) { + return this._buildMainLink(props); + } + return this._buildMainButton(props); +} +// OK +const b0 = GO; +const b1 = { }}>Hello world; +const b2 = ; +const b3 = ; +const b4 = ; // any; just pick the first overload +const b5 = ; // should pick the second overload +const b6 = ; +const b7 = { console.log("hi"); } }}/>; +const b8 = ; // OK; method declaration get retained (See GitHub #13365) +const b9 = GO; +const b10 = ; +const b11 = { }} className="hello" data-format>Hello world; +const b12 = ; diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.js.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.js.diff new file mode 100644 index 0000000000..235ba3ed1e --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.js.diff @@ -0,0 +1,11 @@ +--- old.tsxStatelessFunctionComponentOverload6.js ++++ new.tsxStatelessFunctionComponentOverload6.js +@@= skipped -62, +62 lines =@@ + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); + exports.MainButton = MainButton; +-var React = require("react"); ++const React = require("react"); + let obj = { + children: "hi", + to: "boo" \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.symbols b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.symbols new file mode 100644 index 0000000000..0e0656495c --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.symbols @@ -0,0 +1,193 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx] //// + +=== file.tsx === +import React = require('react') +>React : Symbol(React, Decl(file.tsx, 0, 0)) + +export interface ClickableProps { +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + children?: string; +>children : Symbol(ClickableProps.children, Decl(file.tsx, 2, 33)) + + className?: string; +>className : Symbol(ClickableProps.className, Decl(file.tsx, 3, 22)) +} + +export interface ButtonProps extends ClickableProps { +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + onClick: React.MouseEventHandler; +>onClick : Symbol(ButtonProps.onClick, Decl(file.tsx, 7, 53)) +>React : Symbol(React, Decl(file.tsx, 0, 0)) +>MouseEventHandler : Symbol(React.MouseEventHandler, Decl(react.d.ts, 389, 66)) +} + +export interface LinkProps extends ClickableProps { +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + to: string; +>to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51)) +} + +export interface HyphenProps extends ClickableProps { +>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1)) +>ClickableProps : Symbol(ClickableProps, Decl(file.tsx, 0, 31)) + + "data-format": string; +>"data-format" : Symbol(HyphenProps["data-format"], Decl(file.tsx, 15, 53)) +} + +let obj = { +>obj : Symbol(obj, Decl(file.tsx, 19, 3)) + + children: "hi", +>children : Symbol(children, Decl(file.tsx, 19, 11)) + + to: "boo" +>to : Symbol(to, Decl(file.tsx, 20, 19)) +} +let obj1: any; +>obj1 : Symbol(obj1, Decl(file.tsx, 23, 3)) + +let obj2 = { +>obj2 : Symbol(obj2, Decl(file.tsx, 24, 3)) + + onClick: () => {} +>onClick : Symbol(onClick, Decl(file.tsx, 24, 12)) +} + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>buttonProps : Symbol(buttonProps, Decl(file.tsx, 28, 27)) +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +export function MainButton(linkProps: LinkProps): JSX.Element; +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>linkProps : Symbol(linkProps, Decl(file.tsx, 29, 27)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +export function MainButton(hyphenProps: HyphenProps): JSX.Element; +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>hyphenProps : Symbol(hyphenProps, Decl(file.tsx, 30, 27)) +>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element { +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>props : Symbol(props, Decl(file.tsx, 31, 27)) +>ButtonProps : Symbol(ButtonProps, Decl(file.tsx, 5, 1)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) +>HyphenProps : Symbol(HyphenProps, Decl(file.tsx, 13, 1)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + + const linkProps = props as LinkProps; +>linkProps : Symbol(linkProps, Decl(file.tsx, 32, 9)) +>props : Symbol(props, Decl(file.tsx, 31, 27)) +>LinkProps : Symbol(LinkProps, Decl(file.tsx, 9, 1)) + + if(linkProps.to) { +>linkProps.to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51)) +>linkProps : Symbol(linkProps, Decl(file.tsx, 32, 9)) +>to : Symbol(LinkProps.to, Decl(file.tsx, 11, 51)) + + return this._buildMainLink(props); +>props : Symbol(props, Decl(file.tsx, 31, 27)) + } + + return this._buildMainButton(props); +>props : Symbol(props, Decl(file.tsx, 31, 27)) +} + +// OK +const b0 = GO; +>b0 : Symbol(b0, Decl(file.tsx, 41, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>to : Symbol(to, Decl(file.tsx, 41, 22)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) + +const b1 = {}}>Hello world; +>b1 : Symbol(b1, Decl(file.tsx, 42, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>onClick : Symbol(onClick, Decl(file.tsx, 42, 22)) +>e : Symbol(e, Decl(file.tsx, 42, 33)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) + +const b2 = ; +>b2 : Symbol(b2, Decl(file.tsx, 43, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>obj : Symbol(obj, Decl(file.tsx, 19, 3)) + +const b3 = ; +>b3 : Symbol(b3, Decl(file.tsx, 44, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>to : Symbol(to, Decl(file.tsx, 44, 28)) +>obj : Symbol(obj, Decl(file.tsx, 19, 3)) + +const b4 = ; // any; just pick the first overload +>b4 : Symbol(b4, Decl(file.tsx, 45, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>obj1 : Symbol(obj1, Decl(file.tsx, 23, 3)) + +const b5 = ; // should pick the second overload +>b5 : Symbol(b5, Decl(file.tsx, 46, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>obj1 : Symbol(obj1, Decl(file.tsx, 23, 3)) +>to : Symbol(to, Decl(file.tsx, 46, 32)) + +const b6 = ; +>b6 : Symbol(b6, Decl(file.tsx, 47, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>obj2 : Symbol(obj2, Decl(file.tsx, 24, 3)) + +const b7 = { console.log("hi") }}} />; +>b7 : Symbol(b7, Decl(file.tsx, 48, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>onClick : Symbol(onClick, Decl(file.tsx, 48, 28)) +>console.log : Symbol(Console.log, Decl(lib.d.ts, --, --)) +>console : Symbol(console, Decl(lib.d.ts, --, --)) +>log : Symbol(Console.log, Decl(lib.d.ts, --, --)) + +const b8 = ; // OK; method declaration get retained (See GitHub #13365) +>b8 : Symbol(b8, Decl(file.tsx, 49, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>onClick : Symbol(onClick, Decl(file.tsx, 49, 28)) + +const b9 = GO; +>b9 : Symbol(b9, Decl(file.tsx, 50, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>to : Symbol(to, Decl(file.tsx, 50, 22)) +>extra-prop : Symbol(extra-prop, Decl(file.tsx, 50, 38)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) + +const b10 = ; +>b10 : Symbol(b10, Decl(file.tsx, 51, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>to : Symbol(to, Decl(file.tsx, 51, 23)) +>children : Symbol(children, Decl(file.tsx, 51, 39)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) + +const b11 = {}} className="hello" data-format>Hello world; +>b11 : Symbol(b11, Decl(file.tsx, 52, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>onClick : Symbol(onClick, Decl(file.tsx, 52, 23)) +>e : Symbol(e, Decl(file.tsx, 52, 34)) +>className : Symbol(className, Decl(file.tsx, 52, 43)) +>data-format : Symbol(data-format, Decl(file.tsx, 52, 61)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) + +const b12 = +>b12 : Symbol(b12, Decl(file.tsx, 53, 5)) +>MainButton : Symbol(MainButton, Decl(file.tsx, 26, 1), Decl(file.tsx, 28, 66), Decl(file.tsx, 29, 62), Decl(file.tsx, 30, 66)) +>data-format : Symbol(data-format, Decl(file.tsx, 53, 23)) + + + diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.types b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.types new file mode 100644 index 0000000000..07faa2d101 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentOverload6.types @@ -0,0 +1,206 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentOverload6.tsx] //// + +=== file.tsx === +import React = require('react') +>React : typeof React + +export interface ClickableProps { + children?: string; +>children : string + + className?: string; +>className : string +} + +export interface ButtonProps extends ClickableProps { + onClick: React.MouseEventHandler; +>onClick : React.MouseEventHandler +>React : any +} + +export interface LinkProps extends ClickableProps { + to: string; +>to : string +} + +export interface HyphenProps extends ClickableProps { + "data-format": string; +>"data-format" : string +} + +let obj = { +>obj : { children: string; to: string; } +>{ children: "hi", to: "boo"} : { children: string; to: string; } + + children: "hi", +>children : string +>"hi" : "hi" + + to: "boo" +>to : string +>"boo" : "boo" +} +let obj1: any; +>obj1 : any + +let obj2 = { +>obj2 : { onClick: () => void; } +>{ onClick: () => {}} : { onClick: () => void; } + + onClick: () => {} +>onClick : () => void +>() => {} : () => void +} + +export function MainButton(buttonProps: ButtonProps): JSX.Element; +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>buttonProps : ButtonProps +>JSX : any + +export function MainButton(linkProps: LinkProps): JSX.Element; +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>linkProps : LinkProps +>JSX : any + +export function MainButton(hyphenProps: HyphenProps): JSX.Element; +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>hyphenProps : HyphenProps +>JSX : any + +export function MainButton(props: ButtonProps | LinkProps | HyphenProps): JSX.Element { +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>props : ButtonProps | HyphenProps | LinkProps +>JSX : any + + const linkProps = props as LinkProps; +>linkProps : LinkProps +>props as LinkProps : LinkProps +>props : ButtonProps | HyphenProps | LinkProps + + if(linkProps.to) { +>linkProps.to : string +>linkProps : LinkProps +>to : string + + return this._buildMainLink(props); +>this._buildMainLink(props) : any +>this._buildMainLink : any +>this : any +>_buildMainLink : any +>props : ButtonProps | HyphenProps | LinkProps + } + + return this._buildMainButton(props); +>this._buildMainButton(props) : any +>this._buildMainButton : any +>this : any +>_buildMainButton : any +>props : ButtonProps | HyphenProps | LinkProps +} + +// OK +const b0 = GO; +>b0 : JSX.Element +>GO : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>to : string +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } + +const b1 = {}}>Hello world; +>b1 : JSX.Element +> {}}>Hello world : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>onClick : (e: React.MouseEvent) => void +>(e) => {} : (e: React.MouseEvent) => void +>e : React.MouseEvent +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } + +const b2 = ; +>b2 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>obj : { children: string; to: string; } + +const b3 = ; +>b3 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>{to: 10000} : { to: number; } +>to : number +>10000 : 10000 +>obj : { children: string; to: string; } + +const b4 = ; // any; just pick the first overload +>b4 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>obj1 : any + +const b5 = ; // should pick the second overload +>b5 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>obj1 : any +>to : string + +const b6 = ; +>b6 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>obj2 : { onClick: () => void; } + +const b7 = { console.log("hi") }}} />; +>b7 : JSX.Element +> { console.log("hi") }}} /> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>{onClick: () => { console.log("hi") }} : { onClick: () => void; } +>onClick : () => void +>() => { console.log("hi") } : () => void +>console.log("hi") : void +>console.log : (message?: any, ...optionalParams: any[]) => void +>console : Console +>log : (message?: any, ...optionalParams: any[]) => void +>"hi" : "hi" + +const b8 = ; // OK; method declaration get retained (See GitHub #13365) +>b8 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>{onClick() {}} : { onClick(): void; } +>onClick : () => void + +const b9 = GO; +>b9 : JSX.Element +>GO : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>to : string +>extra-prop : true +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } + +const b10 = ; +>b10 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>to : string +>children : string +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } + +const b11 = {}} className="hello" data-format>Hello world; +>b11 : JSX.Element +> {}} className="hello" data-format>Hello world : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>onClick : (e: React.MouseEvent) => void +>(e) => {} : (e: React.MouseEvent) => void +>e : React.MouseEvent +>className : string +>data-format : true +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } + +const b12 = +>b12 : JSX.Element +> : JSX.Element +>MainButton : { (buttonProps: ButtonProps): JSX.Element; (linkProps: LinkProps): JSX.Element; (hyphenProps: HyphenProps): JSX.Element; } +>data-format : string + + + diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt new file mode 100644 index 0000000000..7c45fd97a1 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt @@ -0,0 +1,36 @@ +file.tsx(9,15): error TS2769: No overload matches this call. + The last overload gave the following error. + Property 'b' is missing in type '{ a: number; }' but required in type '{ b: unknown; a: number; }'. +file.tsx(10,15): error TS2769: No overload matches this call. + The last overload gave the following error. + Type 'T & { "ignore-prop": true; }' is not assignable to type 'IntrinsicAttributes & { b: unknown; a: unknown; }'. + Type 'T & { "ignore-prop": true; }' is not assignable to type '{ b: unknown; a: unknown; }'. + Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: unknown; a: unknown; }'. + + +==== file.tsx (2 errors) ==== + import React = require('react') + + declare function OverloadComponent(): JSX.Element; + declare function OverloadComponent(attr: {b: U, a: string, "ignore-prop": boolean}): JSX.Element; + declare function OverloadComponent(attr: {b: U, a: T}): JSX.Element; + + // Error + function Baz(arg1: T, arg2: U) { + let a0 = + ~~~~~~~~~~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Property 'b' is missing in type '{ a: number; }' but required in type '{ b: unknown; a: number; }'. +!!! related TS2728 file.tsx:5:49: 'b' is declared here. +!!! related TS2771 file.tsx:5:18: The last overload is declared here. + let a2 = // missing a + ~~~~~~~~~~~~~~~~~ +!!! error TS2769: No overload matches this call. +!!! error TS2769: The last overload gave the following error. +!!! error TS2769: Type 'T & { "ignore-prop": true; }' is not assignable to type 'IntrinsicAttributes & { b: unknown; a: unknown; }'. +!!! error TS2769: Type 'T & { "ignore-prop": true; }' is not assignable to type '{ b: unknown; a: unknown; }'. +!!! error TS2769: Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: unknown; a: unknown; }'. +!!! related TS2728 file.tsx:5:55: 'a' is declared here. +!!! related TS2771 file.tsx:5:18: The last overload is declared here. + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt.diff new file mode 100644 index 0000000000..853fdcd4c6 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt.diff @@ -0,0 +1,60 @@ +--- old.tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt ++++ new.tsxStatelessFunctionComponentsWithTypeArguments4.errors.txt +@@= skipped -0, +0 lines =@@ + file.tsx(9,15): error TS2769: No overload matches this call. +- Overload 1 of 3, '(): Element', gave the following error. +- Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes'. +- Property 'a' does not exist on type 'IntrinsicAttributes'. +- Overload 2 of 3, '(attr: { b: unknown; a: string; "ignore-prop": boolean; }): Element', gave the following error. +- Type 'number' is not assignable to type 'string'. +- Overload 3 of 3, '(attr: { b: unknown; a: number; }): Element', gave the following error. ++ The last overload gave the following error. + Property 'b' is missing in type '{ a: number; }' but required in type '{ b: unknown; a: number; }'. + file.tsx(10,15): error TS2769: No overload matches this call. +- Overload 1 of 3, '(): Element', gave the following error. +- Type 'T & { "ignore-prop": true; }' has no properties in common with type 'IntrinsicAttributes'. +- Overload 2 of 3, '(attr: { b: number; a: string; "ignore-prop": boolean; }): Element', gave the following error. +- Type 'T & { "ignore-prop": true; }' is not assignable to type 'IntrinsicAttributes & { b: number; a: string; "ignore-prop": boolean; }'. +- Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: number; a: string; "ignore-prop": boolean; }'. +- Overload 3 of 3, '(attr: { b: unknown; a: unknown; }): Element', gave the following error. ++ The last overload gave the following error. + Type 'T & { "ignore-prop": true; }' is not assignable to type 'IntrinsicAttributes & { b: unknown; a: unknown; }'. +- Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: unknown; a: unknown; }'. ++ Type 'T & { "ignore-prop": true; }' is not assignable to type '{ b: unknown; a: unknown; }'. ++ Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: unknown; a: unknown; }'. + + + ==== file.tsx (2 errors) ==== +@@= skipped -28, +19 lines =@@ + let a0 = + ~~~~~~~~~~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(): Element', gave the following error. +-!!! error TS2769: Type '{ a: number; }' is not assignable to type 'IntrinsicAttributes'. +-!!! error TS2769: Property 'a' does not exist on type 'IntrinsicAttributes'. +-!!! error TS2769: Overload 2 of 3, '(attr: { b: unknown; a: string; "ignore-prop": boolean; }): Element', gave the following error. +-!!! error TS2769: Type 'number' is not assignable to type 'string'. +-!!! error TS2769: Overload 3 of 3, '(attr: { b: unknown; a: number; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Property 'b' is missing in type '{ a: number; }' but required in type '{ b: unknown; a: number; }'. +-!!! related TS6500 file.tsx:4:52: The expected type comes from property 'a' which is declared here on type 'IntrinsicAttributes & { b: unknown; a: string; "ignore-prop": boolean; }' + !!! related TS2728 file.tsx:5:49: 'b' is declared here. ++!!! related TS2771 file.tsx:5:18: The last overload is declared here. + let a2 = // missing a + ~~~~~~~~~~~~~~~~~ + !!! error TS2769: No overload matches this call. +-!!! error TS2769: Overload 1 of 3, '(): Element', gave the following error. +-!!! error TS2769: Type 'T & { "ignore-prop": true; }' has no properties in common with type 'IntrinsicAttributes'. +-!!! error TS2769: Overload 2 of 3, '(attr: { b: number; a: string; "ignore-prop": boolean; }): Element', gave the following error. +-!!! error TS2769: Type 'T & { "ignore-prop": true; }' is not assignable to type 'IntrinsicAttributes & { b: number; a: string; "ignore-prop": boolean; }'. +-!!! error TS2769: Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: number; a: string; "ignore-prop": boolean; }'. +-!!! error TS2769: Overload 3 of 3, '(attr: { b: unknown; a: unknown; }): Element', gave the following error. ++!!! error TS2769: The last overload gave the following error. + !!! error TS2769: Type 'T & { "ignore-prop": true; }' is not assignable to type 'IntrinsicAttributes & { b: unknown; a: unknown; }'. +-!!! error TS2769: Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: unknown; a: unknown; }'. +-!!! related TS2728 file.tsx:4:52: 'a' is declared here. ++!!! error TS2769: Type 'T & { "ignore-prop": true; }' is not assignable to type '{ b: unknown; a: unknown; }'. ++!!! error TS2769: Property 'a' is missing in type '{ b: number; } & { "ignore-prop": true; }' but required in type '{ b: unknown; a: unknown; }'. + !!! related TS2728 file.tsx:5:55: 'a' is declared here. ++!!! related TS2771 file.tsx:5:18: The last overload is declared here. + } \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.js b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.js new file mode 100644 index 0000000000..2805f76ef4 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.js @@ -0,0 +1,24 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx] //// + +//// [file.tsx] +import React = require('react') + +declare function OverloadComponent(): JSX.Element; +declare function OverloadComponent(attr: {b: U, a: string, "ignore-prop": boolean}): JSX.Element; +declare function OverloadComponent(attr: {b: U, a: T}): JSX.Element; + +// Error +function Baz(arg1: T, arg2: U) { + let a0 = + let a2 = // missing a +} + +//// [file.jsx] +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +const React = require("react"); +// Error +function Baz(arg1, arg2) { + let a0 = ; + let a2 = ; // missing a +} diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.js.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.js.diff new file mode 100644 index 0000000000..8b19422631 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.js.diff @@ -0,0 +1,11 @@ +--- old.tsxStatelessFunctionComponentsWithTypeArguments4.js ++++ new.tsxStatelessFunctionComponentsWithTypeArguments4.js +@@= skipped -15, +15 lines =@@ + //// [file.jsx] + "use strict"; + Object.defineProperty(exports, "__esModule", { value: true }); +-var React = require("react"); ++const React = require("react"); + // Error + function Baz(arg1, arg2) { + let a0 = ; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.symbols b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.symbols new file mode 100644 index 0000000000..df279c9333 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.symbols @@ -0,0 +1,62 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx] //// + +=== file.tsx === +import React = require('react') +>React : Symbol(React, Decl(file.tsx, 0, 0)) + +declare function OverloadComponent(): JSX.Element; +>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100)) +>U : Symbol(U, Decl(file.tsx, 2, 35)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +declare function OverloadComponent(attr: {b: U, a: string, "ignore-prop": boolean}): JSX.Element; +>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100)) +>U : Symbol(U, Decl(file.tsx, 3, 35)) +>attr : Symbol(attr, Decl(file.tsx, 3, 38)) +>b : Symbol(b, Decl(file.tsx, 3, 45)) +>U : Symbol(U, Decl(file.tsx, 3, 35)) +>a : Symbol(a, Decl(file.tsx, 3, 50)) +>"ignore-prop" : Symbol("ignore-prop", Decl(file.tsx, 3, 61)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +declare function OverloadComponent(attr: {b: U, a: T}): JSX.Element; +>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100)) +>T : Symbol(T, Decl(file.tsx, 4, 35)) +>U : Symbol(U, Decl(file.tsx, 4, 37)) +>attr : Symbol(attr, Decl(file.tsx, 4, 41)) +>b : Symbol(b, Decl(file.tsx, 4, 48)) +>U : Symbol(U, Decl(file.tsx, 4, 37)) +>a : Symbol(a, Decl(file.tsx, 4, 53)) +>T : Symbol(T, Decl(file.tsx, 4, 35)) +>JSX : Symbol(JSX, Decl(react.d.ts, 2353, 1)) +>Element : Symbol(JSX.Element, Decl(react.d.ts, 2356, 27)) + +// Error +function Baz(arg1: T, arg2: U) { +>Baz : Symbol(Baz, Decl(file.tsx, 4, 74)) +>T : Symbol(T, Decl(file.tsx, 7, 13)) +>b : Symbol(b, Decl(file.tsx, 7, 24)) +>U : Symbol(U, Decl(file.tsx, 7, 35)) +>a : Symbol(a, Decl(file.tsx, 7, 47)) +>b : Symbol(b, Decl(file.tsx, 7, 58)) +>arg1 : Symbol(arg1, Decl(file.tsx, 7, 70)) +>T : Symbol(T, Decl(file.tsx, 7, 13)) +>arg2 : Symbol(arg2, Decl(file.tsx, 7, 78)) +>U : Symbol(U, Decl(file.tsx, 7, 35)) + + let a0 = +>a0 : Symbol(a0, Decl(file.tsx, 8, 7)) +>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100)) +>a : Symbol(a, Decl(file.tsx, 8, 31)) +>arg1.b : Symbol(b, Decl(file.tsx, 7, 24)) +>arg1 : Symbol(arg1, Decl(file.tsx, 7, 70)) +>b : Symbol(b, Decl(file.tsx, 7, 24)) + + let a2 = // missing a +>a2 : Symbol(a2, Decl(file.tsx, 9, 7)) +>OverloadComponent : Symbol(OverloadComponent, Decl(file.tsx, 0, 31), Decl(file.tsx, 2, 53), Decl(file.tsx, 3, 100)) +>arg1 : Symbol(arg1, Decl(file.tsx, 7, 70)) +>ignore-prop : Symbol(ignore-prop, Decl(file.tsx, 9, 41)) +} diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.types b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.types new file mode 100644 index 0000000000..e1d8928ca2 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.types @@ -0,0 +1,50 @@ +//// [tests/cases/conformance/jsx/tsxStatelessFunctionComponentsWithTypeArguments4.tsx] //// + +=== file.tsx === +import React = require('react') +>React : typeof React + +declare function OverloadComponent(): JSX.Element; +>OverloadComponent : { (): JSX.Element; (attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U; a: T; }): JSX.Element; } +>JSX : any + +declare function OverloadComponent(attr: {b: U, a: string, "ignore-prop": boolean}): JSX.Element; +>OverloadComponent : { (): JSX.Element; (attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U; a: T; }): JSX.Element; } +>attr : { b: U; a: string; "ignore-prop": boolean; } +>b : U +>a : string +>"ignore-prop" : boolean +>JSX : any + +declare function OverloadComponent(attr: {b: U, a: T}): JSX.Element; +>OverloadComponent : { (): JSX.Element; (attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U; a: T; }): JSX.Element; } +>attr : { b: U; a: T; } +>b : U +>a : T +>JSX : any + +// Error +function Baz(arg1: T, arg2: U) { +>Baz : (arg1: T, arg2: U) => void +>b : number +>a : boolean +>b : string +>arg1 : T +>arg2 : U + + let a0 = +>a0 : JSX.Element +> : JSX.Element +>OverloadComponent : { (): JSX.Element; (attr: { b: U_1; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U_1; a: T_1; }): JSX.Element; } +>a : number +>arg1.b : number +>arg1 : T +>b : number + + let a2 = // missing a +>a2 : JSX.Element +> : JSX.Element +>OverloadComponent : { (): JSX.Element; (attr: { b: U_1; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U_1; a: T_1; }): JSX.Element; } +>arg1 : T +>ignore-prop : true +} diff --git a/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.types.diff b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.types.diff new file mode 100644 index 0000000000..3ec9d95e6b --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/tsxStatelessFunctionComponentsWithTypeArguments4.types.diff @@ -0,0 +1,25 @@ +--- old.tsxStatelessFunctionComponentsWithTypeArguments4.types ++++ new.tsxStatelessFunctionComponentsWithTypeArguments4.types +@@= skipped -4, +4 lines =@@ + >React : typeof React + + declare function OverloadComponent(): JSX.Element; +->OverloadComponent : { (): JSX.Element; (attr: { b: U_1; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U_1; a: T; }): JSX.Element; } ++>OverloadComponent : { (): JSX.Element; (attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U; a: T; }): JSX.Element; } + >JSX : any + + declare function OverloadComponent(attr: {b: U, a: string, "ignore-prop": boolean}): JSX.Element; +->OverloadComponent : { (): JSX.Element; (attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U_1; a: T; }): JSX.Element; } ++>OverloadComponent : { (): JSX.Element; (attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U; a: T; }): JSX.Element; } + >attr : { b: U; a: string; "ignore-prop": boolean; } + >b : U + >a : string +@@= skipped -12, +12 lines =@@ + >JSX : any + + declare function OverloadComponent(attr: {b: U, a: T}): JSX.Element; +->OverloadComponent : { (): JSX.Element; (attr: { b: U_1; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U; a: T; }): JSX.Element; } ++>OverloadComponent : { (): JSX.Element; (attr: { b: U; a: string; "ignore-prop": boolean; }): JSX.Element; (attr: { b: U; a: T; }): JSX.Element; } + >attr : { b: U; a: T; } + >b : U + >a : T \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.js b/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.js index d385a8b188..c093929c68 100644 --- a/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.js +++ b/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.js @@ -24,9 +24,42 @@ exports.COFFEE = 0; exports.TEA = 1; //// [drink.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.Drink = void 0; -exports.Drink = require("./constants"); +exports.Drink = __importStar(require("./constants")); //// [index.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.js.diff b/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.js.diff index bac5c4b29d..d87ccb44d9 100644 --- a/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.js.diff +++ b/testdata/baselines/reference/submodule/conformance/typeAndNamespaceExportMerge.js.diff @@ -1,6 +1,6 @@ --- old.typeAndNamespaceExportMerge.js +++ new.typeAndNamespaceExportMerge.js -@@= skipped -29, +29 lines =@@ +@@= skipped -62, +62 lines =@@ //// [index.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.errors.txt b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.errors.txt new file mode 100644 index 0000000000..c367fd4d66 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment17.errors.txt @@ -0,0 +1,35 @@ +use.js(3,8): error TS2554: Expected 1 arguments, but got 0. + + +==== use.js (1 errors) ==== + /// + var mini = require('./minimatch') + mini.M.defaults() + ~~~~~~~~ +!!! error TS2554: Expected 1 arguments, but got 0. +!!! related TS6210 minimatch.js:10:24: An argument for 'def' was not provided. + var m = new mini.M() + m.m() + mini.filter() + +==== types.d.ts (0 errors) ==== + declare var require: any; + declare var module: any; +==== minimatch.js (0 errors) ==== + /// + module.exports = minimatch + minimatch.M = M + minimatch.filter = filter + function filter() { + return minimatch() + } + function minimatch() { + } + M.defaults = function (def) { + return def + } + M.prototype.m = function () { + } + function M() { + } + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment7.errors.txt b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment7.errors.txt new file mode 100644 index 0000000000..f9855e7386 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/typeFromPropertyAssignment7.errors.txt @@ -0,0 +1,13 @@ +a.js(5,13): error TS2554: Expected 1 arguments, but got 0. + + +==== a.js (1 errors) ==== + var obj = {}; + obj.method = function (hunch) { + return true; + } + var b = obj.method(); + ~~~~~~ +!!! error TS2554: Expected 1 arguments, but got 0. +!!! related TS6210 a.js:2:24: An argument for 'hunch' was not provided. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.errors.txt b/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.errors.txt deleted file mode 100644 index 20288daecd..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -/src/a.js(1,29): error TS8037: Type satisfaction expressions can only be used in TypeScript files. - - -!!! error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== /src/a.js (1 errors) ==== - var v = undefined satisfies 1; - ~ -!!! error TS8037: Type satisfaction expressions can only be used in TypeScript files. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.symbols b/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.symbols deleted file mode 100644 index bde82c0a88..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.symbols +++ /dev/null @@ -1,7 +0,0 @@ -//// [tests/cases/conformance/expressions/typeSatisfaction/typeSatisfaction_js.ts] //// - -=== /src/a.js === -var v = undefined satisfies 1; ->v : Symbol(v, Decl(a.js, 0, 3)) ->undefined : Symbol(undefined) - diff --git a/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.types b/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.types deleted file mode 100644 index 664a071c0b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typeSatisfaction_js.types +++ /dev/null @@ -1,8 +0,0 @@ -//// [tests/cases/conformance/expressions/typeSatisfaction/typeSatisfaction_js.ts] //// - -=== /src/a.js === -var v = undefined satisfies 1; ->v : any ->undefined satisfies 1 : undefined ->undefined : undefined - diff --git a/testdata/baselines/reference/submodule/conformance/typeTagOnFunctionReferencesGeneric.types b/testdata/baselines/reference/submodule/conformance/typeTagOnFunctionReferencesGeneric.types index 66450f41d4..73284b3c14 100644 --- a/testdata/baselines/reference/submodule/conformance/typeTagOnFunctionReferencesGeneric.types +++ b/testdata/baselines/reference/submodule/conformance/typeTagOnFunctionReferencesGeneric.types @@ -7,7 +7,7 @@ /**@type {IFn}*/ export function inJs(l) { ->inJs : (m: T) => T +>inJs : (l: T) => T >l : T return l; @@ -15,7 +15,7 @@ export function inJs(l) { } inJs(1); // lints error. Why? >inJs(1) : 1 ->inJs : (m: T) => T +>inJs : (l: T) => T >1 : 1 /**@type {IFn}*/ diff --git a/testdata/baselines/reference/submodule/conformance/typeTagWithGenericSignature.types b/testdata/baselines/reference/submodule/conformance/typeTagWithGenericSignature.types index 9f9358c9b0..f914e5dd2e 100644 --- a/testdata/baselines/reference/submodule/conformance/typeTagWithGenericSignature.types +++ b/testdata/baselines/reference/submodule/conformance/typeTagWithGenericSignature.types @@ -3,7 +3,7 @@ === bug25618.js === /** @type {(param?: T) => T | undefined} */ function typed(param) { ->typed : (param?: T | undefined) => T | undefined +>typed : (param: T | undefined) => T | undefined >param : T | undefined return param; @@ -13,7 +13,7 @@ function typed(param) { var n = typed(1); >n : number | undefined >typed(1) : 1 | undefined ->typed : (param?: T | undefined) => T | undefined +>typed : (param: T | undefined) => T | undefined >1 : 1 diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.errors.txt b/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.errors.txt deleted file mode 100644 index 5215c848c1..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -/b/user.ts(1,19): error TS2307: Cannot find module 'a' or its corresponding type declarations. - - -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -==== /a/package.json (0 errors) ==== - { - "types": "", - "typesVersions": { - ">=3.1.0-0": { "*" : ["ts3.1/*"] } - } - } - -==== /a/ts3.1/index.d.ts (0 errors) ==== - export const a = 0; - -==== /b/user.ts (1 errors) ==== - import { a } from "a"; - ~~~ -!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.js b/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.js deleted file mode 100644 index 0bcc27d7a6..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.js +++ /dev/null @@ -1,20 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/typesVersions.emptyTypes.ts] //// - -//// [package.json] -{ - "types": "", - "typesVersions": { - ">=3.1.0-0": { "*" : ["ts3.1/*"] } - } -} - -//// [index.d.ts] -export const a = 0; - -//// [user.ts] -import { a } from "a"; - - -//// [user.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.symbols b/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.symbols deleted file mode 100644 index a07fb6cc18..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/typesVersions.emptyTypes.ts] //// - -=== /a/ts3.1/index.d.ts === -export const a = 0; ->a : Symbol(a, Decl(index.d.ts, 0, 12)) - -=== /b/user.ts === -import { a } from "a"; ->a : Symbol(a, Decl(user.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.trace.json b/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.trace.json deleted file mode 100644 index f7084a863a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.trace.json +++ /dev/null @@ -1,15 +0,0 @@ -======== Resolving module 'a' from '/b/user.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/b/package.json' does not exist. -File '/package.json' does not exist. -Loading module 'a' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/b/node_modules' does not exist, skipping all lookups in it. -Directory '/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/b/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'a' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.types b/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.types deleted file mode 100644 index a0adfb4e56..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/typesVersions.emptyTypes.ts] //// - -=== /a/ts3.1/index.d.ts === -export const a = 0; ->a : 0 ->0 : 0 - -=== /b/user.ts === -import { a } from "a"; ->a : any - diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.types.diff b/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.types.diff deleted file mode 100644 index 0a3baf3dac..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.emptyTypes.types.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- old.typesVersions.emptyTypes.types -+++ new.typesVersions.emptyTypes.types -@@= skipped -6, +6 lines =@@ - - === /b/user.ts === - import { a } from "a"; -->a : 0 -+>a : any diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.errors.txt b/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.errors.txt deleted file mode 100644 index 805162ff97..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.errors.txt +++ /dev/null @@ -1,20 +0,0 @@ -error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -/b/user.ts(1,19): error TS2307: Cannot find module 'a' or its corresponding type declarations. - - -!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -==== /a/package.json (0 errors) ==== - { - "typesVersions": { - ">=3.1.0-0": { "*" : ["ts3.1/*"] } - } - } - -==== /a/ts3.1/index.d.ts (0 errors) ==== - export const a = 0; - -==== /b/user.ts (1 errors) ==== - import { a } from "a"; - ~~~ -!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.js b/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.js deleted file mode 100644 index 094376c7d0..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.js +++ /dev/null @@ -1,19 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/typesVersions.justIndex.ts] //// - -//// [package.json] -{ - "typesVersions": { - ">=3.1.0-0": { "*" : ["ts3.1/*"] } - } -} - -//// [index.d.ts] -export const a = 0; - -//// [user.ts] -import { a } from "a"; - - -//// [user.js] -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.symbols b/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.symbols deleted file mode 100644 index 6d8301a63a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.symbols +++ /dev/null @@ -1,10 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/typesVersions.justIndex.ts] //// - -=== /a/ts3.1/index.d.ts === -export const a = 0; ->a : Symbol(a, Decl(index.d.ts, 0, 12)) - -=== /b/user.ts === -import { a } from "a"; ->a : Symbol(a, Decl(user.ts, 0, 8)) - diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.trace.json b/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.trace.json deleted file mode 100644 index f7084a863a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.trace.json +++ /dev/null @@ -1,15 +0,0 @@ -======== Resolving module 'a' from '/b/user.ts'. ======== -Module resolution kind is not specified, using 'Bundler'. -Resolving in CJS mode with conditions 'require', 'types'. -File '/b/package.json' does not exist. -File '/package.json' does not exist. -Loading module 'a' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON. -Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration. -Directory '/b/node_modules' does not exist, skipping all lookups in it. -Directory '/b/node_modules/@types' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules/@types' does not exist, skipping all lookups in it. -Searching all ancestor node_modules directories for fallback extensions: JavaScript, JSON. -Directory '/b/node_modules' does not exist, skipping all lookups in it. -Directory '/node_modules' does not exist, skipping all lookups in it. -======== Module name 'a' was not resolved. ======== diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.types b/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.types deleted file mode 100644 index 6a09ed3804..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.types +++ /dev/null @@ -1,11 +0,0 @@ -//// [tests/cases/conformance/moduleResolution/typesVersions.justIndex.ts] //// - -=== /a/ts3.1/index.d.ts === -export const a = 0; ->a : 0 ->0 : 0 - -=== /b/user.ts === -import { a } from "a"; ->a : any - diff --git a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.types.diff b/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.types.diff deleted file mode 100644 index f8f88f9949..0000000000 --- a/testdata/baselines/reference/submodule/conformance/typesVersions.justIndex.types.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- old.typesVersions.justIndex.types -+++ new.typesVersions.justIndex.types -@@= skipped -6, +6 lines =@@ - - === /b/user.ts === - import { a } from "a"; -->a : 0 -+>a : any diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.js b/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.js index 1f4f1971f0..feee836a2c 100644 --- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.js +++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.js @@ -40,9 +40,42 @@ var t = p.x; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const m = require("math2d"); +const m = __importStar(require("math2d")); let v = new m.Vector(3, 2); let magnitude = m.getLength(v); let p = v.translate(5, 5); diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.js.diff b/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.js.diff index e2be0d238c..d455221ddf 100644 --- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.js.diff +++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-1.js.diff @@ -1,11 +1,11 @@ --- old.umd-augmentation-1.js +++ new.umd-augmentation-1.js -@@= skipped -41, +41 lines =@@ - "use strict"; +@@= skipped -74, +74 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var m = require("math2d"); -+const m = require("math2d"); +-var m = __importStar(require("math2d")); ++const m = __importStar(require("math2d")); let v = new m.Vector(3, 2); let magnitude = m.getLength(v); let p = v.translate(5, 5); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.js b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.js index d75e2ddee3..d23484175c 100644 --- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.js +++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.js @@ -46,9 +46,42 @@ var t = p.x; //// [b.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); /// -const m = require("math2d"); +const m = __importStar(require("math2d")); let v = new m.Vector(3, 2); let magnitude = m.getLength(v); let p = v.translate(5, 5); diff --git a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.js.diff b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.js.diff index 3a66b71e3e..01caf46c18 100644 --- a/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.js.diff +++ b/testdata/baselines/reference/submodule/conformance/umd-augmentation-3.js.diff @@ -1,11 +1,11 @@ --- old.umd-augmentation-3.js +++ new.umd-augmentation-3.js -@@= skipped -47, +47 lines =@@ - "use strict"; +@@= skipped -80, +80 lines =@@ + })(); Object.defineProperty(exports, "__esModule", { value: true }); /// --var m = require("math2d"); -+const m = require("math2d"); +-var m = __importStar(require("math2d")); ++const m = __importStar(require("math2d")); let v = new m.Vector(3, 2); let magnitude = m.getLength(v); let p = v.translate(5, 5); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/umd3.js b/testdata/baselines/reference/submodule/conformance/umd3.js index 927ea391c6..9e4f2a863d 100644 --- a/testdata/baselines/reference/submodule/conformance/umd3.js +++ b/testdata/baselines/reference/submodule/conformance/umd3.js @@ -15,8 +15,41 @@ let y: number = x.n; //// [a.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const Foo = require("./foo"); +const Foo = __importStar(require("./foo")); Foo.fn(); let x; let y = x.n; diff --git a/testdata/baselines/reference/submodule/conformance/umd3.js.diff b/testdata/baselines/reference/submodule/conformance/umd3.js.diff index dd6be58e39..c4b1270cf4 100644 --- a/testdata/baselines/reference/submodule/conformance/umd3.js.diff +++ b/testdata/baselines/reference/submodule/conformance/umd3.js.diff @@ -1,11 +1,11 @@ --- old.umd3.js +++ new.umd3.js -@@= skipped -15, +15 lines =@@ - //// [a.js] - "use strict"; +@@= skipped -48, +48 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var Foo = require("./foo"); -+const Foo = require("./foo"); +-var Foo = __importStar(require("./foo")); ++const Foo = __importStar(require("./foo")); Foo.fn(); let x; let y = x.n; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/umd4.js b/testdata/baselines/reference/submodule/conformance/umd4.js index 32d4f9360a..153fddf07d 100644 --- a/testdata/baselines/reference/submodule/conformance/umd4.js +++ b/testdata/baselines/reference/submodule/conformance/umd4.js @@ -15,8 +15,41 @@ let y: number = x.n; //// [a.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const Bar = require("./foo"); +const Bar = __importStar(require("./foo")); Bar.fn(); let x; let y = x.n; diff --git a/testdata/baselines/reference/submodule/conformance/umd4.js.diff b/testdata/baselines/reference/submodule/conformance/umd4.js.diff index ba9be7048f..e2d3876661 100644 --- a/testdata/baselines/reference/submodule/conformance/umd4.js.diff +++ b/testdata/baselines/reference/submodule/conformance/umd4.js.diff @@ -1,11 +1,11 @@ --- old.umd4.js +++ new.umd4.js -@@= skipped -15, +15 lines =@@ - //// [a.js] - "use strict"; +@@= skipped -48, +48 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var Bar = require("./foo"); -+const Bar = require("./foo"); +-var Bar = __importStar(require("./foo")); ++const Bar = __importStar(require("./foo")); Bar.fn(); let x; let y = x.n; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/umd5.js b/testdata/baselines/reference/submodule/conformance/umd5.js index 0ee9c2d420..781ac917b6 100644 --- a/testdata/baselines/reference/submodule/conformance/umd5.js +++ b/testdata/baselines/reference/submodule/conformance/umd5.js @@ -17,8 +17,41 @@ let z = Foo; //// [a.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const Bar = require("./foo"); +const Bar = __importStar(require("./foo")); Bar.fn(); let x; let y = x.n; diff --git a/testdata/baselines/reference/submodule/conformance/umd5.js.diff b/testdata/baselines/reference/submodule/conformance/umd5.js.diff index 0746600b2a..22cc2dfa8c 100644 --- a/testdata/baselines/reference/submodule/conformance/umd5.js.diff +++ b/testdata/baselines/reference/submodule/conformance/umd5.js.diff @@ -1,11 +1,11 @@ --- old.umd5.js +++ new.umd5.js -@@= skipped -17, +17 lines =@@ - //// [a.js] - "use strict"; +@@= skipped -50, +50 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var Bar = require("./foo"); -+const Bar = require("./foo"); +-var Bar = __importStar(require("./foo")); ++const Bar = __importStar(require("./foo")); Bar.fn(); let x; let y = x.n; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/umd8.symbols b/testdata/baselines/reference/submodule/conformance/umd8.symbols index 7809a99f8f..0cb5bdf2f2 100644 --- a/testdata/baselines/reference/submodule/conformance/umd8.symbols +++ b/testdata/baselines/reference/submodule/conformance/umd8.symbols @@ -10,9 +10,9 @@ let y: Foo; // OK in type position >Foo : Symbol(Foo, Decl(foo.d.ts, 6, 15)) y.foo(); ->y.foo : Symbol(ff.foo, Decl(foo.d.ts, 0, 21)) +>y.foo : Symbol(Thing.foo, Decl(foo.d.ts, 0, 21)) >y : Symbol(y, Decl(a.ts, 3, 3)) ->foo : Symbol(ff.foo, Decl(foo.d.ts, 0, 21)) +>foo : Symbol(Thing.foo, Decl(foo.d.ts, 0, 21)) let z: Foo.SubThing; // OK in ns position >z : Symbol(z, Decl(a.ts, 5, 3)) diff --git a/testdata/baselines/reference/submodule/conformance/umd8.types b/testdata/baselines/reference/submodule/conformance/umd8.types index 7b24d2532b..41ad295eab 100644 --- a/testdata/baselines/reference/submodule/conformance/umd8.types +++ b/testdata/baselines/reference/submodule/conformance/umd8.types @@ -6,12 +6,12 @@ import * as ff from './foo'; >ff : typeof ff let y: Foo; // OK in type position ->y : ff +>y : import("foo") y.foo(); >y.foo() : number >y.foo : () => number ->y : ff +>y : import("foo") >foo : () => number let z: Foo.SubThing; // OK in ns position @@ -20,7 +20,7 @@ let z: Foo.SubThing; // OK in ns position let x: any = Foo; // Not OK in value position >x : any ->Foo : typeof ff +>Foo : typeof import("foo") === foo.d.ts === declare class Thing { diff --git a/testdata/baselines/reference/submodule/conformance/unannotatedParametersAreOptional.errors.txt b/testdata/baselines/reference/submodule/conformance/unannotatedParametersAreOptional.errors.txt new file mode 100644 index 0000000000..a9378e3b62 --- /dev/null +++ b/testdata/baselines/reference/submodule/conformance/unannotatedParametersAreOptional.errors.txt @@ -0,0 +1,48 @@ +test.js(2,1): error TS2554: Expected 1 arguments, but got 0. +test.js(10,3): error TS2554: Expected 1 arguments, but got 0. +test.js(11,9): error TS2554: Expected 1 arguments, but got 0. +test.js(12,9): error TS2554: Expected 1 arguments, but got 0. +test.js(19,5): error TS2554: Expected 1 arguments, but got 0. +test.js(20,5): error TS2554: Expected 1 arguments, but got 0. + + +==== test.js (6 errors) ==== + function f(x) {} + f(); // Always been ok + ~ +!!! error TS2554: Expected 1 arguments, but got 0. +!!! related TS6210 test.js:1:12: An argument for 'x' was not provided. + + class C { + static m(x) {} + p = x => {} + m(x) {} + } + + C.m(); // Always been ok + ~ +!!! error TS2554: Expected 1 arguments, but got 0. +!!! related TS6210 test.js:5:12: An argument for 'x' was not provided. + new C().m(); // Regression #39261 + ~ +!!! error TS2554: Expected 1 arguments, but got 0. +!!! related TS6210 test.js:7:5: An argument for 'x' was not provided. + new C().p(); // Regression #39261 + ~ +!!! error TS2554: Expected 1 arguments, but got 0. +!!! related TS6210 test.js:6:7: An argument for 'x' was not provided. + + const obj = { + m(x) {}, + p: x => {} + }; + + obj.m(); // Always been ok + ~ +!!! error TS2554: Expected 1 arguments, but got 0. +!!! related TS6210 test.js:15:5: An argument for 'x' was not provided. + obj.p(); // Always been ok + ~ +!!! error TS2554: Expected 1 arguments, but got 0. +!!! related TS6210 test.js:16:6: An argument for 'x' was not provided. + \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.errors.txt b/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.errors.txt deleted file mode 100644 index 4610ce0280..0000000000 --- a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.errors.txt +++ /dev/null @@ -1,37 +0,0 @@ -error TS5055: Cannot write file 'uniqueSymbolsDeclarationsInJs.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - -!!! error TS5055: Cannot write file 'uniqueSymbolsDeclarationsInJs.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== uniqueSymbolsDeclarationsInJs.js (0 errors) ==== - // classes - class C { - /** - * @readonly - */ - static readonlyStaticCall = Symbol(); - /** - * @type {unique symbol} - * @readonly - */ - static readonlyStaticType; - /** - * @type {unique symbol} - * @readonly - */ - static readonlyStaticTypeAndCall = Symbol(); - static readwriteStaticCall = Symbol(); - - /** - * @readonly - */ - readonlyCall = Symbol(); - readwriteCall = Symbol(); - } - - /** @type {unique symbol} */ - const a = Symbol(); - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.symbols b/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.symbols deleted file mode 100644 index 0c2db05922..0000000000 --- a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.symbols +++ /dev/null @@ -1,50 +0,0 @@ -//// [tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs.ts] //// - -=== uniqueSymbolsDeclarationsInJs.js === -// classes -class C { ->C : Symbol(C, Decl(uniqueSymbolsDeclarationsInJs.js, 0, 0)) - - /** - * @readonly - */ - static readonlyStaticCall = Symbol(); ->readonlyStaticCall : Symbol(C.readonlyStaticCall, Decl(uniqueSymbolsDeclarationsInJs.js, 1, 9)) ->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --)) - - /** - * @type {unique symbol} - * @readonly - */ - static readonlyStaticType; ->readonlyStaticType : Symbol(C.readonlyStaticType, Decl(uniqueSymbolsDeclarationsInJs.js, 5, 41)) - - /** - * @type {unique symbol} - * @readonly - */ - static readonlyStaticTypeAndCall = Symbol(); ->readonlyStaticTypeAndCall : Symbol(C.readonlyStaticTypeAndCall, Decl(uniqueSymbolsDeclarationsInJs.js, 10, 30)) ->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --)) - - static readwriteStaticCall = Symbol(); ->readwriteStaticCall : Symbol(C.readwriteStaticCall, Decl(uniqueSymbolsDeclarationsInJs.js, 15, 48)) ->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --)) - - /** - * @readonly - */ - readonlyCall = Symbol(); ->readonlyCall : Symbol(C.readonlyCall, Decl(uniqueSymbolsDeclarationsInJs.js, 16, 42)) ->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --)) - - readwriteCall = Symbol(); ->readwriteCall : Symbol(C.readwriteCall, Decl(uniqueSymbolsDeclarationsInJs.js, 21, 28)) ->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --)) -} - -/** @type {unique symbol} */ -const a = Symbol(); ->a : Symbol(a, Decl(uniqueSymbolsDeclarationsInJs.js, 26, 5)) ->Symbol : Symbol(Symbol, Decl(lib.es5.d.ts, --, --), Decl(lib.es2015.symbol.d.ts, --, --), Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2019.symbol.d.ts, --, --)) - diff --git a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.types b/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.types deleted file mode 100644 index e812b448aa..0000000000 --- a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJs.types +++ /dev/null @@ -1,56 +0,0 @@ -//// [tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJs.ts] //// - -=== uniqueSymbolsDeclarationsInJs.js === -// classes -class C { ->C : C - - /** - * @readonly - */ - static readonlyStaticCall = Symbol(); ->readonlyStaticCall : unique symbol ->Symbol() : unique symbol ->Symbol : SymbolConstructor - - /** - * @type {unique symbol} - * @readonly - */ - static readonlyStaticType; ->readonlyStaticType : unique symbol - - /** - * @type {unique symbol} - * @readonly - */ - static readonlyStaticTypeAndCall = Symbol(); ->readonlyStaticTypeAndCall : unique symbol ->Symbol() : unique symbol ->Symbol : SymbolConstructor - - static readwriteStaticCall = Symbol(); ->readwriteStaticCall : symbol ->Symbol() : symbol ->Symbol : SymbolConstructor - - /** - * @readonly - */ - readonlyCall = Symbol(); ->readonlyCall : symbol ->Symbol() : symbol ->Symbol : SymbolConstructor - - readwriteCall = Symbol(); ->readwriteCall : symbol ->Symbol() : symbol ->Symbol : SymbolConstructor -} - -/** @type {unique symbol} */ -const a = Symbol(); ->a : unique symbol ->Symbol() : unique symbol ->Symbol : SymbolConstructor - diff --git a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.errors.txt b/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.errors.txt deleted file mode 100644 index d5f7425d9b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.errors.txt +++ /dev/null @@ -1,31 +0,0 @@ -error TS5055: Cannot write file 'uniqueSymbolsDeclarationsInJsErrors.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -uniqueSymbolsDeclarationsInJsErrors.js(5,12): error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'. -uniqueSymbolsDeclarationsInJsErrors.js(14,12): error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'. - - -!!! error TS5055: Cannot write file 'uniqueSymbolsDeclarationsInJsErrors.js' because it would overwrite input file. -!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -==== uniqueSymbolsDeclarationsInJsErrors.js (2 errors) ==== - class C { - /** - * @type {unique symbol} - */ - static readwriteStaticType; - ~~~~~~~~~~~~~~~~~~~ -!!! error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'. - /** - * @type {unique symbol} - * @readonly - */ - static readonlyType; - /** - * @type {unique symbol} - */ - static readwriteType; - ~~~~~~~~~~~~~ -!!! error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'. - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.symbols b/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.symbols deleted file mode 100644 index 44e440f38b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.symbols +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors.ts] //// - -=== uniqueSymbolsDeclarationsInJsErrors.js === -class C { ->C : Symbol(C, Decl(uniqueSymbolsDeclarationsInJsErrors.js, 0, 0)) - - /** - * @type {unique symbol} - */ - static readwriteStaticType; ->readwriteStaticType : Symbol(C.readwriteStaticType, Decl(uniqueSymbolsDeclarationsInJsErrors.js, 0, 9)) - - /** - * @type {unique symbol} - * @readonly - */ - static readonlyType; ->readonlyType : Symbol(C.readonlyType, Decl(uniqueSymbolsDeclarationsInJsErrors.js, 4, 31)) - - /** - * @type {unique symbol} - */ - static readwriteType; ->readwriteType : Symbol(C.readwriteType, Decl(uniqueSymbolsDeclarationsInJsErrors.js, 9, 24)) -} - diff --git a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.types b/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.types deleted file mode 100644 index 8efd009a30..0000000000 --- a/testdata/baselines/reference/submodule/conformance/uniqueSymbolsDeclarationsInJsErrors.types +++ /dev/null @@ -1,26 +0,0 @@ -//// [tests/cases/conformance/types/uniqueSymbol/uniqueSymbolsDeclarationsInJsErrors.ts] //// - -=== uniqueSymbolsDeclarationsInJsErrors.js === -class C { ->C : C - - /** - * @type {unique symbol} - */ - static readwriteStaticType; ->readwriteStaticType : symbol - - /** - * @type {unique symbol} - * @readonly - */ - static readonlyType; ->readonlyType : unique symbol - - /** - * @type {unique symbol} - */ - static readwriteType; ->readwriteType : symbol -} - diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport.js b/testdata/baselines/reference/submodule/conformance/untypedModuleImport.js index e32444357a..2a1373f9f6 100644 --- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport.js +++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport.js @@ -20,8 +20,41 @@ foo(bar()); //// [a.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const foo = require("foo"); +const foo = __importStar(require("foo")); foo.bar(); //// [b.js] "use strict"; @@ -30,8 +63,41 @@ const foo = require("foo"); foo(); //// [c.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const foo_1 = require("foo"); +const foo_1 = __importStar(require("foo")); require("./a"); require("./b"); (0, foo_1.default)((0, foo_1.bar)()); diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport.js.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport.js.diff index 3ce5e42a63..84164e61eb 100644 --- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport.js.diff +++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport.js.diff @@ -1,11 +1,11 @@ --- old.untypedModuleImport.js +++ new.untypedModuleImport.js -@@= skipped -20, +20 lines =@@ - //// [a.js] - "use strict"; +@@= skipped -53, +53 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var foo = require("foo"); -+const foo = require("foo"); +-var foo = __importStar(require("foo")); ++const foo = __importStar(require("foo")); foo.bar(); //// [b.js] "use strict"; @@ -15,9 +15,12 @@ foo(); //// [c.js] "use strict"; +@@= skipped -43, +43 lines =@@ + }; + })(); Object.defineProperty(exports, "__esModule", { value: true }); --var foo_1 = require("foo"); -+const foo_1 = require("foo"); +-var foo_1 = __importStar(require("foo")); ++const foo_1 = __importStar(require("foo")); require("./a"); require("./b"); (0, foo_1.default)((0, foo_1.bar)()); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.js b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.js index a85b8d66ea..cf974a2ca6 100644 --- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.js +++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.js @@ -10,6 +10,9 @@ foo.bar(); //// [a.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const foo_1 = require("foo"); +const foo_1 = __importDefault(require("foo")); foo_1.default.bar(); diff --git a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.js.diff b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.js.diff index a755437f9d..b780930711 100644 --- a/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.js.diff +++ b/testdata/baselines/reference/submodule/conformance/untypedModuleImport_allowJs.js.diff @@ -1,9 +1,9 @@ --- old.untypedModuleImport_allowJs.js +++ new.untypedModuleImport_allowJs.js -@@= skipped -10, +10 lines =@@ - //// [a.js] - "use strict"; +@@= skipped -13, +13 lines =@@ + return (mod && mod.__esModule) ? mod : { "default": mod }; + }; Object.defineProperty(exports, "__esModule", { value: true }); --var foo_1 = require("foo"); -+const foo_1 = require("foo"); +-var foo_1 = __importDefault(require("foo")); ++const foo_1 = __importDefault(require("foo")); foo_1.default.bar(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt b/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt deleted file mode 100644 index 906193198a..0000000000 --- a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).errors.txt +++ /dev/null @@ -1,31 +0,0 @@ -/main.ts(1,1): error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. - - -==== /decl.d.ts (0 errors) ==== - declare class CJSy {} - export = CJSy; - -==== /ambient.d.ts (0 errors) ==== - declare module "ambient" { - const _export: number; - export = _export; - } - -==== /types.ts (0 errors) ==== - interface Typey {} - export type { Typey }; - -==== /main.ts (1 errors) ==== - import CJSy = require("./decl"); // error - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1202: Import assignment cannot be used when targeting ECMAScript modules. Consider using 'import * as ns from "mod"', 'import {a} from "mod"', 'import d from "mod"', or another module format instead. - import type CJSy2 = require("./decl"); // ok I guess? - import CJSy3 from "./decl"; // ok in esModuleInterop - import * as types from "./types"; // ok - CJSy; - -==== /ns.ts (0 errors) ==== - export namespace ns { - export enum A {} - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).js b/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).js deleted file mode 100644 index 57efd689b0..0000000000 --- a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).js +++ /dev/null @@ -1,43 +0,0 @@ -//// [tests/cases/conformance/externalModules/verbatimModuleSyntaxRestrictionsESM.ts] //// - -//// [decl.d.ts] -declare class CJSy {} -export = CJSy; - -//// [ambient.d.ts] -declare module "ambient" { - const _export: number; - export = _export; -} - -//// [types.ts] -interface Typey {} -export type { Typey }; - -//// [main.ts] -import CJSy = require("./decl"); // error -import type CJSy2 = require("./decl"); // ok I guess? -import CJSy3 from "./decl"; // ok in esModuleInterop -import * as types from "./types"; // ok -CJSy; - -//// [ns.ts] -export namespace ns { - export enum A {} -} - - -//// [types.js] -export {}; -//// [main.js] -import CJSy3 from "./decl"; // ok in esModuleInterop -import * as types from "./types"; // ok -CJSy; -//// [ns.js] -export { ns }; -var ns; -(function (ns) { - let A; - (function (A) { - })(A = ns.A || (ns.A = {})); -})(ns || (ns = {})); diff --git a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).js.diff b/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).js.diff deleted file mode 100644 index 6c56f68a9b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).js.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).js -+++ new.verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).js -@@= skipped -33, +33 lines =@@ - import * as types from "./types"; // ok - CJSy; - //// [ns.js] --export var ns; -+export { ns }; -+var ns; - (function (ns) { - let A; - (function (A) { \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).symbols b/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).symbols deleted file mode 100644 index e270b023b7..0000000000 --- a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).symbols +++ /dev/null @@ -1,51 +0,0 @@ -//// [tests/cases/conformance/externalModules/verbatimModuleSyntaxRestrictionsESM.ts] //// - -=== /decl.d.ts === -declare class CJSy {} ->CJSy : Symbol(CJSy, Decl(decl.d.ts, 0, 0)) - -export = CJSy; ->CJSy : Symbol(CJSy, Decl(decl.d.ts, 0, 0)) - -=== /ambient.d.ts === -declare module "ambient" { ->"ambient" : Symbol("ambient", Decl(ambient.d.ts, 0, 0)) - - const _export: number; ->_export : Symbol(_export, Decl(ambient.d.ts, 1, 9)) - - export = _export; ->_export : Symbol(_export, Decl(ambient.d.ts, 1, 9)) -} - -=== /types.ts === -interface Typey {} ->Typey : Symbol(Typey, Decl(types.ts, 0, 0)) - -export type { Typey }; ->Typey : Symbol(Typey, Decl(types.ts, 1, 13)) - -=== /main.ts === -import CJSy = require("./decl"); // error ->CJSy : Symbol(CJSy, Decl(main.ts, 0, 0)) - -import type CJSy2 = require("./decl"); // ok I guess? ->CJSy2 : Symbol(CJSy2, Decl(main.ts, 0, 32)) - -import CJSy3 from "./decl"; // ok in esModuleInterop ->CJSy3 : Symbol(CJSy3, Decl(main.ts, 2, 6)) - -import * as types from "./types"; // ok ->types : Symbol(types, Decl(main.ts, 3, 6)) - -CJSy; ->CJSy : Symbol(CJSy, Decl(main.ts, 0, 0)) - -=== /ns.ts === -export namespace ns { ->ns : Symbol(ns, Decl(ns.ts, 0, 0)) - - export enum A {} ->A : Symbol(A, Decl(ns.ts, 0, 21)) -} - diff --git a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).types b/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).types deleted file mode 100644 index 5099017f15..0000000000 --- a/testdata/baselines/reference/submodule/conformance/verbatimModuleSyntaxRestrictionsESM(esmoduleinterop=false).types +++ /dev/null @@ -1,49 +0,0 @@ -//// [tests/cases/conformance/externalModules/verbatimModuleSyntaxRestrictionsESM.ts] //// - -=== /decl.d.ts === -declare class CJSy {} ->CJSy : CJSy - -export = CJSy; ->CJSy : CJSy - -=== /ambient.d.ts === -declare module "ambient" { ->"ambient" : typeof import("ambient") - - const _export: number; ->_export : number - - export = _export; ->_export : number -} - -=== /types.ts === -interface Typey {} -export type { Typey }; ->Typey : Typey - -=== /main.ts === -import CJSy = require("./decl"); // error ->CJSy : typeof CJSy - -import type CJSy2 = require("./decl"); // ok I guess? ->CJSy2 : typeof CJSy - -import CJSy3 from "./decl"; // ok in esModuleInterop ->CJSy3 : typeof CJSy - -import * as types from "./types"; // ok ->types : typeof types - -CJSy; ->CJSy : typeof CJSy - -=== /ns.ts === -export namespace ns { ->ns : typeof ns - - export enum A {} ->A : A -} - diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/alwaysStrictModule2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/alwaysStrictModule2.errors.txt.diff deleted file mode 100644 index 5aa82f0160..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/alwaysStrictModule2.errors.txt.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.alwaysStrictModule2.errors.txt -+++ new.alwaysStrictModule2.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - a.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode. - b.ts(3,13): error TS1100: Invalid use of 'arguments' in strict mode. - - -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== a.ts (1 errors) ==== - module M { - export function f() { \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/argumentsObjectCreatesRestForJs.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/argumentsObjectCreatesRestForJs.errors.txt.diff index 13e92bf5ea..a310bbe6cb 100644 --- a/testdata/baselines/reference/submoduleAccepted/compiler/argumentsObjectCreatesRestForJs.errors.txt.diff +++ b/testdata/baselines/reference/submoduleAccepted/compiler/argumentsObjectCreatesRestForJs.errors.txt.diff @@ -3,10 +3,11 @@ @@= skipped -0, +0 lines =@@ - +main.js(3,9): error TS2554: Expected 0 arguments, but got 3. -+main.js(6,16): error TS2554: Expected 0-2 arguments, but got 3. ++main.js(5,1): error TS2554: Expected 2 arguments, but got 0. ++main.js(6,16): error TS2554: Expected 2 arguments, but got 3. + + -+==== main.js (2 errors) ==== ++==== main.js (3 errors) ==== + function allRest() { arguments; } + allRest(); + allRest(1, 2, 3); @@ -14,9 +15,12 @@ +!!! error TS2554: Expected 0 arguments, but got 3. + function someRest(x, y) { arguments; } + someRest(); // x and y are still optional because they are in a JS file ++ ~~~~~~~~ ++!!! error TS2554: Expected 2 arguments, but got 0. ++!!! related TS6210 main.js:4:19: An argument for 'x' was not provided. + someRest(1, 2, 3); + ~ -+!!! error TS2554: Expected 0-2 arguments, but got 3. ++!!! error TS2554: Expected 2 arguments, but got 3. + + /** + * @param {number} x - a thing diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/argumentsPropertyNameInJsMode1.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/argumentsPropertyNameInJsMode1.errors.txt.diff new file mode 100644 index 0000000000..74f3c2eccd --- /dev/null +++ b/testdata/baselines/reference/submoduleAccepted/compiler/argumentsPropertyNameInJsMode1.errors.txt.diff @@ -0,0 +1,15 @@ +--- old.argumentsPropertyNameInJsMode1.errors.txt ++++ new.argumentsPropertyNameInJsMode1.errors.txt +@@= skipped -0, +0 lines =@@ +-a.js(9,7): error TS2554: Expected 0-1 arguments, but got 3. ++a.js(9,7): error TS2554: Expected 1 arguments, but got 3. + + + ==== a.js (1 errors) ==== +@@= skipped -11, +11 lines =@@ + + f2(1, 2, 3); + ~~~~ +-!!! error TS2554: Expected 0-1 arguments, but got 3. ++!!! error TS2554: Expected 1 arguments, but got 3. + \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/argumentsPropertyNameInJsMode2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/argumentsPropertyNameInJsMode2.errors.txt.diff index 3a8c657d10..4b482bf1ad 100644 --- a/testdata/baselines/reference/submoduleAccepted/compiler/argumentsPropertyNameInJsMode2.errors.txt.diff +++ b/testdata/baselines/reference/submoduleAccepted/compiler/argumentsPropertyNameInJsMode2.errors.txt.diff @@ -2,7 +2,7 @@ +++ new.argumentsPropertyNameInJsMode2.errors.txt @@= skipped -0, +0 lines =@@ - -+a.js(5,6): error TS2554: Expected 0-1 arguments, but got 3. ++a.js(5,6): error TS2554: Expected 1 arguments, but got 3. + + +==== a.js (1 errors) ==== @@ -12,5 +12,5 @@ + + f(1, 2, 3); + ~~~~ -+!!! error TS2554: Expected 0-1 arguments, but got 3. ++!!! error TS2554: Expected 1 arguments, but got 3. + \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/argumentsReferenceInFunction1_Js.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/argumentsReferenceInFunction1_Js.errors.txt.diff index 2d9239a61e..fd91514e04 100644 --- a/testdata/baselines/reference/submoduleAccepted/compiler/argumentsReferenceInFunction1_Js.errors.txt.diff +++ b/testdata/baselines/reference/submoduleAccepted/compiler/argumentsReferenceInFunction1_Js.errors.txt.diff @@ -3,7 +3,7 @@ @@= skipped -0, +0 lines =@@ index.js(1,25): error TS7006: Parameter 'f' implicitly has an 'any' type. -index.js(13,29): error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f?: any, ...any[]]'. -+index.js(13,29): error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f?: any]'. ++index.js(13,29): error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f: any]'. ==== index.js (2 errors) ==== @@ -12,6 +12,6 @@ return format.apply(null, arguments); ~~~~~~~~~ -!!! error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f?: any, ...any[]]'. -+!!! error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f?: any]'. ++!!! error TS2345: Argument of type 'IArguments' is not assignable to parameter of type '[f: any]'. }; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/blockScopedClassDeclarationAcrossFiles.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/blockScopedClassDeclarationAcrossFiles.errors.txt.diff deleted file mode 100644 index b1a20b8669..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/blockScopedClassDeclarationAcrossFiles.errors.txt.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- old.blockScopedClassDeclarationAcrossFiles.errors.txt -+++ new.blockScopedClassDeclarationAcrossFiles.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== c.ts (0 errors) ==== -+ let foo: typeof C; -+==== b.ts (0 errors) ==== -+ class C { } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/bundledDtsLateExportRenaming.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/bundledDtsLateExportRenaming.errors.txt.diff deleted file mode 100644 index 3342101d79..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/bundledDtsLateExportRenaming.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.bundledDtsLateExportRenaming.errors.txt -+++ new.bundledDtsLateExportRenaming.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== index.ts (0 errors) ==== -+ export * from "./nested"; -+ -+==== nested/base.ts (0 errors) ==== -+ import { B } from "./shared"; -+ -+ export function f() { -+ return new B(); -+ } -+ -+==== nested/derived.ts (0 errors) ==== -+ import { f } from "./base"; -+ -+ export function g() { -+ return f(); -+ } -+ -+==== nested/index.ts (0 errors) ==== -+ export * from "./base"; -+ -+ export * from "./derived"; -+ export * from "./shared"; -+ -+==== nested/shared.ts (0 errors) ==== -+ export class B {} -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/checkIndexConstraintOfJavascriptClassExpression.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/checkIndexConstraintOfJavascriptClassExpression.errors.txt.diff deleted file mode 100644 index 09726f841b..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/checkIndexConstraintOfJavascriptClassExpression.errors.txt.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- old.checkIndexConstraintOfJavascriptClassExpression.errors.txt -+++ new.checkIndexConstraintOfJavascriptClassExpression.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - weird.js(1,1): error TS2552: Cannot find name 'someFunction'. Did you mean 'Function'? - weird.js(1,23): error TS7006: Parameter 'BaseClass' implicitly has an 'any' type. - weird.js(9,17): error TS7006: Parameter 'error' implicitly has an 'any' type. - - -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== weird.js (3 errors) ==== - someFunction(function(BaseClass) { - ~~~~~~~~~~~~ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/compilerOptionsOutAndNoEmit.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/compilerOptionsOutAndNoEmit.errors.txt.diff deleted file mode 100644 index 6cb4262746..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/compilerOptionsOutAndNoEmit.errors.txt.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.compilerOptionsOutAndNoEmit.errors.txt -+++ new.compilerOptionsOutAndNoEmit.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class c { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/compilerOptionsOutFileAndNoEmit.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/compilerOptionsOutFileAndNoEmit.errors.txt.diff deleted file mode 100644 index c210d371cc..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/compilerOptionsOutFileAndNoEmit.errors.txt.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.compilerOptionsOutFileAndNoEmit.errors.txt -+++ new.compilerOptionsOutFileAndNoEmit.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class c { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/constDeclarations-useBeforeDefinition2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/constDeclarations-useBeforeDefinition2.errors.txt.diff deleted file mode 100644 index 3dc83ed037..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/constDeclarations-useBeforeDefinition2.errors.txt.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- old.constDeclarations-useBeforeDefinition2.errors.txt -+++ new.constDeclarations-useBeforeDefinition2.errors.txt -@@= skipped -0, +0 lines =@@ --file1.ts(1,1): error TS2448: Block-scoped variable 'c' used before its declaration. -- -- --==== file1.ts (1 errors) ==== -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== file1.ts (0 errors) ==== - c; -- ~ --!!! error TS2448: Block-scoped variable 'c' used before its declaration. --!!! related TS2728 file2.ts:1:7: 'c' is declared here. - - ==== file2.ts (0 errors) ==== - const c = 0; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/controlFlowJavascript.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/controlFlowJavascript.errors.txt.diff deleted file mode 100644 index 8e5ff57b1c..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/controlFlowJavascript.errors.txt.diff +++ /dev/null @@ -1,117 +0,0 @@ ---- old.controlFlowJavascript.errors.txt -+++ new.controlFlowJavascript.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'controlFlowJavascript.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'controlFlowJavascript.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== controlFlowJavascript.js (0 errors) ==== -+ let cond = true; -+ -+ // CFA for 'let' and no initializer -+ function f1() { -+ let x; -+ if (cond) { -+ x = 1; -+ } -+ if (cond) { -+ x = "hello"; -+ } -+ const y = x; // string | number | undefined -+ } -+ -+ // CFA for 'let' and 'undefined' initializer -+ function f2() { -+ let x = undefined; -+ if (cond) { -+ x = 1; -+ } -+ if (cond) { -+ x = "hello"; -+ } -+ const y = x; // string | number | undefined -+ } -+ -+ // CFA for 'let' and 'null' initializer -+ function f3() { -+ let x = null; -+ if (cond) { -+ x = 1; -+ } -+ if (cond) { -+ x = "hello"; -+ } -+ const y = x; // string | number | null -+ } -+ -+ // CFA for 'var' with no initializer -+ function f5() { -+ var x; -+ if (cond) { -+ x = 1; -+ } -+ if (cond) { -+ x = "hello"; -+ } -+ const y = x; // string | number | undefined -+ } -+ -+ // CFA for 'var' with 'undefined' initializer -+ function f6() { -+ var x = undefined; -+ if (cond) { -+ x = 1; -+ } -+ if (cond) { -+ x = "hello"; -+ } -+ const y = x; // string | number | undefined -+ } -+ -+ // CFA for 'var' with 'null' initializer -+ function f7() { -+ var x = null; -+ if (cond) { -+ x = 1; -+ } -+ if (cond) { -+ x = "hello"; -+ } -+ const y = x; // string | number | null -+ } -+ -+ // No CFA for captured outer variables -+ function f9() { -+ let x; -+ if (cond) { -+ x = 1; -+ } -+ if (cond) { -+ x = "hello"; -+ } -+ const y = x; // string | number | undefined -+ function f() { -+ const z = x; // any -+ } -+ } -+ -+ // No CFA for captured outer variables -+ function f10() { -+ let x; -+ if (cond) { -+ x = 1; -+ } -+ if (cond) { -+ x = "hello"; -+ } -+ const y = x; // string | number | undefined -+ const f = () => { -+ const z = x; // any -+ }; -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/controlFlowJavascript.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/controlFlowJavascript.types.diff deleted file mode 100644 index 57b32f848e..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/controlFlowJavascript.types.diff +++ /dev/null @@ -1,90 +0,0 @@ ---- old.controlFlowJavascript.types -+++ new.controlFlowJavascript.types -@@= skipped -28, +28 lines =@@ - >"hello" : "hello" - } - const y = x; // string | number | undefined -->y : string | number -->x : string | number -+>y : any -+>x : any - } - - // CFA for 'let' and 'undefined' initializer -@@= skipped -29, +29 lines =@@ - >"hello" : "hello" - } - const y = x; // string | number | undefined -->y : string | number -->x : string | number -+>y : any -+>x : any - } - - // CFA for 'let' and 'null' initializer -@@= skipped -28, +28 lines =@@ - >"hello" : "hello" - } - const y = x; // string | number | null -->y : string | number -->x : string | number -+>y : any -+>x : any - } - - // CFA for 'var' with no initializer -@@= skipped -28, +28 lines =@@ - >"hello" : "hello" - } - const y = x; // string | number | undefined -->y : string | number -->x : string | number -+>y : any -+>x : any - } - - // CFA for 'var' with 'undefined' initializer -@@= skipped -29, +29 lines =@@ - >"hello" : "hello" - } - const y = x; // string | number | undefined -->y : string | number -->x : string | number -+>y : any -+>x : any - } - - // CFA for 'var' with 'null' initializer -@@= skipped -28, +28 lines =@@ - >"hello" : "hello" - } - const y = x; // string | number | null -->y : string | number -->x : string | number -+>y : any -+>x : any - } - - // No CFA for captured outer variables -@@= skipped -28, +28 lines =@@ - >"hello" : "hello" - } - const y = x; // string | number | undefined -->y : string | number -->x : string | number -+>y : any -+>x : any - - function f() { - >f : () => void -@@= skipped -36, +36 lines =@@ - >"hello" : "hello" - } - const y = x; // string | number | undefined -->y : string | number -->x : string | number -+>y : any -+>x : any - - const f = () => { - >f : () => void \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt.diff deleted file mode 100644 index e536c91604..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declFileWithErrorsInInputDeclarationFileWithOut.errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.declFileWithErrorsInInputDeclarationFileWithOut.errors.txt -+++ new.declFileWithErrorsInInputDeclarationFileWithOut.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - declFile.d.ts(2,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. - declFile.d.ts(3,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. - declFile.d.ts(5,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. - declFile.d.ts(7,5): error TS1038: A 'declare' modifier cannot be used in an already ambient context. - - -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== client.ts (0 errors) ==== - /// - var x = new M.C(); // Declaration file wont get emitted because there are errors in declaration file \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.errors.txt.diff deleted file mode 100644 index dd6432977f..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitBundlePreservesHasNoDefaultLibDirective.errors.txt.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.declarationEmitBundlePreservesHasNoDefaultLibDirective.errors.txt -+++ new.declarationEmitBundlePreservesHasNoDefaultLibDirective.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== extensions.ts (0 errors) ==== -+ /// -+ class Foo { -+ public: string; -+ } -+==== core.ts (0 errors) ==== -+ interface Array {} -+ interface Boolean {} -+ interface Function {} -+ interface IArguments {} -+ interface Number {} -+ interface Object {} -+ interface RegExp {} -+ interface String {} -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt.diff deleted file mode 100644 index 44b2b12e15..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt -+++ new.declarationEmitCommonSourceDirectoryDoesNotContainAllFiles.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== /a/index.ts (0 errors) ==== -+ export * from "./src/" -+==== /b/index.ts (0 errors) ==== -+ export * from "./src/" -+==== /b/src/index.ts (0 errors) ==== -+ export class B {} -+==== /a/src/index.ts (0 errors) ==== -+ import { B } from "b"; -+ -+ export default function () { -+ return new B(); -+ } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitMonorepoBaseUrl.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitMonorepoBaseUrl.errors.txt.diff deleted file mode 100644 index 1f0aa50e9a..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitMonorepoBaseUrl.errors.txt.diff +++ /dev/null @@ -1,63 +0,0 @@ ---- old.declarationEmitMonorepoBaseUrl.errors.txt -+++ new.declarationEmitMonorepoBaseUrl.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/tsconfig.json(6,5): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== /tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "module": "nodenext", -+ "declaration": true, -+ "outDir": "temp", -+ "baseUrl": "." -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ } -+ } -+ -+==== /packages/compiler-core/src/index.ts (0 errors) ==== -+ import { PluginConfig } from "@babel/parser"; -+ -+==== /packages/compiler-sfc/src/index.ts (0 errors) ==== -+ import { createPlugin } from "@babel/parser"; -+ export function resolveParserPlugins() { -+ return [createPlugin()]; -+ } -+ -+==== /node_modules/.pnpm/@babel+parser@7.23.6/node_modules/@babel/parser/package.json (0 errors) ==== -+ { -+ "name": "@babel/parser", -+ "version": "7.23.6", -+ "main": "./lib/index.js", -+ "types": "./typings/babel-parser.d.ts" -+ } -+ -+==== /node_modules/.pnpm/@babel+parser@7.23.6/node_modules/@babel/parser/typings/babel-parser.d.ts (0 errors) ==== -+ export declare function createPlugin(): PluginConfig; -+ export declare class PluginConfig {} -+ -+==== /packages/compiler-core/package.json (0 errors) ==== -+ { -+ "name": "@vue/compiler-core", -+ "version": "3.0.0", -+ "main": "./src/index.ts", -+ "dependencies": { -+ "@babel/parser": "^7.0.0" -+ } -+ } -+ -+==== /packages/compiler-sfc/package.json (0 errors) ==== -+ { -+ "name": "@vue/compiler-sfc", -+ "version": "3.0.0", -+ "main": "./src/index.ts", -+ "dependencies": { -+ "@babel/parser": "^7.0.0", -+ "@vue/compiler-core": "^3.0.0" -+ } -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitOutFileBundlePaths.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitOutFileBundlePaths.errors.txt.diff deleted file mode 100644 index fd3212568d..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitOutFileBundlePaths.errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.declarationEmitOutFileBundlePaths.errors.txt -+++ new.declarationEmitOutFileBundlePaths.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== js/versions.static.js (0 errors) ==== -+ export default { -+ "@a/b": "1.0.0", -+ "@a/c": "1.2.3" -+ }; -+==== js/index.js (0 errors) ==== -+ import versions from './versions.static.js'; -+ -+ export { -+ versions -+ }; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPathMappingMonorepo.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPathMappingMonorepo.errors.txt.diff deleted file mode 100644 index a6688b68bc..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPathMappingMonorepo.errors.txt.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- old.declarationEmitPathMappingMonorepo.errors.txt -+++ new.declarationEmitPathMappingMonorepo.errors.txt -@@= skipped -0, +0 lines =@@ -- -+packages/b/tsconfig.json(5,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== packages/b/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "outDir": "dist", -+ "declaration": true, -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "@ts-bug/a": ["../a"] -+ } -+ } -+ } -+ -+ -+==== packages/b/src/index.ts (0 errors) ==== -+ import { a } from "@ts-bug/a"; -+ -+ export function b(text: string) { -+ return a(text); -+ } -+==== packages/a/index.d.ts (0 errors) ==== -+ declare module "@ts-bug/a" { -+ export type AText = { -+ value: string; -+ }; -+ export function a(text: string): AText; -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPathMappingMonorepo2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPathMappingMonorepo2.errors.txt.diff deleted file mode 100644 index 9d40c1b7cf..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPathMappingMonorepo2.errors.txt.diff +++ /dev/null @@ -1,58 +0,0 @@ ---- old.declarationEmitPathMappingMonorepo2.errors.txt -+++ new.declarationEmitPathMappingMonorepo2.errors.txt -@@= skipped -0, +0 lines =@@ -- -+packages/lab/src/index.ts(1,31): error TS2307: Cannot find module '@ts-bug/core/utils' or its corresponding type declarations. -+packages/lab/tsconfig.json(5,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./../*"]}' instead. -+ -+ -+==== packages/lab/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "outDir": "dist", -+ "declaration": true, -+ "baseUrl": "../", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./../*"]}' instead. -+ "paths": { -+ "@ts-bug/core": ["./core/src"], -+ "@ts-bug/core/*": ["./core/src/*"], -+ "@ts-bug/lab": ["./lab/src"], -+ "@ts-bug/lab/*": ["./lab/src/*"], -+ "@ts-bug/styles": ["./styles/src"], -+ "@ts-bug/styles/*": ["./styles/src/*"] -+ } -+ } -+ } -+==== packages/lab/src/index.ts (1 errors) ==== -+ import { createSvgIcon } from "@ts-bug/core/utils"; -+ ~~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module '@ts-bug/core/utils' or its corresponding type declarations. -+ export default createSvgIcon("Hello", "ArrowLeft"); -+ -+==== packages/core/src/index.d.ts (0 errors) ==== -+ export * from "./utils"; -+ export { default as SvgIcon } from "./SvgIcon"; -+ -+==== packages/core/src/SvgIcon.d.ts (0 errors) ==== -+ import { StyledComponentProps } from "@ts-bug/styles"; -+ export interface SvgIconProps extends StyledComponentProps<"root"> { -+ children?: string[]; -+ } -+ export interface SomeInterface { -+ myProp: string; -+ } -+ declare const SvgIcon: SomeInterface; -+ export default SvgIcon; -+ -+==== packages/core/src/utils.d.ts (0 errors) ==== -+ import SvgIcon from "./SvgIcon"; -+ export function createSvgIcon(path: string, displayName: string): typeof SvgIcon; -+ -+==== packages/styles/src/index.d.ts (0 errors) ==== -+ export interface StyledComponentProps { -+ classes?: Record; -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPrefersPathKindBasedOnBundling.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPrefersPathKindBasedOnBundling.errors.txt.diff deleted file mode 100644 index 0f33e1d9f5..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationEmitPrefersPathKindBasedOnBundling.errors.txt.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.declarationEmitPrefersPathKindBasedOnBundling.errors.txt -+++ new.declarationEmitPrefersPathKindBasedOnBundling.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+==== src/lib/operators/scalar.ts (0 errors) ==== -+ export interface Scalar { -+ (): string; -+ value: number; -+ } -+ -+ export function scalar(value: string): Scalar { -+ return null as any; -+ } -+==== src/settings/spacing.ts (0 errors) ==== -+ import { scalar } from '../lib/operators/scalar'; -+ -+ export default { -+ get xs() { -+ return scalar("14px"); -+ } -+ }; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationFileOverwriteErrorWithOut.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationFileOverwriteErrorWithOut.errors.txt.diff deleted file mode 100644 index 906e105f99..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationFileOverwriteErrorWithOut.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.declarationFileOverwriteErrorWithOut.errors.txt -+++ new.declarationFileOverwriteErrorWithOut.errors.txt -@@= skipped -0, +0 lines =@@ --error TS5055: Cannot write file '/out.d.ts' because it would overwrite input file. -- Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -- -- --!!! error TS5055: Cannot write file '/out.d.ts' because it would overwrite input file. --!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== /out.d.ts (0 errors) ==== - declare class c { - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationFilesGeneratingTypeReferences.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationFilesGeneratingTypeReferences.errors.txt.diff deleted file mode 100644 index 97e8bb6ee0..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationFilesGeneratingTypeReferences.errors.txt.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- old.declarationFilesGeneratingTypeReferences.errors.txt -+++ new.declarationFilesGeneratingTypeReferences.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== /a/node_modules/@types/jquery/index.d.ts (0 errors) ==== -+ interface JQuery { -+ -+ } -+ -+==== /a/app.ts (0 errors) ==== -+ /// -+ namespace Test { -+ export var x: JQuery; -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationMapsOutFile2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationMapsOutFile2.errors.txt.diff deleted file mode 100644 index 2068ff05ce..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationMapsOutFile2.errors.txt.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.declarationMapsOutFile2.errors.txt -+++ new.declarationMapsOutFile2.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class Foo { -+ doThing(x: {a: number}) { -+ return {b: x.a}; -+ } -+ static make() { -+ return new Foo(); -+ } -+ } -+==== index.ts (0 errors) ==== -+ const c = new Foo(); -+ c.doThing({a: 42}); -+ -+ let x = c.doThing({a: 12}); -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/declarationMapsWithSourceMap.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/declarationMapsWithSourceMap.errors.txt.diff deleted file mode 100644 index 3c2e0e39e8..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/declarationMapsWithSourceMap.errors.txt.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.declarationMapsWithSourceMap.errors.txt -+++ new.declarationMapsWithSourceMap.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class Foo { -+ doThing(x: {a: number}) { -+ return {b: x.a}; -+ } -+ static make() { -+ return new Foo(); -+ } -+ } -+==== index.ts (0 errors) ==== -+ const c = new Foo(); -+ c.doThing({a: 42}); -+ -+ let x = c.doThing({a: 12}); -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember8.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember8.errors.txt.diff deleted file mode 100644 index b3b6668e75..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/importNonExportedMember8.errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.importNonExportedMember8.errors.txt -+++ new.importNonExportedMember8.errors.txt -@@= skipped -0, +0 lines =@@ --b.js(1,10): error TS2598: 'Foo' can only be imported by using a 'require' call or by turning on the 'esModuleInterop' flag and using a default import. -+b.js(1,10): error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import. - b.js(1,21): error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export. - - -@@= skipped -8, +8 lines =@@ - ==== b.js (2 errors) ==== - import { Foo } from './a'; - ~~~ --!!! error TS2598: 'Foo' can only be imported by using a 'require' call or by turning on the 'esModuleInterop' flag and using a default import. -+!!! error TS2617: 'Foo' can only be imported by using 'import Foo = require("./a")' or by turning on the 'esModuleInterop' flag and using a default import. - ~~~~~ - !!! error TS2497: This module can only be referenced with ECMAScript imports/exports by turning on the 'esModuleInterop' flag and referencing its default export. - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/incrementalOut.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/incrementalOut.errors.txt.diff deleted file mode 100644 index b5cd0c5543..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/incrementalOut.errors.txt.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.incrementalOut.errors.txt -+++ new.incrementalOut.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== incrementalOut.ts (0 errors) ==== -+ const x = 10; -+ -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/inlineSourceMap2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/inlineSourceMap2.errors.txt.diff deleted file mode 100644 index f072172c64..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/inlineSourceMap2.errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.inlineSourceMap2.errors.txt -+++ new.inlineSourceMap2.errors.txt -@@= skipped -0, +0 lines =@@ - error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'. - error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - - !!! error TS5053: Option 'mapRoot' cannot be specified with option 'inlineSourceMap'. - !!! error TS5053: Option 'sourceMap' cannot be specified with option 'inlineSourceMap'. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== inlineSourceMap2.ts (0 errors) ==== - // configuration errors - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/inlineSources.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/inlineSources.errors.txt.diff deleted file mode 100644 index 9078ab82cc..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/inlineSources.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.inlineSources.errors.txt -+++ new.inlineSources.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ var a = 0; -+ console.log(a); -+ -+==== b.ts (0 errors) ==== -+ var b = 0; -+ console.log(b); -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/inlineSources2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/inlineSources2.errors.txt.diff deleted file mode 100644 index ea85eccc64..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/inlineSources2.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.inlineSources2.errors.txt -+++ new.inlineSources2.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ var a = 0; -+ console.log(a); -+ -+==== b.ts (0 errors) ==== -+ var b = 0; -+ console.log(b); -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationClassMethodContainingArrowFunction.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationClassMethodContainingArrowFunction.errors.txt.diff deleted file mode 100644 index 801e55a5b0..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationClassMethodContainingArrowFunction.errors.txt.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- old.jsFileCompilationClassMethodContainingArrowFunction.errors.txt -+++ new.jsFileCompilationClassMethodContainingArrowFunction.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.js (0 errors) ==== -+ class c { -+ method(a) { -+ let x = a => this.method(a); -+ } -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateFunctionImplementation.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateFunctionImplementation.errors.txt.diff deleted file mode 100644 index 0e0a30a8b4..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateFunctionImplementation.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.jsFileCompilationDuplicateFunctionImplementation.errors.txt -+++ new.jsFileCompilationDuplicateFunctionImplementation.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - a.ts(1,10): error TS2393: Duplicate function implementation. - - -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== b.js (0 errors) ==== - function foo() { - return 10; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt.diff deleted file mode 100644 index 70265e7427..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt -+++ new.jsFileCompilationDuplicateFunctionImplementationFileOrderReversed.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - a.ts(1,10): error TS2393: Duplicate function implementation. - - -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== a.ts (1 errors) ==== - function foo() { - ~~~ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateVariable.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateVariable.errors.txt.diff deleted file mode 100644 index fbe44be830..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateVariable.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.jsFileCompilationDuplicateVariable.errors.txt -+++ new.jsFileCompilationDuplicateVariable.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ var x = 10; -+ -+==== b.js (0 errors) ==== -+ var x = "hello"; // Error is recorded here, but suppressed because the js file isn't checked -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateVariableErrorReported.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateVariableErrorReported.errors.txt.diff deleted file mode 100644 index 50718c6410..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationDuplicateVariableErrorReported.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.jsFileCompilationDuplicateVariableErrorReported.errors.txt -+++ new.jsFileCompilationDuplicateVariableErrorReported.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - a.ts(1,5): error TS2403: Subsequent variable declarations must have the same type. Variable 'x' must be of type 'string', but here has type 'number'. - - -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== b.js (0 errors) ==== - var x = "hello"; - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationEmitDeclarations.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationEmitDeclarations.errors.txt.diff deleted file mode 100644 index a5e1e98ecb..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationEmitDeclarations.errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.jsFileCompilationEmitDeclarations.errors.txt -+++ new.jsFileCompilationEmitDeclarations.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class c { -+ } -+ -+==== b.js (0 errors) ==== -+ function foo() { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationEmitTrippleSlashReference.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationEmitTrippleSlashReference.errors.txt.diff deleted file mode 100644 index bd80e773b1..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationEmitTrippleSlashReference.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.jsFileCompilationEmitTrippleSlashReference.errors.txt -+++ new.jsFileCompilationEmitTrippleSlashReference.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5055: Cannot write file 'c.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5055: Cannot write file 'c.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class c { -+ } -+ -+==== b.js (0 errors) ==== -+ /// -+ function foo() { -+ } -+ -+==== c.js (0 errors) ==== -+ function bar() { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt.diff deleted file mode 100644 index dcdb165e16..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt -+++ new.jsFileCompilationErrorOnDeclarationsWithJsFileReferenceWithOut.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'c.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'c.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class c { -+ } -+ -+==== b.ts (0 errors) ==== -+ /// -+ function foo() { -+ } -+ -+==== c.js (0 errors) ==== -+ function bar() { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetBeingRenamed.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetBeingRenamed.errors.txt.diff deleted file mode 100644 index 207a2ba312..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetBeingRenamed.errors.txt.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- old.jsFileCompilationLetBeingRenamed.errors.txt -+++ new.jsFileCompilationLetBeingRenamed.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.js (0 errors) ==== -+ function foo(a) { -+ for (let a = 0; a < 10; a++) { -+ // do something -+ } -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetDeclarationOrder.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetDeclarationOrder.errors.txt.diff deleted file mode 100644 index 07628a3880..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetDeclarationOrder.errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.jsFileCompilationLetDeclarationOrder.errors.txt -+++ new.jsFileCompilationLetDeclarationOrder.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== b.js (0 errors) ==== -+ let a = 10; -+ b = 30; -+ -+==== a.ts (0 errors) ==== -+ let b = 30; -+ a = 10; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetDeclarationOrder2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetDeclarationOrder2.errors.txt.diff deleted file mode 100644 index a33f3984a1..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationLetDeclarationOrder2.errors.txt.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.jsFileCompilationLetDeclarationOrder2.errors.txt -+++ new.jsFileCompilationLetDeclarationOrder2.errors.txt -@@= skipped -0, +0 lines =@@ --a.ts(2,1): error TS2448: Block-scoped variable 'a' used before its declaration. -- -- --==== a.ts (1 errors) ==== -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== - let b = 30; - a = 10; -- ~ --!!! error TS2448: Block-scoped variable 'a' used before its declaration. --!!! related TS2728 b.js:1:5: 'a' is declared here. - ==== b.js (0 errors) ==== - let a = 10; - b = 30; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt.diff deleted file mode 100644 index c8679c9130..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt -+++ new.jsFileCompilationNoErrorWithoutDeclarationsWithJsFileReferenceWithOut.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'c.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'c.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class c { -+ } -+ -+==== b.ts (0 errors) ==== -+ /// -+ //no error on above reference since not emitting declarations -+ function foo() { -+ } -+ -+==== c.js (0 errors) ==== -+ function bar() { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationNonNullAssertion.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationNonNullAssertion.errors.txt.diff deleted file mode 100644 index 774688f7f7..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationNonNullAssertion.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.jsFileCompilationNonNullAssertion.errors.txt -+++ new.jsFileCompilationNonNullAssertion.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - /src/a.js(1,1): error TS8013: Non-null assertions can only be used in TypeScript files. - - -+!!! error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== /src/a.js (1 errors) ==== - 0! - ~~ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationRestParameter.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationRestParameter.errors.txt.diff deleted file mode 100644 index ef86de6a95..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationRestParameter.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.jsFileCompilationRestParameter.errors.txt -+++ new.jsFileCompilationRestParameter.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.js (0 errors) ==== -+ function foo(...a) { } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationShortHandProperty.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationShortHandProperty.errors.txt.diff deleted file mode 100644 index 214cb808a0..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationShortHandProperty.errors.txt.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- old.jsFileCompilationShortHandProperty.errors.txt -+++ new.jsFileCompilationShortHandProperty.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.js (0 errors) ==== -+ function foo() { -+ var a = 10; -+ var b = "Hello"; -+ return { -+ a, -+ b -+ }; -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationTypeAssertions.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationTypeAssertions.errors.txt.diff deleted file mode 100644 index c859e79ebe..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationTypeAssertions.errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.jsFileCompilationTypeAssertions.errors.txt -+++ new.jsFileCompilationTypeAssertions.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - /src/a.js(1,6): error TS8016: Type assertion expressions can only be used in TypeScript files. - /src/a.js(2,10): error TS17008: JSX element 'string' has no corresponding closing tag. - /src/a.js(3,1): error TS1005: ' -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class c { -+ } -+ -+==== b.js (0 errors) ==== -+ function foo() { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOut.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOut.errors.txt.diff deleted file mode 100644 index 6a293d71f6..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOut.errors.txt.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- old.jsFileCompilationWithOut.errors.txt -+++ new.jsFileCompilationWithOut.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ class c { -+ } -+ -+==== b.js (0 errors) ==== -+ function foo() { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt.diff deleted file mode 100644 index 1f86bc14cf..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt -+++ new.jsFileCompilationWithOutDeclarationFileNameSameAsInputJsFile.errors.txt -@@= skipped -0, +0 lines =@@ --error TS5055: Cannot write file '/b.d.ts' because it would overwrite input file. -- Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -- -- --!!! error TS5055: Cannot write file '/b.d.ts' because it would overwrite input file. --!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== /a.ts (0 errors) ==== - class c { - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt.diff deleted file mode 100644 index 0d0626696c..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt -+++ new.jsFileCompilationWithOutFileNameSameAsInputJsFile.errors.txt -@@= skipped -0, +0 lines =@@ - error TS5055: Cannot write file '/b.js' because it would overwrite input file. - Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - - - !!! error TS5055: Cannot write file '/b.js' because it would overwrite input file. - !!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== /a.ts (0 errors) ==== - class c { - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileFunctionParametersAsOptional.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileFunctionParametersAsOptional.errors.txt.diff new file mode 100644 index 0000000000..a47690fc80 --- /dev/null +++ b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileFunctionParametersAsOptional.errors.txt.diff @@ -0,0 +1,28 @@ +--- old.jsFileFunctionParametersAsOptional.errors.txt ++++ new.jsFileFunctionParametersAsOptional.errors.txt +@@= skipped -0, +0 lines =@@ +- ++bar.ts(1,1): error TS2554: Expected 3 arguments, but got 0. ++bar.ts(2,1): error TS2554: Expected 3 arguments, but got 1. ++bar.ts(3,1): error TS2554: Expected 3 arguments, but got 2. ++ ++ ++==== foo.js (0 errors) ==== ++ function f(a, b, c) { } ++ ++ ++==== bar.ts (3 errors) ==== ++ f(); ++ ~ ++!!! error TS2554: Expected 3 arguments, but got 0. ++!!! related TS6210 foo.js:1:12: An argument for 'a' was not provided. ++ f(1); ++ ~ ++!!! error TS2554: Expected 3 arguments, but got 1. ++!!! related TS6210 foo.js:1:15: An argument for 'b' was not provided. ++ f(1, 2); ++ ~ ++!!! error TS2554: Expected 3 arguments, but got 2. ++!!! related TS6210 foo.js:1:18: An argument for 'c' was not provided. ++ f(1, 2, 3); ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileFunctionParametersAsOptional2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/jsFileFunctionParametersAsOptional2.errors.txt.diff deleted file mode 100644 index 7502dd5e15..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/jsFileFunctionParametersAsOptional2.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.jsFileFunctionParametersAsOptional2.errors.txt -+++ new.jsFileFunctionParametersAsOptional2.errors.txt -@@= skipped -0, +0 lines =@@ --bar.ts(1,1): error TS2554: Expected 3 arguments, but got 0. --bar.ts(2,1): error TS2554: Expected 3 arguments, but got 1. --bar.ts(3,1): error TS2554: Expected 3 arguments, but got 2. -- -- --==== foo.js (0 errors) ==== -- /** -- * @param a -- * @param b -- * @param c -- */ -- function f(a, b, c) { } -- -- --==== bar.ts (3 errors) ==== -- f(); // Error -- ~ --!!! error TS2554: Expected 3 arguments, but got 0. --!!! related TS6210 foo.js:6:12: An argument for 'a' was not provided. -- f(1); // Error -- ~ --!!! error TS2554: Expected 3 arguments, but got 1. --!!! related TS6210 foo.js:6:15: An argument for 'b' was not provided. -- f(1, 2); // Error -- ~ --!!! error TS2554: Expected 3 arguments, but got 2. --!!! related TS6210 foo.js:6:18: An argument for 'c' was not provided. -- -- f(1, 2, 3); // OK -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/letDeclarations-useBeforeDefinition2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/letDeclarations-useBeforeDefinition2.errors.txt.diff deleted file mode 100644 index c2d271b455..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/letDeclarations-useBeforeDefinition2.errors.txt.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- old.letDeclarations-useBeforeDefinition2.errors.txt -+++ new.letDeclarations-useBeforeDefinition2.errors.txt -@@= skipped -0, +0 lines =@@ --file1.ts(1,1): error TS2448: Block-scoped variable 'l' used before its declaration. -- -- --==== file1.ts (1 errors) ==== -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== file1.ts (0 errors) ==== - l; -- ~ --!!! error TS2448: Block-scoped variable 'l' used before its declaration. --!!! related TS2728 file2.ts:1:7: 'l' is declared here. - - ==== file2.ts (0 errors) ==== - const l = 0; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2015).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2015).errors.txt.diff deleted file mode 100644 index a159e1bb64..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2015).errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.moduleNoneDynamicImport(target=es2015).errors.txt -+++ new.moduleNoneDynamicImport(target=es2015).errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file '/b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+/a.ts(1,13): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'. -+ -+ -+!!! error TS5055: Cannot write file '/b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== /a.ts (1 errors) ==== -+ const foo = import("./b"); -+ ~~~~~~~~~~~~~ -+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'. -+ -+==== /b.js (0 errors) ==== -+ export default 1; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2020).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2020).errors.txt.diff deleted file mode 100644 index 7edc394d3a..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneDynamicImport(target=es2020).errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.moduleNoneDynamicImport(target=es2020).errors.txt -+++ new.moduleNoneDynamicImport(target=es2020).errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file '/b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+/a.ts(1,13): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'. -+ -+ -+!!! error TS5055: Cannot write file '/b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== /a.ts (1 errors) ==== -+ const foo = import("./b"); -+ ~~~~~~~~~~~~~ -+!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', 'node20', or 'nodenext'. -+ -+==== /b.js (0 errors) ==== -+ export default 1; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneOutFile.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneOutFile.errors.txt.diff deleted file mode 100644 index 828328de17..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleNoneOutFile.errors.txt.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- old.moduleNoneOutFile.errors.txt -+++ new.moduleNoneOutFile.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== first.ts (0 errors) ==== -+ class Foo {} -+==== second.ts (0 errors) ==== -+ class Bar extends Foo {} \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt.diff deleted file mode 100644 index e7a547ed5b..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt.diff +++ /dev/null @@ -1,59 +0,0 @@ ---- old.moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt -+++ new.moduleResolutionPackageIdWithRelativeAndAbsolutePath.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/project/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== /project/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "@shared/*": ["../shared/*"] -+ } -+ }, -+ //"files": ["src/app.ts"] -+ } -+==== /project/src/app.ts (0 errors) ==== -+ import * as t from "anotherLib"; // Include the lib that recursively includes option as relative module resolution in this directory -+ import { makeSharedOption } from "@shared/lib/app"; // Includes option as module in shared folder but as module in node_modules folder -+ -+==== /shared/node_modules/troublesome-lib/package.json (0 errors) ==== -+ { -+ "name": "troublesome-lib", -+ "version": "1.17.1" -+ } -+==== /shared/node_modules/troublesome-lib/lib/Compactable.d.ts (0 errors) ==== -+ import { Option } from './Option'; -+ export class Compactable { -+ option: Option; -+ } -+==== /shared/node_modules/troublesome-lib/lib/Option.d.ts (0 errors) ==== -+ export class Option { -+ someProperty: string; -+ } -+==== /shared/lib/app.d.ts (0 errors) ==== -+ import { Option } from "troublesome-lib/lib/Option"; -+ export class SharedOption extends Option { } -+ export const makeSharedOption: () => SharedOption; -+==== /project/node_modules/anotherLib/index.d.ts (0 errors) ==== -+ import { Compactable } from "troublesome-lib/lib/Compactable"; // Including this will resolve Option as relative through the imports of compactable -+==== /project/node_modules/troublesome-lib/package.json (0 errors) ==== -+ { -+ "name": "troublesome-lib", -+ "version": "1.17.1" -+ } -+==== /project/node_modules/troublesome-lib/lib/Compactable.d.ts (0 errors) ==== -+ import { Option } from './Option'; -+ export class Compactable { -+ option: Option; -+ } -+==== /project/node_modules/troublesome-lib/lib/Option.d.ts (0 errors) ==== -+ export class Option { -+ someProperty: string; -+ } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithExtensions_withPaths.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithExtensions_withPaths.errors.txt.diff deleted file mode 100644 index eabb80cb29..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithExtensions_withPaths.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.moduleResolutionWithExtensions_withPaths.errors.txt -+++ new.moduleResolutionWithExtensions_withPaths.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(7,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -+/tsconfig.json(6,3): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+/tsconfig.json(11,14): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== /tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "outDir": "lib", - "target": "ES6", - "module": "ES6", - "baseUrl": "/", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "moduleResolution": "Node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - "noImplicitAny": true, - "traceResolution": true, - "paths": { - "foo/*": ["node_modules/foo/lib/*"] -+ ~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt.diff deleted file mode 100644 index 1dc67f7b32..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt -+++ new.moduleResolutionWithSuffixes_one_externalModule_withPaths.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(6,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -+/tsconfig.json(9,3): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+/tsconfig.json(11,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+/tsconfig.json(12,23): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== /tsconfig.json (3 errors) ==== - { - "compilerOptions": { - "allowJs": true, - "checkJs": false, - "outDir": "bin", - "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. - "traceResolution": true, - "moduleSuffixes": [".ios"], - "baseUrl": "/", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "some-library": ["node_modules/some-library/lib"], -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - "some-library/*": ["node_modules/some-library/lib/*"] -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_jsModule.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_jsModule.errors.txt.diff deleted file mode 100644 index 80d11e391b..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolutionWithSuffixes_one_jsModule.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.moduleResolutionWithSuffixes_one_jsModule.errors.txt -+++ new.moduleResolutionWithSuffixes_one_jsModule.errors.txt -@@= skipped -0, +0 lines =@@ --/tsconfig.json(6,23): error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- -- --==== /tsconfig.json (1 errors) ==== -- { -- "compilerOptions": { -- "allowJs": true, -- "checkJs": false, -- "outDir": "bin", -- "moduleResolution": "node", -- ~~~~~~ --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -- "traceResolution": true, -- "moduleSuffixes": [".ios"] -- } -- } -- --==== /index.ts (0 errors) ==== -- import { ios } from "./foo.js"; --==== /foo.ios.js (0 errors) ==== -- "use strict"; -- exports.__esModule = true; -- function ios() {} -- exports.ios = ios; --==== /foo.js (0 errors) ==== -- "use strict"; -- exports.__esModule = true; -- function base() {} -- exports.base = base; -- -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_classicPrefersTs.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_classicPrefersTs.errors.txt.diff deleted file mode 100644 index 28b2798b5c..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_classicPrefersTs.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.moduleResolution_classicPrefersTs.errors.txt -+++ new.moduleResolution_classicPrefersTs.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/dir1/dir2/dir3/index.ts(1,15): error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ -+ -+==== /dir1/dir2/dir3/a.js (0 errors) ==== -+ export default "dir1/dir2/dir3/a.js"; -+ -+==== /dir1/dir2/a.ts (0 errors) ==== -+ export default "dir1/dir2/a.ts"; -+ -+==== /dir1/dir2/dir3/index.ts (1 errors) ==== -+ import a from "a"; -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_classicPrefersTs.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_classicPrefersTs.types.diff deleted file mode 100644 index acd47180f8..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/moduleResolution_classicPrefersTs.types.diff +++ /dev/null @@ -1,8 +0,0 @@ ---- old.moduleResolution_classicPrefersTs.types -+++ new.moduleResolution_classicPrefersTs.types -@@= skipped -9, +9 lines =@@ - - === /dir1/dir2/dir3/index.ts === - import a from "a"; -->a : "dir1/dir2/a.ts" -+>a : any diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/optionsOutAndNoModuleGen.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/optionsOutAndNoModuleGen.errors.txt.diff deleted file mode 100644 index 50dc55f52f..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/optionsOutAndNoModuleGen.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.optionsOutAndNoModuleGen.errors.txt -+++ new.optionsOutAndNoModuleGen.errors.txt -@@= skipped -0, +0 lines =@@ --optionsOutAndNoModuleGen.ts(1,1): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'. -- -- --==== optionsOutAndNoModuleGen.ts (1 errors) ==== -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== optionsOutAndNoModuleGen.ts (0 errors) ==== - export var x = 10; -- ~~~~~~~~~~~~~~~~~~ --!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'. - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/out-flag2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/out-flag2.errors.txt.diff deleted file mode 100644 index bc4be59555..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/out-flag2.errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.out-flag2.errors.txt -+++ new.out-flag2.errors.txt -@@= skipped -0, +0 lines =@@ --error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. -- -- --!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== a.ts (0 errors) ==== - class A { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/out-flag3.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/out-flag3.errors.txt.diff deleted file mode 100644 index 4d0cf1ba57..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/out-flag3.errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.out-flag3.errors.txt -+++ new.out-flag3.errors.txt -@@= skipped -0, +0 lines =@@ --error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. -- -- --!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== a.ts (0 errors) ==== - class A { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatCommonjs.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatCommonjs.errors.txt.diff deleted file mode 100644 index fdb2458a5e..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatCommonjs.errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.outModuleConcatCommonjs.errors.txt -+++ new.outModuleConcatCommonjs.errors.txt -@@= skipped -0, +0 lines =@@ --error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. -- -- --!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== ref/a.ts (0 errors) ==== - export class A { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatCommonjsDeclarationOnly.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatCommonjsDeclarationOnly.errors.txt.diff deleted file mode 100644 index 5139b34766..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatCommonjsDeclarationOnly.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.outModuleConcatCommonjsDeclarationOnly.errors.txt -+++ new.outModuleConcatCommonjsDeclarationOnly.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== ref/a.ts (0 errors) ==== -+ export class A { } -+ -+==== b.ts (0 errors) ==== -+ import {A} from "./ref/a"; -+ export class B extends A { } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatES6.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatES6.errors.txt.diff deleted file mode 100644 index 7956c71daf..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatES6.errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.outModuleConcatES6.errors.txt -+++ new.outModuleConcatES6.errors.txt -@@= skipped -0, +0 lines =@@ --error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. -- -- --!!! error TS6082: Only 'amd' and 'system' modules are supported alongside --outFile. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== ref/a.ts (0 errors) ==== - export class A { } - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatUnspecifiedModuleKind.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatUnspecifiedModuleKind.errors.txt.diff deleted file mode 100644 index 99b0bfea42..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatUnspecifiedModuleKind.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.outModuleConcatUnspecifiedModuleKind.errors.txt -+++ new.outModuleConcatUnspecifiedModuleKind.errors.txt -@@= skipped -0, +0 lines =@@ --a.ts(1,14): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'. -- -- --==== a.ts (1 errors) ==== -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== - export class A { } // module -- ~ --!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'. - - ==== b.ts (0 errors) ==== - var x = 0; // global \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt.diff deleted file mode 100644 index 79a662f7aa..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- old.outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt -+++ new.outModuleConcatUnspecifiedModuleKindDeclarationOnly.errors.txt -@@= skipped -0, +0 lines =@@ --error TS5069: Option 'emitDeclarationOnly' cannot be specified without specifying option 'declaration' or option 'composite'. -- -- --!!! error TS5069: Option 'emitDeclarationOnly' cannot be specified without specifying option 'declaration' or option 'composite'. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== a.ts (0 errors) ==== - export class A { } // module - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution2_node.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution2_node.errors.txt.diff deleted file mode 100644 index b47c2daec0..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution2_node.errors.txt.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.pathMappingBasedModuleResolution2_node.errors.txt -+++ new.pathMappingBasedModuleResolution2_node.errors.txt -@@= skipped -0, +0 lines =@@ -+root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./src/*"]}' instead. - root/tsconfig.json(5,13): error TS5061: Pattern '*1*' can have at most one '*' character. - root/tsconfig.json(5,22): error TS5062: Substitution '*2*' in pattern '*1*' can have at most one '*' character. -- -- --==== root/tsconfig.json (2 errors) ==== -+root/tsconfig.json(5,22): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== root/tsconfig.json (4 errors) ==== - { - "compilerOptions": { - "baseUrl": "./src", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./src/*"]}' instead. - "paths": { - "*1*": [ "*2*" ] - ~~~~~ - !!! error TS5061: Pattern '*1*' can have at most one '*' character. - ~~~~~ - !!! error TS5062: Substitution '*2*' in pattern '*1*' can have at most one '*' character. -+ ~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution3_node.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution3_node.errors.txt.diff deleted file mode 100644 index 79c920ad8a..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution3_node.errors.txt.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.pathMappingBasedModuleResolution3_node.errors.txt -+++ new.pathMappingBasedModuleResolution3_node.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+c:/root/folder1/file1.ts(1,17): error TS2307: Cannot find module 'folder2/file2' or its corresponding type declarations. -+ -+ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+==== c:/root/folder1/file1.ts (1 errors) ==== -+ import {x} from "folder2/file2" -+ ~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'folder2/file2' or its corresponding type declarations. -+ declare function use(a: any): void; -+ use(x.toExponential()); -+ -+==== c:/root/folder2/file2.ts (0 errors) ==== -+ import {x as a} from "./file3" // found with baseurl -+ import {y as b} from "file4" // found with fallback -+ export var x = a + b; -+ -+==== c:/root/folder2/file3.ts (0 errors) ==== -+ export var x = 1; -+ -+==== c:/node_modules/file4/index.d.ts (0 errors) ==== -+ export var y: number; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution4_node.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution4_node.errors.txt.diff deleted file mode 100644 index 6ced85a8db..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution4_node.errors.txt.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- old.pathMappingBasedModuleResolution4_node.errors.txt -+++ new.pathMappingBasedModuleResolution4_node.errors.txt -@@= skipped -0, +0 lines =@@ -- -+c:/root/folder1/file1.ts(1,17): error TS2307: Cannot find module 'folder2/file2' or its corresponding type declarations. -+c:/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== c:/root/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": "." -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ } -+ } -+ -+==== c:/root/folder1/file1.ts (1 errors) ==== -+ import {x} from "folder2/file2" -+ ~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'folder2/file2' or its corresponding type declarations. -+ declare function use(a: any): void; -+ use(x.toExponential()); -+ -+==== c:/root/folder2/file2.ts (0 errors) ==== -+ import {x as a} from "./file3" // found with baseurl -+ import {y as b} from "file4" // found with fallback -+ export var x = a + b; -+ -+==== c:/root/folder2/file3.ts (0 errors) ==== -+ export var x = 1; -+ -+==== c:/node_modules/file4/index.d.ts (0 errors) ==== -+ export var y: number; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution5_node.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution5_node.errors.txt.diff deleted file mode 100644 index 0903cc081b..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution5_node.errors.txt.diff +++ /dev/null @@ -1,60 +0,0 @@ ---- old.pathMappingBasedModuleResolution5_node.errors.txt -+++ new.pathMappingBasedModuleResolution5_node.errors.txt -@@= skipped -0, +0 lines =@@ -- -+c:/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+c:/root/tsconfig.json(6,17): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+c:/root/tsconfig.json(7,17): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+c:/root/tsconfig.json(10,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== c:/root/tsconfig.json (4 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "*": [ -+ "*", -+ ~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ "generated/*" -+ ~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ ], -+ "components/*": [ -+ "shared/components/*" -+ ~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ ] -+ } -+ } -+ } -+==== c:/root/folder1/file1.ts (0 errors) ==== -+ import {x} from "folder2/file1" -+ import {y} from "folder3/file2" -+ import {z} from "components/file3" -+ import {z1} from "file4" -+ -+ declare function use(a: any): void; -+ -+ use(x.toExponential()); -+ use(y.toExponential()); -+ use(z.toExponential()); -+ use(z1.toExponential()); -+ -+==== c:/root/folder2/file1.ts (0 errors) ==== -+ export var x = 1; -+ -+==== c:/root/generated/folder3/file2.ts (0 errors) ==== -+ export var y = 1; -+ -+==== c:/root/shared/components/file3/index.d.ts (0 errors) ==== -+ export var z: number; -+ -+==== c:/node_modules/file4.ts (0 errors) ==== -+ export var z1 = 1; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution7_node.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution7_node.errors.txt.diff deleted file mode 100644 index d6c0f18e2d..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution7_node.errors.txt.diff +++ /dev/null @@ -1,67 +0,0 @@ ---- old.pathMappingBasedModuleResolution7_node.errors.txt -+++ new.pathMappingBasedModuleResolution7_node.errors.txt -@@= skipped -0, +0 lines =@@ -- -+c:/root/generated/src/project/file2.ts(2,17): error TS2307: Cannot find module 'templates/module2' or its corresponding type declarations. -+c:/root/src/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./../*"]}' instead. -+c:/root/src/tsconfig.json(6,17): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+c:/root/src/tsconfig.json(10,17): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== c:/root/src/tsconfig.json (3 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": "../", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./../*"]}' instead. -+ "paths": { -+ "*": [ -+ "*", -+ ~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ "c:/shared/*" -+ ], -+ "templates/*": [ -+ "generated/src/templates/*" -+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ ] -+ }, -+ "rootDirs": [ -+ ".", -+ "../generated/src" -+ ] -+ } -+ } -+ -+==== c:/root/src/file1.ts (0 errors) ==== -+ import {x} from "./project/file2"; -+ import {y} from "module3"; -+ -+ declare function use(x: string); -+ use(x.toFixed()); -+ use(y.toFixed()); -+ -+==== c:/root/src/file3/index.d.ts (0 errors) ==== -+ export let x: number; -+ -+==== c:/root/generated/src/project/file2.ts (1 errors) ==== -+ import {a} from "module1"; -+ import {b} from "templates/module2"; -+ ~~~~~~~~~~~~~~~~~~~ -+!!! error TS2307: Cannot find module 'templates/module2' or its corresponding type declarations. -+ import {x as c} from "../file3"; -+ export let x = a + b + c; -+ -+==== c:/shared/module1/index.d.ts (0 errors) ==== -+ export let a: number -+ -+==== c:/root/generated/src/templates/module2.ts (0 errors) ==== -+ export let b: number; -+ -+==== c:/node_modules/module3.d.ts (0 errors) ==== -+ export let y: number; -+ -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution8_node.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution8_node.errors.txt.diff deleted file mode 100644 index 3a52be5f78..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution8_node.errors.txt.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- old.pathMappingBasedModuleResolution8_node.errors.txt -+++ new.pathMappingBasedModuleResolution8_node.errors.txt -@@= skipped -0, +0 lines =@@ -- -+c:/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+c:/root/tsconfig.json(6,16): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== c:/root/tsconfig.json (2 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "@speedy/*/testing": [ -+ "*/dist/index.ts" -+ ~~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ ] -+ } -+ } -+ } -+ -+==== c:/root/index.ts (0 errors) ==== -+ import {x} from "@speedy/folder1/testing" -+ -+==== c:/root/folder1/dist/index.ts (0 errors) ==== -+ export const x = 1 + 2; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt.diff deleted file mode 100644 index e38e848398..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- old.pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt -+++ new.pathMappingBasedModuleResolution_rootImport_aliasWithRoot.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== /root/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "/*": ["./src/*"] -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /root/src/foo.ts (0 errors) ==== -+ export function foo() {} -+ -+==== /root/src/bar.js (0 errors) ==== -+ export function bar() {} -+ -+==== /root/a.ts (0 errors) ==== -+ import { foo } from "/foo"; -+ import { bar } from "/bar"; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt.diff deleted file mode 100644 index 15c3dae0fe..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt.diff +++ /dev/null @@ -1,57 +0,0 @@ ---- old.pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt -+++ new.pathMappingBasedModuleResolution_rootImport_aliasWithRoot_differentRootTypes.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== /root/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "/*": ["./src/*"], -+ "c:/*": ["./src/*"], -+ "c:\\*": ["./src/*"], -+ "//server/*": ["./src/*"], -+ "\\\\server\\*": ["./src/*"], -+ "file:///*": ["./src/*"], -+ "file://c:/*": ["./src/*"], -+ "file://server/*": ["./src/*"], -+ "http://server/*": ["./src/*"] -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /root/src/foo.ts (0 errors) ==== -+ export function foo() {} -+ -+==== /root/src/bar.js (0 errors) ==== -+ export function bar() {} -+ -+==== /root/a.ts (0 errors) ==== -+ import { foo as foo1 } from "/foo"; -+ import { bar as bar1 } from "/bar"; -+ import { foo as foo2 } from "c:/foo"; -+ import { bar as bar2 } from "c:/bar"; -+ import { foo as foo3 } from "c:\\foo"; -+ import { bar as bar3 } from "c:\\bar"; -+ import { foo as foo4 } from "//server/foo"; -+ import { bar as bar4 } from "//server/bar"; -+ import { foo as foo5 } from "\\\\server\\foo"; -+ import { bar as bar5 } from "\\\\server\\bar"; -+ import { foo as foo6 } from "file:///foo"; -+ import { bar as bar6 } from "file:///bar"; -+ import { foo as foo7 } from "file://c:/foo"; -+ import { bar as bar7 } from "file://c:/bar"; -+ import { foo as foo8 } from "file://server/foo"; -+ import { bar as bar8 } from "file://server/bar"; -+ import { foo as foo9 } from "http://server/foo"; -+ import { bar as bar9 } from "http://server/bar"; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt.diff deleted file mode 100644 index e3f58fe616..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt -+++ new.pathMappingBasedModuleResolution_rootImport_aliasWithRoot_multipleAliases.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== /root/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "/client/*": ["./client/*"], -+ "/import/*": ["./import/*"] -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /root/import/foo.ts (0 errors) ==== -+ export function foo() {} -+ -+==== /root/client/bar.js (0 errors) ==== -+ export function bar() {} -+ -+==== /root/src/a.ts (0 errors) ==== -+ import { foo } from "/import/foo"; -+ import { bar } from "/client/bar"; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt.diff deleted file mode 100644 index 5acbf7d5af..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- old.pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt -+++ new.pathMappingBasedModuleResolution_rootImport_aliasWithRoot_realRootFile.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== /root/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "/*": ["./src/*"] -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /root/a.ts (0 errors) ==== -+ import { foo } from "/foo"; -+ import { bar } from "/bar"; -+ -+==== /foo.ts (0 errors) ==== -+ export function foo() {} -+ -+==== /bar.js (0 errors) ==== -+ export function bar() {} -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt.diff deleted file mode 100644 index b00565c3b1..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- old.pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt -+++ new.pathMappingBasedModuleResolution_rootImport_noAliasWithRoot.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== /root/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "*": ["./src/*"] -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /root/src/foo.ts (0 errors) ==== -+ export function foo() {} -+ -+==== /root/src/bar.js (0 errors) ==== -+ export function bar() {} -+ -+==== /root/a.ts (0 errors) ==== -+ import { foo } from "/foo"; -+ import { bar } from "/bar"; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt.diff deleted file mode 100644 index 56b4e579f6..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt.diff +++ /dev/null @@ -1,33 +0,0 @@ ---- old.pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt -+++ new.pathMappingBasedModuleResolution_rootImport_noAliasWithRoot_realRootFile.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/root/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+ -+ -+==== /root/tsconfig.json (1 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "*": ["./src/*"] -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /root/a.ts (0 errors) ==== -+ import { foo } from "/foo"; -+ import { bar } from "/bar"; -+ -+==== /foo.ts (0 errors) ==== -+ export function foo() {} -+ -+==== /bar.js (0 errors) ==== -+ export function bar() {} -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension.errors.txt.diff deleted file mode 100644 index 9c8f8a2b53..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension.errors.txt.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- old.pathMappingBasedModuleResolution_withExtension.errors.txt -+++ new.pathMappingBasedModuleResolution_withExtension.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+/tsconfig.json(5,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+/tsconfig.json(6,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== /tsconfig.json (3 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "foo": ["foo/foo.ts"], -+ ~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ "bar": ["bar/bar.js"] -+ ~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /foo/foo.ts (0 errors) ==== -+ export function foo() {} -+ -+==== /bar/bar.js (0 errors) ==== -+ export function bar() {} -+ -+==== /a.ts (0 errors) ==== -+ import { foo } from "foo"; -+ import { bar } from "bar"; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtensionInName.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtensionInName.errors.txt.diff deleted file mode 100644 index 4ec6f8d156..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtensionInName.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.pathMappingBasedModuleResolution_withExtensionInName.errors.txt -+++ new.pathMappingBasedModuleResolution_withExtensionInName.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+/tsconfig.json(5,19): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== /tsconfig.json (2 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "*": ["foo/*"] -+ ~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ } -+ } -+ } -+ -+==== /foo/zone.js/index.d.ts (0 errors) ==== -+ export const x: number; -+ -+==== /foo/zone.tsx/index.d.ts (0 errors) ==== -+ export const y: number; -+ -+==== /a.ts (0 errors) ==== -+ import { x } from "zone.js"; -+ import { y } from "zone.tsx"; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt.diff deleted file mode 100644 index 6b1cb2a5bb..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- old.pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt -+++ new.pathMappingBasedModuleResolution_withExtension_MapedToNodeModules.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+/tsconfig.json(5,19): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+/tsconfig.json(5,37): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== /tsconfig.json (3 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "*": ["node_modules/*", "src/types"] -+ ~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ ~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /a.ts (0 errors) ==== -+ import foobar from "foo/bar/foobar.js"; -+ -+==== /node_modules/foo/bar/foobar.js (0 errors) ==== -+ module.exports = { a: 10 }; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt.diff deleted file mode 100644 index 1a50f6a10c..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt -+++ new.pathMappingBasedModuleResolution_withExtension_failedLookup.errors.txt -@@= skipped -0, +0 lines =@@ - /a.ts(1,21): error TS2307: Cannot find module 'foo' or its corresponding type declarations. -- -- --==== /tsconfig.json (0 errors) ==== -+/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+/tsconfig.json(5,21): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== /tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "foo": ["foo/foo.ts"] -+ ~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingInheritedBaseUrl.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingInheritedBaseUrl.errors.txt.diff deleted file mode 100644 index 5b5d21ca65..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathMappingInheritedBaseUrl.errors.txt.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- old.pathMappingInheritedBaseUrl.errors.txt -+++ new.pathMappingInheritedBaseUrl.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/project/index.ts(1,20): error TS2307: Cannot find module 'p1' or its corresponding type declarations. -+/project/tsconfig.json(3,3): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["../other/*"]}' instead. -+ -+ -+==== /project/tsconfig.json (1 errors) ==== -+ { -+ "extends": "../other/tsconfig.base.json", -+ "compilerOptions": { -+ ~~~~~~~~~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["../other/*"]}' instead. -+ "module": "commonjs", -+ "paths": { -+ "p1": ["./lib/p1"] -+ } -+ } -+ } -+ -+==== /project/index.ts (1 errors) ==== -+ import { p1 } from "p1"; -+ ~~~~ -+!!! error TS2307: Cannot find module 'p1' or its corresponding type declarations. -+ -+==== /other/tsconfig.base.json (0 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": "." -+ } -+ } -+ -+==== /other/lib/p1/index.ts (0 errors) ==== -+ export const p1 = 0; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation1.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation1.errors.txt.diff deleted file mode 100644 index de8b8e95cd..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation1.errors.txt.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- old.pathsValidation1.errors.txt -+++ new.pathsValidation1.errors.txt -@@= skipped -0, +0 lines =@@ -+tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. - tsconfig.json(5,18): error TS5063: Substitutions for pattern '*' should be an array. - - --==== tsconfig.json (1 errors) ==== -+==== tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": "*" - ~~~ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation2.errors.txt.diff deleted file mode 100644 index e8ba70de21..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation2.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.pathsValidation2.errors.txt -+++ new.pathsValidation2.errors.txt -@@= skipped -0, +0 lines =@@ --tsconfig.json(5,19): error TS5064: Substitution '1' for pattern '*' has incorrect type, expected 'string', got 'number'. -- -- --==== tsconfig.json (1 errors) ==== -+tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+tsconfig.json(5,18): error TS5066: Substitutions for pattern '*' shouldn't be an empty array. -+ -+ -+==== tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": [1] -- ~ --!!! error TS5064: Substitution '1' for pattern '*' has incorrect type, expected 'string', got 'number'. -+ ~~~ -+!!! error TS5066: Substitutions for pattern '*' shouldn't be an empty array. - } - } - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation3.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation3.errors.txt.diff deleted file mode 100644 index 7b2223c0f4..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation3.errors.txt.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- old.pathsValidation3.errors.txt -+++ new.pathsValidation3.errors.txt -@@= skipped -0, +0 lines =@@ -+tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. - tsconfig.json(5,20): error TS5066: Substitutions for pattern 'foo' shouldn't be an empty array. - - --==== tsconfig.json (1 errors) ==== -+==== tsconfig.json (2 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "foo": [] - ~~ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation4.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation4.errors.txt.diff deleted file mode 100644 index 051c66adff..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/pathsValidation4.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.pathsValidation4.errors.txt -+++ new.pathsValidation4.errors.txt -@@= skipped -0, +0 lines =@@ -+tsconfig.json(4,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./src/*"]}' instead. - tsconfig.json(6,11): error TS5061: Pattern '@interface/**/*' can have at most one '*' character. - tsconfig.json(7,11): error TS5061: Pattern '@service/**/*' can have at most one '*' character. - tsconfig.json(7,29): error TS5062: Substitution './src/service/**/*' in pattern '@service/**/*' can have at most one '*' character. -- -- --==== tsconfig.json (3 errors) ==== -+tsconfig.json(8,29): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== tsconfig.json (5 errors) ==== - { - "compilerOptions": { - "traceResolution": true, - "baseUrl": "./src", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./src/*"]}' instead. - "paths": { - "@interface/**/*" : ["./src/interface/*"], - ~~~~~~~~~~~~~~~~~ -@@= skipped -17, +23 lines =@@ - ~~~~~~~~~~~~~~~~~~~~ - !!! error TS5062: Substitution './src/service/**/*' in pattern '@service/**/*' can have at most one '*' character. - "@controller/*": ["controller/*"], -+ ~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - } - } - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt.diff deleted file mode 100644 index 707620b72a..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt -+++ new.requireOfJsonFileWithoutResolveJsonModuleAndPathMapping.errors.txt -@@= skipped -0, +0 lines =@@ - /a.ts(1,20): error TS2732: Cannot find module 'foo/bar/foobar.json'. Consider using '--resolveJsonModule' to import module with '.json' extension. -- -- --==== /tsconfig.json (0 errors) ==== -+/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+/tsconfig.json(5,19): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+/tsconfig.json(5,37): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== /tsconfig.json (3 errors) ==== - { - "compilerOptions": { - "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. - "paths": { - "*": ["node_modules/*", "src/types"] -+ ~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ ~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? - }, - "allowJs": true, - "outDir": "bin" \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFile_PathMapping.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFile_PathMapping.errors.txt.diff deleted file mode 100644 index f309207447..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/requireOfJsonFile_PathMapping.errors.txt.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- old.requireOfJsonFile_PathMapping.errors.txt -+++ new.requireOfJsonFile_PathMapping.errors.txt -@@= skipped -0, +0 lines =@@ -- -+/tsconfig.json(3,9): error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+ Use '"paths": {"*": ["./*"]}' instead. -+/tsconfig.json(5,19): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+/tsconfig.json(5,37): error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ -+ -+==== /tsconfig.json (3 errors) ==== -+ { -+ "compilerOptions": { -+ "baseUrl": ".", -+ ~~~~~~~~~ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+!!! error TS5102: Use '"paths": {"*": ["./*"]}' instead. -+ "paths": { -+ "*": ["node_modules/*", "src/types"] -+ ~~~~~~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ ~~~~~~~~~~~ -+!!! error TS5090: Non-relative paths are not allowed. Did you forget a leading './'? -+ }, -+ "allowJs": true, -+ "outDir": "bin" -+ } -+ } -+ -+==== /a.ts (0 errors) ==== -+ import foobar from "foo/bar/foobar.json"; -+ -+==== /node_modules/foo/bar/foobar.json (0 errors) ==== -+ { "a": 10 } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/signaturesUseJSDocForOptionalParameters.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/signaturesUseJSDocForOptionalParameters.errors.txt.diff deleted file mode 100644 index 43e74e3959..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/signaturesUseJSDocForOptionalParameters.errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.signaturesUseJSDocForOptionalParameters.errors.txt -+++ new.signaturesUseJSDocForOptionalParameters.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'jsDocOptionality.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'jsDocOptionality.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== jsDocOptionality.js (0 errors) ==== -+ function MyClass() { -+ this.prop = null; -+ } -+ /** -+ * @param {string} required -+ * @param {string} [notRequired] -+ * @returns {MyClass} -+ */ -+ MyClass.prototype.optionalParam = function(required, notRequired) { -+ return this; -+ }; -+ let pInst = new MyClass(); -+ let c1 = pInst.optionalParam('hello') -+ let c2 = pInst.optionalParam('hello', null) -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/signaturesUseJSDocForOptionalParameters.types.diff b/testdata/baselines/reference/submoduleAccepted/compiler/signaturesUseJSDocForOptionalParameters.types.diff deleted file mode 100644 index e1ae4ab9cd..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/signaturesUseJSDocForOptionalParameters.types.diff +++ /dev/null @@ -1,74 +0,0 @@ ---- old.signaturesUseJSDocForOptionalParameters.types -+++ new.signaturesUseJSDocForOptionalParameters.types -@@= skipped -1, +1 lines =@@ - - === jsDocOptionality.js === - function MyClass() { -->MyClass : typeof MyClass -+>MyClass : () => void - - this.prop = null; - >this.prop = null : null - >this.prop : any -->this : this -+>this : any - >prop : any - } - /** -@@= skipped -14, +14 lines =@@ - * @returns {MyClass} - */ - MyClass.prototype.optionalParam = function(required, notRequired) { -->MyClass.prototype.optionalParam = function(required, notRequired) { return this;} : (required: string, notRequired?: string) => MyClass -+>MyClass.prototype.optionalParam = function(required, notRequired) { return this;} : (required: any, notRequired: any) => any - >MyClass.prototype.optionalParam : any - >MyClass.prototype : any -->MyClass : typeof MyClass -+>MyClass : () => void - >prototype : any - >optionalParam : any -->function(required, notRequired) { return this;} : (required: string, notRequired?: string) => MyClass -->required : string -->notRequired : string -+>function(required, notRequired) { return this;} : (required: any, notRequired: any) => any -+>required : any -+>notRequired : any - - return this; -->this : this -+>this : any - - }; - let pInst = new MyClass(); -->pInst : MyClass -->new MyClass() : MyClass -->MyClass : typeof MyClass -+>pInst : any -+>new MyClass() : any -+>MyClass : () => void - - let c1 = pInst.optionalParam('hello') -->c1 : MyClass -->pInst.optionalParam('hello') : MyClass -->pInst.optionalParam : (required: string, notRequired?: string) => MyClass -->pInst : MyClass -->optionalParam : (required: string, notRequired?: string) => MyClass -+>c1 : any -+>pInst.optionalParam('hello') : any -+>pInst.optionalParam : any -+>pInst : any -+>optionalParam : any - >'hello' : "hello" - - let c2 = pInst.optionalParam('hello', null) -->c2 : MyClass -->pInst.optionalParam('hello', null) : MyClass -->pInst.optionalParam : (required: string, notRequired?: string) => MyClass -->pInst : MyClass -->optionalParam : (required: string, notRequired?: string) => MyClass -+>c2 : any -+>pInst.optionalParam('hello', null) : any -+>pInst.optionalParam : any -+>pInst : any -+>optionalParam : any - >'hello' : "hello" diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithCaseSensitiveFileNames.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithCaseSensitiveFileNames.errors.txt.diff deleted file mode 100644 index d0b34de703..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithCaseSensitiveFileNames.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.sourceMapWithCaseSensitiveFileNames.errors.txt -+++ new.sourceMapWithCaseSensitiveFileNames.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== testFiles/app.ts (0 errors) ==== -+ // Note in the out result we are using same folder name only different in casing -+ // Since this is case sensitive, the folders are different and hence the relative paths in sourcemap shouldn't be just app.ts or app2.ts -+ class c { -+ } -+ -+==== testFiles/app2.ts (0 errors) ==== -+ class d { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithMultipleFilesWithCopyright.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithMultipleFilesWithCopyright.errors.txt.diff deleted file mode 100644 index 6ceaccc98e..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithMultipleFilesWithCopyright.errors.txt.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- old.sourceMapWithMultipleFilesWithCopyright.errors.txt -+++ new.sourceMapWithMultipleFilesWithCopyright.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== b.ts (0 errors) ==== -+ /*-------------------------------------------------------------------------- -+ Copyright -+ ---------------------------------------------------------------------------*/ -+ -+ /// -+ var y = x; -+ -+==== a.ts (0 errors) ==== -+ /*-------------------------------------------------------------------------- -+ Copyright -+ ---------------------------------------------------------------------------*/ -+ -+ var x = { -+ a: 10, -+ b: 20 -+ }; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt.diff deleted file mode 100644 index 84ea7d8cb0..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt -+++ new.sourceMapWithMultipleFilesWithFileEndingWithInterface.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.ts (0 errors) ==== -+ module M { -+ export var X = 1; -+ } -+ interface Navigator { -+ getGamepads(func?: any): any; -+ webkitGetGamepads(func?: any): any -+ msGetGamepads(func?: any): any; -+ webkitGamepads(func?: any): any; -+ } -+ -+==== b.ts (0 errors) ==== -+ module m1 { -+ export class c1 { -+ } -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithNonCaseSensitiveFileNames.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithNonCaseSensitiveFileNames.errors.txt.diff deleted file mode 100644 index d7d018245c..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/sourceMapWithNonCaseSensitiveFileNames.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.sourceMapWithNonCaseSensitiveFileNames.errors.txt -+++ new.sourceMapWithNonCaseSensitiveFileNames.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== testFiles/app.ts (0 errors) ==== -+ // Note in the out result we are using same folder name only different in casing -+ // Since this is non case sensitive, the relative paths should be just app.ts and app2.ts in the sourcemap -+ class c { -+ } -+ -+==== testFiles/app2.ts (0 errors) ==== -+ class d { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/typeReferenceDirectives11.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/typeReferenceDirectives11.errors.txt.diff deleted file mode 100644 index e459e50393..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/typeReferenceDirectives11.errors.txt.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- old.typeReferenceDirectives11.errors.txt -+++ new.typeReferenceDirectives11.errors.txt -@@= skipped -0, +0 lines =@@ --/mod1.ts(1,17): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'. -- -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== /mod2.ts (0 errors) ==== - import {foo} from "./mod1"; - export const bar = foo(); -@@= skipped -7, +8 lines =@@ - ==== /types/lib/index.d.ts (0 errors) ==== - interface Lib { x } - --==== /mod1.ts (1 errors) ==== -+==== /mod1.ts (0 errors) ==== - export function foo(): Lib { return {x: 1} } -- ~~~ --!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'. - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/typeReferenceDirectives12.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/typeReferenceDirectives12.errors.txt.diff deleted file mode 100644 index 2494304a93..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/typeReferenceDirectives12.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.typeReferenceDirectives12.errors.txt -+++ new.typeReferenceDirectives12.errors.txt -@@= skipped -0, +0 lines =@@ --/main.ts(1,14): error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'. -- -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== /mod2.ts (0 errors) ==== - import { Cls } from "./main"; - import "./mod1"; -@@= skipped -11, +12 lines =@@ - ==== /types/lib/index.d.ts (0 errors) ==== - interface Lib { x } - --==== /main.ts (1 errors) ==== -+==== /main.ts (0 errors) ==== - export class Cls { -- ~~~ --!!! error TS6131: Cannot compile modules using option 'outFile' unless the '--module' flag is 'amd' or 'system'. - x - } - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/compiler/useBeforeDeclaration.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/compiler/useBeforeDeclaration.errors.txt.diff deleted file mode 100644 index 2f107b6c10..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/compiler/useBeforeDeclaration.errors.txt.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- old.useBeforeDeclaration.errors.txt -+++ new.useBeforeDeclaration.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== A.ts (0 errors) ==== -+ namespace ts { -+ export function printVersion():void { -+ log("Version: " + sys.version); // the call of sys.version is deferred, should not report an error. -+ } -+ -+ export function log(info:string):void { -+ -+ } -+ } -+ -+==== B.ts (0 errors) ==== -+ namespace ts { -+ -+ export let sys:{version:string} = {version: "2.0.5"}; -+ -+ } -+ -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocOnEndOfFile.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocOnEndOfFile.errors.txt.diff deleted file mode 100644 index bdd99a963b..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocOnEndOfFile.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.checkJsdocOnEndOfFile.errors.txt -+++ new.checkJsdocOnEndOfFile.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'eof.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - eof.js(2,20): error TS2304: Cannot find name 'bad'. - - -+!!! error TS5055: Cannot write file 'eof.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== eof.js (1 errors) ==== - /** - * @typedef {Array} Should have error here \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag1.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag1.errors.txt.diff deleted file mode 100644 index 78b346a05f..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag1.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.checkJsdocReturnTag1.errors.txt -+++ new.checkJsdocReturnTag1.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - returns.js(20,12): error TS2872: This kind of expression is always truthy. - - -+!!! error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== returns.js (1 errors) ==== - // @ts-check - /** \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag1.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag1.types.diff deleted file mode 100644 index 6ae67dd6b8..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag1.types.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.checkJsdocReturnTag1.types -+++ new.checkJsdocReturnTag1.types -@@= skipped -15, +15 lines =@@ - * @returns {string=} This comment is not currently exposed - */ - function f1() { -->f1 : () => string | undefined -+>f1 : () => string - - return "hello world"; - >"hello world" : "hello world" \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag2.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag2.errors.txt.diff deleted file mode 100644 index 62dc9ab029..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocReturnTag2.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.checkJsdocReturnTag2.errors.txt -+++ new.checkJsdocReturnTag2.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - returns.js(6,5): error TS2322: Type 'number' is not assignable to type 'string'. - returns.js(13,5): error TS2322: Type 'number | boolean' is not assignable to type 'string | number'. - Type 'boolean' is not assignable to type 'string | number'. - returns.js(13,12): error TS2872: This kind of expression is always truthy. - - -+!!! error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== returns.js (3 errors) ==== - // @ts-check - /** \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag5.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag5.types.diff index 5657510b06..cb18606f8c 100644 --- a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag5.types.diff +++ b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag5.types.diff @@ -39,7 +39,7 @@ /** @type {Argle} */ function blargle(s) { ->blargle : (x: "hi" | "bye") => 0 | 1 | 2 -+>blargle : (x: "bye" | "hi") => 0 | 1 | 2 ++>blargle : (s: "bye" | "hi") => 0 | 1 | 2 >s : "bye" | "hi" return 0; @@ -48,7 +48,7 @@ >zeroonetwo : 0 | 1 | 2 >blargle('hi') : 0 | 1 | 2 ->blargle : (x: "hi" | "bye") => 0 | 1 | 2 -+>blargle : (x: "bye" | "hi") => 0 | 1 | 2 ++>blargle : (s: "bye" | "hi") => 0 | 1 | 2 >'hi' : "hi" /** @typedef {{(s: string): 0 | 1; (b: boolean): 2 | 3 }} Gioconda */ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag6.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag6.types.diff index 3ae6aeb4b8..18a4844033 100644 --- a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag6.types.diff +++ b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag6.types.diff @@ -1,6 +1,33 @@ --- old.checkJsdocTypeTag6.types +++ new.checkJsdocTypeTag6.types -@@= skipped -69, +69 lines =@@ +@@= skipped -17, +17 lines =@@ + + /** @type {(a: number) => number} */ + function add1(a, b) { return a + b; } +->add1 : (a: number) => number ++>add1 : (a: number, b: any) => number + >a : number + >b : any + >a + b : any +@@= skipped -19, +19 lines =@@ + // TODO: Should be an error since signature doesn't match. + /** @type {(a: number, b: number, c: number) => number} */ + function add3(a, b) { return a + b; } +->add3 : (a: number, b: number, c: number) => number ++>add3 : (a: number, b: number) => number + >a : number + >b : number + >a + b : number +@@= skipped -12, +12 lines =@@ + + /** @type {() => void} */ + function funcWithMoreParameters(more) {} // error +->funcWithMoreParameters : () => void ++>funcWithMoreParameters : (more: any) => void + >more : any + + /** @type {() => void} */ +@@= skipped -21, +21 lines =@@ /** @type {() => void} */ methodWithMoreParameters(more) {}, // error diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag7.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag7.types.diff new file mode 100644 index 0000000000..bb0fb6f28f --- /dev/null +++ b/testdata/baselines/reference/submoduleAccepted/conformance/checkJsdocTypeTag7.types.diff @@ -0,0 +1,9 @@ +--- old.checkJsdocTypeTag7.types ++++ new.checkJsdocTypeTag7.types +@@= skipped -15, +15 lines =@@ + + /** @type {(optional?) => void} */ + methodWithOptionalParameters() {} +->methodWithOptionalParameters : (optional?: any) => void ++>methodWithOptionalParameters : () => void + } diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/computedPropertyNames52(target=es2015).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/computedPropertyNames52(target=es2015).errors.txt.diff deleted file mode 100644 index 47ab0f7e0a..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/computedPropertyNames52(target=es2015).errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.computedPropertyNames52(target=es2015).errors.txt -+++ new.computedPropertyNames52(target=es2015).errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'computedPropertyNames52.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'computedPropertyNames52.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== computedPropertyNames52.js (0 errors) ==== -+ const array = []; -+ for (let i = 0; i < 10; ++i) { -+ array.push(class C { -+ [i] = () => C; -+ static [i] = 100; -+ }) -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/computedPropertyNames52(target=es5).errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/computedPropertyNames52(target=es5).errors.txt.diff deleted file mode 100644 index c24cbe73ee..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/computedPropertyNames52(target=es5).errors.txt.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- old.computedPropertyNames52(target=es5).errors.txt -+++ new.computedPropertyNames52(target=es5).errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'computedPropertyNames52.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'computedPropertyNames52.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== computedPropertyNames52.js (0 errors) ==== -+ const array = []; -+ for (let i = 0; i < 10; ++i) { -+ array.push(class C { -+ [i] = () => C; -+ static [i] = 100; -+ }) -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/genericSetterInClassTypeJsDoc.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/genericSetterInClassTypeJsDoc.errors.txt.diff deleted file mode 100644 index a36e8c01e6..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/genericSetterInClassTypeJsDoc.errors.txt.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- old.genericSetterInClassTypeJsDoc.errors.txt -+++ new.genericSetterInClassTypeJsDoc.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'genericSetterInClassTypeJsDoc.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'genericSetterInClassTypeJsDoc.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== genericSetterInClassTypeJsDoc.js (0 errors) ==== -+ /** -+ * @template T -+ */ -+ class Box { -+ #value; -+ -+ /** @param {T} initialValue */ -+ constructor(initialValue) { -+ this.#value = initialValue; -+ } -+ -+ /** @type {T} */ -+ get value() { -+ return this.#value; -+ } -+ -+ set value(value) { -+ this.#value = value; -+ } -+ } -+ -+ new Box(3).value = 3; -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/genericSetterInClassTypeJsDoc.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/genericSetterInClassTypeJsDoc.types.diff deleted file mode 100644 index dc8973c43c..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/genericSetterInClassTypeJsDoc.types.diff +++ /dev/null @@ -1,59 +0,0 @@ ---- old.genericSetterInClassTypeJsDoc.types -+++ new.genericSetterInClassTypeJsDoc.types -@@= skipped -7, +7 lines =@@ - >Box : Box - - #value; -->#value : T -+>#value : any - - /** @param {T} initialValue */ - constructor(initialValue) { -@@= skipped -8, +8 lines =@@ - - this.#value = initialValue; - >this.#value = initialValue : T -->this.#value : T -+>this.#value : any - >this : this - >initialValue : T - } - - /** @type {T} */ - get value() { -->value : T -+>value : any - - return this.#value; -->this.#value : T -+>this.#value : any - >this : this - } - - set value(value) { -->value : T -->value : T -+>value : any -+>value : any - - this.#value = value; -->this.#value = value : T -->this.#value : T -+>this.#value = value : any -+>this.#value : any - >this : this -->value : T -+>value : any - } - } - - new Box(3).value = 3; - >new Box(3).value = 3 : 3 -->new Box(3).value : number -+>new Box(3).value : any - >new Box(3) : Box - >Box : typeof Box - >3 : 3 -->value : number -+>value : any - >3 : 3 diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/globalThisVarDeclaration.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/globalThisVarDeclaration.errors.txt.diff deleted file mode 100644 index 6bcae3f222..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/globalThisVarDeclaration.errors.txt.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.globalThisVarDeclaration.errors.txt -+++ new.globalThisVarDeclaration.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - actual.ts(12,5): error TS2339: Property 'a' does not exist on type 'Window'. - actual.ts(13,5): error TS2339: Property 'b' does not exist on type 'Window'. - b.js(12,5): error TS2339: Property 'a' does not exist on type 'Window'. - b.js(13,5): error TS2339: Property 'b' does not exist on type 'Window'. - - -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== b.js (2 errors) ==== - var a = 10; - this.a; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/inferringClassMembersFromAssignments.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/inferringClassMembersFromAssignments.errors.txt.diff deleted file mode 100644 index 2970225a26..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/inferringClassMembersFromAssignments.errors.txt.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- old.inferringClassMembersFromAssignments.errors.txt -+++ new.inferringClassMembersFromAssignments.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - a.js(14,13): error TS7008: Member 'inMethodNullable' implicitly has an 'any' type. - a.js(20,9): error TS2322: Type 'string' is not assignable to type 'number'. - a.js(39,9): error TS2322: Type 'boolean' is not assignable to type 'number'. - - -+!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== a.js (3 errors) ==== - class C { - constructor() { \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsObjectsMarkedAsOpenEnded.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsObjectsMarkedAsOpenEnded.errors.txt.diff deleted file mode 100644 index fe64e53f34..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsObjectsMarkedAsOpenEnded.errors.txt.diff +++ /dev/null @@ -1,58 +0,0 @@ ---- old.jsObjectsMarkedAsOpenEnded.errors.txt -+++ new.jsObjectsMarkedAsOpenEnded.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+b.ts(3,29): error TS2339: Property 'a' does not exist on type '{}'. -+b.ts(4,14): error TS2339: Property 'a' does not exist on type '{}'. -+b.ts(5,8): error TS2339: Property 'a' does not exist on type '{}'. -+b.ts(6,10): error TS2339: Property 'a' does not exist on type '{}'. -+ -+ -+!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.js (0 errors) ==== -+ var variable = {}; -+ variable.a = 0; -+ -+ class C { -+ initializedMember = {}; -+ constructor() { -+ this.member = {}; -+ this.member.a = 0; -+ } -+ } -+ -+ var obj = { -+ property: {} -+ }; -+ -+ obj.property.a = 0; -+ -+ var arr = [{}]; -+ -+ function getObj() { -+ return {}; -+ } -+ -+ -+==== b.ts (4 errors) ==== -+ variable.a = 1; -+ (new C()).member.a = 1; -+ (new C()).initializedMember.a = 1; -+ ~ -+!!! error TS2339: Property 'a' does not exist on type '{}'. -+ obj.property.a = 1; -+ ~ -+!!! error TS2339: Property 'a' does not exist on type '{}'. -+ arr[0].a = 1; -+ ~ -+!!! error TS2339: Property 'a' does not exist on type '{}'. -+ getObj().a = 1; -+ ~ -+!!! error TS2339: Property 'a' does not exist on type '{}'. -+ -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsObjectsMarkedAsOpenEnded.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsObjectsMarkedAsOpenEnded.types.diff deleted file mode 100644 index 186ceb1a55..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsObjectsMarkedAsOpenEnded.types.diff +++ /dev/null @@ -1,79 +0,0 @@ ---- old.jsObjectsMarkedAsOpenEnded.types -+++ new.jsObjectsMarkedAsOpenEnded.types -@@= skipped -1, +1 lines =@@ - - === a.js === - var variable = {}; -->variable : typeof variable -->{} : {} -+>variable : { a: number; } -+>{} : { a: number; } - - variable.a = 0; - >variable.a = 0 : 0 - >variable.a : number -->variable : typeof variable -+>variable : { a: number; } - >a : number - >0 : 0 - -@@= skipped -19, +19 lines =@@ - - constructor() { - this.member = {}; -->this.member = {} : {} -+>this.member = {} : { a: number; } - >this.member : any - >this : this - >member : any -->{} : {} -+>{} : { a: number; } - - this.member.a = 0; - >this.member.a = 0 : 0 -->this.member.a : error -->this.member : {} -+>this.member.a : number -+>this.member : { a: number; } - >this : this -->member : {} -->a : any -+>member : { a: number; } -+>a : number - >0 : 0 - } - } -@@= skipped -29, +29 lines =@@ - - obj.property.a = 0; - >obj.property.a = 0 : 0 -->obj.property.a : error -+>obj.property.a : any - >obj.property : {} - >obj : { property: {}; } - >property : {} -@@= skipped -24, +24 lines =@@ - variable.a = 1; - >variable.a = 1 : 1 - >variable.a : number -->variable : typeof variable -+>variable : { a: number; } - >a : number - >1 : 1 - - (new C()).member.a = 1; - >(new C()).member.a = 1 : 1 -->(new C()).member.a : any -->(new C()).member : {} -+>(new C()).member.a : number -+>(new C()).member : { a: number; } - >(new C()) : C - >new C() : C - >C : typeof C -->member : {} -->a : any -+>member : { a: number; } -+>a : number - >1 : 1 - - (new C()).initializedMember.a = 1; \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocAccessibilityTagsDeclarations.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocAccessibilityTagsDeclarations.errors.txt.diff deleted file mode 100644 index 1813c006bb..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocAccessibilityTagsDeclarations.errors.txt.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- old.jsdocAccessibilityTagsDeclarations.errors.txt -+++ new.jsdocAccessibilityTagsDeclarations.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'jsdocAccessibilityTagDeclarations.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'jsdocAccessibilityTagDeclarations.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== jsdocAccessibilityTagDeclarations.js (0 errors) ==== -+ class Protected { -+ /** @protected */ -+ constructor(c) { -+ /** @protected */ -+ this.c = c -+ } -+ /** @protected */ -+ m() { -+ return this.c -+ } -+ /** @protected */ -+ get p() { return this.c } -+ /** @protected */ -+ set p(value) { this.c = value } -+ } -+ -+ class Private { -+ /** @private */ -+ constructor(c) { -+ /** @private */ -+ this.c = c -+ } -+ /** @private */ -+ m() { -+ return this.c -+ } -+ /** @private */ -+ get p() { return this.c } -+ /** @private */ -+ set p(value) { this.c = value } -+ } -+ -+ // https://github.com/microsoft/TypeScript/issues/38401 -+ class C { -+ constructor(/** @public */ x, /** @protected */ y, /** @private */ z) { -+ } -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocLiteral.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocLiteral.errors.txt.diff deleted file mode 100644 index d22e40ecc7..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocLiteral.errors.txt.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.jsdocLiteral.errors.txt -+++ new.jsdocLiteral.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'in.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'in.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== in.js (0 errors) ==== -+ /** -+ * @param {'literal'} p1 -+ * @param {"literal"} p2 -+ * @param {'literal' | 'other'} p3 -+ * @param {'literal' | number} p4 -+ * @param {12 | true | 'str'} p5 -+ */ -+ function f(p1, p2, p3, p4, p5) { -+ return p1 + p2 + p3 + p4 + p5 + '.'; -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocLiteral.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocLiteral.types.diff deleted file mode 100644 index 1419b46639..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocLiteral.types.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.jsdocLiteral.types -+++ new.jsdocLiteral.types -@@= skipped -8, +8 lines =@@ - * @param {12 | true | 'str'} p5 - */ - function f(p1, p2, p3, p4, p5) { -->f : (p1: "literal", p2: "literal", p3: "literal" | "other", p4: "literal" | number, p5: 12 | true | "str") => string -+>f : (p1: "literal", p2: "literal", p3: "literal" | "other", p4: number | "literal", p5: "str" | 12 | true) => string - >p1 : "literal" - >p2 : "literal" - >p3 : "literal" | "other" \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocNeverUndefinedNull.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocNeverUndefinedNull.errors.txt.diff deleted file mode 100644 index 4bf87aedf5..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocNeverUndefinedNull.errors.txt.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- old.jsdocNeverUndefinedNull.errors.txt -+++ new.jsdocNeverUndefinedNull.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'in.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'in.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== in.js (0 errors) ==== -+ /** -+ * @param {never} p1 -+ * @param {undefined} p2 -+ * @param {null} p3 -+ * @returns {void} nothing -+ */ -+ function f(p1, p2, p3) { -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReadonlyDeclarations.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReadonlyDeclarations.errors.txt.diff deleted file mode 100644 index c6b91f0be7..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReadonlyDeclarations.errors.txt.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- old.jsdocReadonlyDeclarations.errors.txt -+++ new.jsdocReadonlyDeclarations.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'jsdocReadonlyDeclarations.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'jsdocReadonlyDeclarations.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== jsdocReadonlyDeclarations.js (0 errors) ==== -+ class C { -+ /** @readonly */ -+ x = 6 -+ /** @readonly */ -+ constructor(n) { -+ this.x = n -+ /** -+ * @readonly -+ * @type {number} -+ */ -+ this.y = n -+ } -+ } -+ new C().x -+ -+ function F() { -+ /** @readonly */ -+ this.z = 1 -+ } -+ -+ // https://github.com/microsoft/TypeScript/issues/38401 -+ class D { -+ constructor(/** @readonly */ x) {} -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReadonlyDeclarations.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReadonlyDeclarations.types.diff deleted file mode 100644 index e2067902d4..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReadonlyDeclarations.types.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- old.jsdocReadonlyDeclarations.types -+++ new.jsdocReadonlyDeclarations.types -@@= skipped -38, +38 lines =@@ - >x : 6 - - function F() { -->F : typeof F -+>F : () => void - - /** @readonly */ - this.z = 1 - >this.z = 1 : 1 - >this.z : any -->this : this -+>this : any - >z : any - >1 : 1 - } \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReturnTag1.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReturnTag1.errors.txt.diff deleted file mode 100644 index 10985f75b2..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReturnTag1.errors.txt.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- old.jsdocReturnTag1.errors.txt -+++ new.jsdocReturnTag1.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'returns.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== returns.js (0 errors) ==== -+ /** -+ * @returns {string} This comment is not currently exposed -+ */ -+ function f() { -+ return 5; -+ } -+ -+ /** -+ * @returns {string=} This comment is not currently exposed -+ */ -+ function f1() { -+ return 5; -+ } -+ -+ /** -+ * @returns {string|number} This comment is not currently exposed -+ */ -+ function f2() { -+ return 5 || "hello"; -+ } -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReturnTag1.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReturnTag1.types.diff deleted file mode 100644 index 355cf8c74a..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocReturnTag1.types.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.jsdocReturnTag1.types -+++ new.jsdocReturnTag1.types -@@= skipped -14, +14 lines =@@ - * @returns {string=} This comment is not currently exposed - */ - function f1() { -->f1 : () => string | undefined -+>f1 : () => string - - return 5; - >5 : 5 \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff index d4cb3a18d4..1a8ac7b8a7 100644 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff +++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocThisType.types.diff @@ -1,6 +1,15 @@ --- old.jsdocThisType.types +++ new.jsdocThisType.types -@@= skipped -35, +35 lines =@@ +@@= skipped -24, +24 lines =@@ + + /** @type {import('./types').M} */ + export function f2() { +->f2 : (this: import("/types").Foo) => void ++>f2 : () => void + + this.test(); + >this.test() : any +@@= skipped -11, +11 lines =@@ /** @type {(this: import('./types').Foo) => void} */ export const f3 = function() { @@ -16,7 +25,7 @@ /** @type {(this: import('./types').Foo) => void} */ export function f4() { ->f4 : (this: import("./types").Foo) => void -+>f4 : (this: import("/types").Foo) => void ++>f4 : () => void this.test(); >this.test() : any diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeTagRequiredParameters.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeTagRequiredParameters.errors.txt.diff index 0e12a93ad7..efc34c532f 100644 --- a/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeTagRequiredParameters.errors.txt.diff +++ b/testdata/baselines/reference/submoduleAccepted/conformance/jsdocTypeTagRequiredParameters.errors.txt.diff @@ -32,4 +32,12 @@ -!!! related TS6210 a.js:1:21: An argument for '0' was not provided. g() // should error ~ - !!! error TS2554: Expected 1 arguments, but got 0. \ No newline at end of file + !!! error TS2554: Expected 1 arguments, but got 0. +-!!! related TS6210 a.js:4:13: An argument for 's' was not provided. ++!!! related TS6210 a.js:5:12: An argument for 's' was not provided. + h() + ~ + !!! error TS2554: Expected 1 arguments, but got 0. +-!!! related TS6210 a.js:7:14: An argument for 's' was not provided. ++!!! related TS6210 a.js:8:12: An argument for 's' was not provided. + \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/methodsReturningThis.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/methodsReturningThis.errors.txt.diff deleted file mode 100644 index 2aa9ea3027..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/methodsReturningThis.errors.txt.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- old.methodsReturningThis.errors.txt -+++ new.methodsReturningThis.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'input.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'input.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== input.js (0 errors) ==== -+ function Class() -+ { -+ } -+ -+ // error: 'Class' doesn't have property 'notPresent' -+ Class.prototype.containsError = function () { return this.notPresent; }; -+ -+ // lots of methods that return this, which caused out-of-memory in #9527 -+ Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; }; -+ Class.prototype.m2 = function (x, y) { return this; }; -+ Class.prototype.m3 = function (x, y) { return this; }; -+ Class.prototype.m4 = function (angle) { return this; }; -+ Class.prototype.m5 = function (matrix) { return this; }; -+ Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; }; -+ Class.prototype.m7 = function(matrix) { return this; }; -+ Class.prototype.m8 = function() { return this; }; -+ Class.prototype.m9 = function () { return this; }; -+ -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/methodsReturningThis.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/methodsReturningThis.types.diff deleted file mode 100644 index b1563c3a44..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/methodsReturningThis.types.diff +++ /dev/null @@ -1,173 +0,0 @@ ---- old.methodsReturningThis.types -+++ new.methodsReturningThis.types -@@= skipped -1, +1 lines =@@ - - === input.js === - function Class() -->Class : typeof Class -+>Class : () => void - { - } - -@@= skipped -9, +9 lines =@@ - >Class.prototype.containsError = function () { return this.notPresent; } : () => any - >Class.prototype.containsError : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >containsError : any - >function () { return this.notPresent; } : () => any -->this.notPresent : error -->this : this -+>this.notPresent : any -+>this : any - >notPresent : any - - // lots of methods that return this, which caused out-of-memory in #9527 - Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; }; -->Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; } : (a: any, b: any, c: any, d: any, tx: any, ty: any) => this -+>Class.prototype.m1 = function (a, b, c, d, tx, ty) { return this; } : (a: any, b: any, c: any, d: any, tx: any, ty: any) => any - >Class.prototype.m1 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m1 : any -->function (a, b, c, d, tx, ty) { return this; } : (a: any, b: any, c: any, d: any, tx: any, ty: any) => this -+>function (a, b, c, d, tx, ty) { return this; } : (a: any, b: any, c: any, d: any, tx: any, ty: any) => any - >a : any - >b : any - >c : any - >d : any - >tx : any - >ty : any -->this : this -+>this : any - - Class.prototype.m2 = function (x, y) { return this; }; -->Class.prototype.m2 = function (x, y) { return this; } : (x: any, y: any) => this -+>Class.prototype.m2 = function (x, y) { return this; } : (x: any, y: any) => any - >Class.prototype.m2 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m2 : any -->function (x, y) { return this; } : (x: any, y: any) => this -+>function (x, y) { return this; } : (x: any, y: any) => any - >x : any - >y : any -->this : this -+>this : any - - Class.prototype.m3 = function (x, y) { return this; }; -->Class.prototype.m3 = function (x, y) { return this; } : (x: any, y: any) => this -+>Class.prototype.m3 = function (x, y) { return this; } : (x: any, y: any) => any - >Class.prototype.m3 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m3 : any -->function (x, y) { return this; } : (x: any, y: any) => this -+>function (x, y) { return this; } : (x: any, y: any) => any - >x : any - >y : any -->this : this -+>this : any - - Class.prototype.m4 = function (angle) { return this; }; -->Class.prototype.m4 = function (angle) { return this; } : (angle: any) => this -+>Class.prototype.m4 = function (angle) { return this; } : (angle: any) => any - >Class.prototype.m4 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m4 : any -->function (angle) { return this; } : (angle: any) => this -+>function (angle) { return this; } : (angle: any) => any - >angle : any -->this : this -+>this : any - - Class.prototype.m5 = function (matrix) { return this; }; -->Class.prototype.m5 = function (matrix) { return this; } : (matrix: any) => this -+>Class.prototype.m5 = function (matrix) { return this; } : (matrix: any) => any - >Class.prototype.m5 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m5 : any -->function (matrix) { return this; } : (matrix: any) => this -+>function (matrix) { return this; } : (matrix: any) => any - >matrix : any -->this : this -+>this : any - - Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; }; -->Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; } : (x: any, y: any, pivotX: any, pivotY: any, scaleX: any, scaleY: any, rotation: any, skewX: any, skewY: any) => this -+>Class.prototype.m6 = function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; } : (x: any, y: any, pivotX: any, pivotY: any, scaleX: any, scaleY: any, rotation: any, skewX: any, skewY: any) => any - >Class.prototype.m6 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m6 : any -->function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; } : (x: any, y: any, pivotX: any, pivotY: any, scaleX: any, scaleY: any, rotation: any, skewX: any, skewY: any) => this -+>function (x, y, pivotX, pivotY, scaleX, scaleY, rotation, skewX, skewY) { return this; } : (x: any, y: any, pivotX: any, pivotY: any, scaleX: any, scaleY: any, rotation: any, skewX: any, skewY: any) => any - >x : any - >y : any - >pivotX : any -@@= skipped -88, +88 lines =@@ - >rotation : any - >skewX : any - >skewY : any -->this : this -+>this : any - - Class.prototype.m7 = function(matrix) { return this; }; -->Class.prototype.m7 = function(matrix) { return this; } : (matrix: any) => this -+>Class.prototype.m7 = function(matrix) { return this; } : (matrix: any) => any - >Class.prototype.m7 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m7 : any -->function(matrix) { return this; } : (matrix: any) => this -+>function(matrix) { return this; } : (matrix: any) => any - >matrix : any -->this : this -+>this : any - - Class.prototype.m8 = function() { return this; }; -->Class.prototype.m8 = function() { return this; } : () => this -+>Class.prototype.m8 = function() { return this; } : () => any - >Class.prototype.m8 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m8 : any -->function() { return this; } : () => this -->this : this -+>function() { return this; } : () => any -+>this : any - - Class.prototype.m9 = function () { return this; }; -->Class.prototype.m9 = function () { return this; } : () => this -+>Class.prototype.m9 = function () { return this; } : () => any - >Class.prototype.m9 : any - >Class.prototype : any -->Class : typeof Class -+>Class : () => void - >prototype : any - >m9 : any -->function () { return this; } : () => this -->this : this -+>function () { return this; } : () => any -+>this : any - diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasImported.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasImported.types.diff index e7111af3a3..23aa34c07b 100644 --- a/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasImported.types.diff +++ b/testdata/baselines/reference/submoduleAccepted/conformance/moduleExportAliasImported.types.diff @@ -30,6 +30,6 @@ === importer.js === import('./bug28014') -->import('./bug28014') : Promise<{ (): void; version: 1; }> +->import('./bug28014') : Promise<{ version: 1; default: { (): void; version: 1; }; }> +>import('./bug28014') : Promise<() => void> >'./bug28014' : "./bug28014" diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/multipleDeclarations.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/multipleDeclarations.errors.txt.diff deleted file mode 100644 index e0b3dd7b2b..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/multipleDeclarations.errors.txt.diff +++ /dev/null @@ -1,48 +0,0 @@ ---- old.multipleDeclarations.errors.txt -+++ new.multipleDeclarations.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'input.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'input.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== input.js (0 errors) ==== -+ function C() { -+ this.m = null; -+ } -+ C.prototype.m = function() { -+ this.nothing(); -+ } -+ class X { -+ constructor() { -+ this.m = this.m.bind(this); -+ this.mistake = 'frankly, complete nonsense'; -+ } -+ m() { -+ } -+ mistake() { -+ } -+ } -+ let x = new X(); -+ X.prototype.mistake = false; -+ x.m(); -+ x.mistake; -+ class Y { -+ mistake() { -+ } -+ m() { -+ } -+ constructor() { -+ this.m = this.m.bind(this); -+ this.mistake = 'even more nonsense'; -+ } -+ } -+ Y.prototype.mistake = true; -+ let y = new Y(); -+ y.m(); -+ y.mistake(); -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/multipleDeclarations.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/multipleDeclarations.types.diff deleted file mode 100644 index d714127fa7..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/multipleDeclarations.types.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- old.multipleDeclarations.types -+++ new.multipleDeclarations.types -@@= skipped -1, +1 lines =@@ - - === input.js === - function C() { -->C : typeof C -+>C : () => void - - this.m = null; - >this.m = null : null - >this.m : any -->this : this -+>this : any - >m : any - } - C.prototype.m = function() { - >C.prototype.m = function() { this.nothing();} : () => void - >C.prototype.m : any - >C.prototype : any -->C : typeof C -+>C : () => void - >prototype : any - >m : any - >function() { this.nothing();} : () => void - - this.nothing(); -->this.nothing() : error -->this.nothing : error -->this : this -+>this.nothing() : any -+>this.nothing : any -+>this : any - >nothing : any - } - class X { \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/node10AlternateResult_noResolution.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/node10AlternateResult_noResolution.errors.txt.diff deleted file mode 100644 index a6775022ac..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/node10AlternateResult_noResolution.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.node10AlternateResult_noResolution.errors.txt -+++ new.node10AlternateResult_noResolution.errors.txt -@@= skipped -0, +0 lines =@@ --error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. --/index.ts(1,21): error TS2307: Cannot find module 'pkg' or its corresponding type declarations. -- There are types at '/node_modules/pkg/definitely-not-index.d.ts', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'. -- -- --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. -+/index.ts(1,10): error TS2305: Module '"pkg"' has no exported member 'pkg'. -+ -+ - ==== /node_modules/pkg/package.json (0 errors) ==== - { - "name": "pkg", -@@= skipped -17, +14 lines =@@ - - ==== /index.ts (1 errors) ==== - import { pkg } from "pkg"; -- ~~~~~ --!!! error TS2307: Cannot find module 'pkg' or its corresponding type declarations. --!!! error TS2307: There are types at '/node_modules/pkg/definitely-not-index.d.ts', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'. -+ ~~~ -+!!! error TS2305: Module '"pkg"' has no exported member 'pkg'. - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/node10Alternateresult_noTypes.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/node10Alternateresult_noTypes.errors.txt.diff deleted file mode 100644 index 7a0400b9f7..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/node10Alternateresult_noTypes.errors.txt.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.node10Alternateresult_noTypes.errors.txt -+++ new.node10Alternateresult_noTypes.errors.txt -@@= skipped -0, +0 lines =@@ --error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. --error TS6504: File '/node_modules/pkg/untyped.js' is a JavaScript file. Did you mean to enable the 'allowJs' option? -- The file is in the program because: -- Root file specified for compilation --/index.ts(1,21): error TS7016: Could not find a declaration file for module 'pkg'. '/node_modules/pkg/untyped.js' implicitly has an 'any' type. -- There are types at '/node_modules/pkg/definitely-not-index.d.ts', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'. -- -- --!!! error TS5107: Option 'moduleResolution=node10' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error. --!!! error TS6504: File '/node_modules/pkg/untyped.js' is a JavaScript file. Did you mean to enable the 'allowJs' option? --!!! error TS6504: The file is in the program because: --!!! error TS6504: Root file specified for compilation -+/index.ts(1,10): error TS2305: Module '"pkg"' has no exported member 'pkg'. -+ -+ - ==== /node_modules/pkg/package.json (0 errors) ==== - { - "name": "pkg", -@@= skipped -27, +18 lines =@@ - - ==== /index.ts (1 errors) ==== - import { pkg } from "pkg"; -- ~~~~~ --!!! error TS7016: Could not find a declaration file for module 'pkg'. '/node_modules/pkg/untyped.js' implicitly has an 'any' type. --!!! error TS7016: There are types at '/node_modules/pkg/definitely-not-index.d.ts', but this result could not be resolved under your current 'moduleResolution' setting. Consider updating to 'node16', 'nodenext', or 'bundler'. -+ ~~~ -+!!! error TS2305: Module '"pkg"' has no exported member 'pkg'. - \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/topLevelThisAssignment.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/topLevelThisAssignment.errors.txt.diff deleted file mode 100644 index 938aa0e9c2..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/topLevelThisAssignment.errors.txt.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- old.topLevelThisAssignment.errors.txt -+++ new.topLevelThisAssignment.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+a.js(3,1): error TS2304: Cannot find name 'a'. -+b.js(2,1): error TS2304: Cannot find name 'a'. -+ -+ -+!!! error TS5055: Cannot write file 'a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5055: Cannot write file 'b.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== a.js (1 errors) ==== -+ this.a = 10; -+ this.a; -+ a; -+ ~ -+!!! error TS2304: Cannot find name 'a'. -+ -+==== b.js (1 errors) ==== -+ this.a; -+ a; -+ ~ -+!!! error TS2304: Cannot find name 'a'. -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/topLevelThisAssignment.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/topLevelThisAssignment.types.diff deleted file mode 100644 index 6f0038f894..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/topLevelThisAssignment.types.diff +++ /dev/null @@ -1,35 +0,0 @@ ---- old.topLevelThisAssignment.types -+++ new.topLevelThisAssignment.types -@@= skipped -2, +2 lines =@@ - === a.js === - this.a = 10; - >this.a = 10 : 10 -->this.a : number -+>this.a : any - >this : typeof globalThis -->a : number -+>a : any - >10 : 10 - - this.a; -->this.a : number -+>this.a : any - >this : typeof globalThis -->a : number -+>a : any - - a; -->a : number -+>a : any - - === b.js === - this.a; -->this.a : number -+>this.a : any - >this : typeof globalThis -->a : number -+>a : any - - a; -->a : number -+>a : any diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typeFromPropertyAssignment17.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typeFromPropertyAssignment17.errors.txt.diff new file mode 100644 index 0000000000..5f966384cc --- /dev/null +++ b/testdata/baselines/reference/submoduleAccepted/conformance/typeFromPropertyAssignment17.errors.txt.diff @@ -0,0 +1,39 @@ +--- old.typeFromPropertyAssignment17.errors.txt ++++ new.typeFromPropertyAssignment17.errors.txt +@@= skipped -0, +0 lines =@@ +- ++use.js(3,8): error TS2554: Expected 1 arguments, but got 0. ++ ++ ++==== use.js (1 errors) ==== ++ /// ++ var mini = require('./minimatch') ++ mini.M.defaults() ++ ~~~~~~~~ ++!!! error TS2554: Expected 1 arguments, but got 0. ++!!! related TS6210 minimatch.js:10:24: An argument for 'def' was not provided. ++ var m = new mini.M() ++ m.m() ++ mini.filter() ++ ++==== types.d.ts (0 errors) ==== ++ declare var require: any; ++ declare var module: any; ++==== minimatch.js (0 errors) ==== ++ /// ++ module.exports = minimatch ++ minimatch.M = M ++ minimatch.filter = filter ++ function filter() { ++ return minimatch() ++ } ++ function minimatch() { ++ } ++ M.defaults = function (def) { ++ return def ++ } ++ M.prototype.m = function () { ++ } ++ function M() { ++ } ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typeFromPropertyAssignment7.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typeFromPropertyAssignment7.errors.txt.diff new file mode 100644 index 0000000000..3ee1f1f7e3 --- /dev/null +++ b/testdata/baselines/reference/submoduleAccepted/conformance/typeFromPropertyAssignment7.errors.txt.diff @@ -0,0 +1,17 @@ +--- old.typeFromPropertyAssignment7.errors.txt ++++ new.typeFromPropertyAssignment7.errors.txt +@@= skipped -0, +0 lines =@@ +- ++a.js(5,13): error TS2554: Expected 1 arguments, but got 0. ++ ++ ++==== a.js (1 errors) ==== ++ var obj = {}; ++ obj.method = function (hunch) { ++ return true; ++ } ++ var b = obj.method(); ++ ~~~~~~ ++!!! error TS2554: Expected 1 arguments, but got 0. ++!!! related TS6210 a.js:2:24: An argument for 'hunch' was not provided. ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typeSatisfaction_js.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typeSatisfaction_js.errors.txt.diff deleted file mode 100644 index 8dce7333c0..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/typeSatisfaction_js.errors.txt.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- old.typeSatisfaction_js.errors.txt -+++ new.typeSatisfaction_js.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - /src/a.js(1,29): error TS8037: Type satisfaction expressions can only be used in TypeScript files. - - -+!!! error TS5055: Cannot write file '/src/a.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== /src/a.js (1 errors) ==== - var v = undefined satisfies 1; - ~ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typeTagOnFunctionReferencesGeneric.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typeTagOnFunctionReferencesGeneric.types.diff new file mode 100644 index 0000000000..80d3d366a0 --- /dev/null +++ b/testdata/baselines/reference/submoduleAccepted/conformance/typeTagOnFunctionReferencesGeneric.types.diff @@ -0,0 +1,20 @@ +--- old.typeTagOnFunctionReferencesGeneric.types ++++ new.typeTagOnFunctionReferencesGeneric.types +@@= skipped -6, +6 lines =@@ + + /**@type {IFn}*/ + export function inJs(l) { +->inJs : (m: T) => T ++>inJs : (l: T) => T + >l : T + + return l; +@@= skipped -8, +8 lines =@@ + } + inJs(1); // lints error. Why? + >inJs(1) : 1 +->inJs : (m: T) => T ++>inJs : (l: T) => T + >1 : 1 + + /**@type {IFn}*/ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typeTagWithGenericSignature.types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typeTagWithGenericSignature.types.diff index 02313972c3..d5a2254495 100644 --- a/testdata/baselines/reference/submoduleAccepted/conformance/typeTagWithGenericSignature.types.diff +++ b/testdata/baselines/reference/submoduleAccepted/conformance/typeTagWithGenericSignature.types.diff @@ -5,7 +5,7 @@ /** @type {(param?: T) => T | undefined} */ function typed(param) { ->typed : (param?: T) => T | undefined -+>typed : (param?: T | undefined) => T | undefined ++>typed : (param: T | undefined) => T | undefined >param : T | undefined return param; @@ -14,6 +14,6 @@ >n : number | undefined >typed(1) : 1 | undefined ->typed : (param?: T) => T | undefined -+>typed : (param?: T | undefined) => T | undefined ++>typed : (param: T | undefined) => T | undefined >1 : 1 diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typesVersions.emptyTypes.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typesVersions.emptyTypes.errors.txt.diff deleted file mode 100644 index d98c7e28e9..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/typesVersions.emptyTypes.errors.txt.diff +++ /dev/null @@ -1,25 +0,0 @@ ---- old.typesVersions.emptyTypes.errors.txt -+++ new.typesVersions.emptyTypes.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+/b/user.ts(1,19): error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ -+ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+==== /a/package.json (0 errors) ==== -+ { -+ "types": "", -+ "typesVersions": { -+ ">=3.1.0-0": { "*" : ["ts3.1/*"] } -+ } -+ } -+ -+==== /a/ts3.1/index.d.ts (0 errors) ==== -+ export const a = 0; -+ -+==== /b/user.ts (1 errors) ==== -+ import { a } from "a"; -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/typesVersions.justIndex.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/typesVersions.justIndex.errors.txt.diff deleted file mode 100644 index f743bc2658..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/typesVersions.justIndex.errors.txt.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- old.typesVersions.justIndex.errors.txt -+++ new.typesVersions.justIndex.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+/b/user.ts(1,19): error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ -+ -+!!! error TS5102: Option 'baseUrl' has been removed. Please remove it from your configuration. -+==== /a/package.json (0 errors) ==== -+ { -+ "typesVersions": { -+ ">=3.1.0-0": { "*" : ["ts3.1/*"] } -+ } -+ } -+ -+==== /a/ts3.1/index.d.ts (0 errors) ==== -+ export const a = 0; -+ -+==== /b/user.ts (1 errors) ==== -+ import { a } from "a"; -+ ~~~ -+!!! error TS2307: Cannot find module 'a' or its corresponding type declarations. -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/unannotatedParametersAreOptional.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/unannotatedParametersAreOptional.errors.txt.diff new file mode 100644 index 0000000000..ff90a5833b --- /dev/null +++ b/testdata/baselines/reference/submoduleAccepted/conformance/unannotatedParametersAreOptional.errors.txt.diff @@ -0,0 +1,52 @@ +--- old.unannotatedParametersAreOptional.errors.txt ++++ new.unannotatedParametersAreOptional.errors.txt +@@= skipped -0, +0 lines =@@ +- ++test.js(2,1): error TS2554: Expected 1 arguments, but got 0. ++test.js(10,3): error TS2554: Expected 1 arguments, but got 0. ++test.js(11,9): error TS2554: Expected 1 arguments, but got 0. ++test.js(12,9): error TS2554: Expected 1 arguments, but got 0. ++test.js(19,5): error TS2554: Expected 1 arguments, but got 0. ++test.js(20,5): error TS2554: Expected 1 arguments, but got 0. ++ ++ ++==== test.js (6 errors) ==== ++ function f(x) {} ++ f(); // Always been ok ++ ~ ++!!! error TS2554: Expected 1 arguments, but got 0. ++!!! related TS6210 test.js:1:12: An argument for 'x' was not provided. ++ ++ class C { ++ static m(x) {} ++ p = x => {} ++ m(x) {} ++ } ++ ++ C.m(); // Always been ok ++ ~ ++!!! error TS2554: Expected 1 arguments, but got 0. ++!!! related TS6210 test.js:5:12: An argument for 'x' was not provided. ++ new C().m(); // Regression #39261 ++ ~ ++!!! error TS2554: Expected 1 arguments, but got 0. ++!!! related TS6210 test.js:7:5: An argument for 'x' was not provided. ++ new C().p(); // Regression #39261 ++ ~ ++!!! error TS2554: Expected 1 arguments, but got 0. ++!!! related TS6210 test.js:6:7: An argument for 'x' was not provided. ++ ++ const obj = { ++ m(x) {}, ++ p: x => {} ++ }; ++ ++ obj.m(); // Always been ok ++ ~ ++!!! error TS2554: Expected 1 arguments, but got 0. ++!!! related TS6210 test.js:15:5: An argument for 'x' was not provided. ++ obj.p(); // Always been ok ++ ~ ++!!! error TS2554: Expected 1 arguments, but got 0. ++!!! related TS6210 test.js:16:6: An argument for 'x' was not provided. ++ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/uniqueSymbolsDeclarationsInJs.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/uniqueSymbolsDeclarationsInJs.errors.txt.diff deleted file mode 100644 index ec745b980a..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/uniqueSymbolsDeclarationsInJs.errors.txt.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- old.uniqueSymbolsDeclarationsInJs.errors.txt -+++ new.uniqueSymbolsDeclarationsInJs.errors.txt -@@= skipped -0, +0 lines =@@ -- -+error TS5055: Cannot write file 'uniqueSymbolsDeclarationsInJs.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+ -+ -+!!! error TS5055: Cannot write file 'uniqueSymbolsDeclarationsInJs.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. -+==== uniqueSymbolsDeclarationsInJs.js (0 errors) ==== -+ // classes -+ class C { -+ /** -+ * @readonly -+ */ -+ static readonlyStaticCall = Symbol(); -+ /** -+ * @type {unique symbol} -+ * @readonly -+ */ -+ static readonlyStaticType; -+ /** -+ * @type {unique symbol} -+ * @readonly -+ */ -+ static readonlyStaticTypeAndCall = Symbol(); -+ static readwriteStaticCall = Symbol(); -+ -+ /** -+ * @readonly -+ */ -+ readonlyCall = Symbol(); -+ readwriteCall = Symbol(); -+ } -+ -+ /** @type {unique symbol} */ -+ const a = Symbol(); -+ \ No newline at end of file diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/uniqueSymbolsDeclarationsInJsErrors.errors.txt.diff b/testdata/baselines/reference/submoduleAccepted/conformance/uniqueSymbolsDeclarationsInJsErrors.errors.txt.diff deleted file mode 100644 index 7896e7b1e6..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/uniqueSymbolsDeclarationsInJsErrors.errors.txt.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.uniqueSymbolsDeclarationsInJsErrors.errors.txt -+++ new.uniqueSymbolsDeclarationsInJsErrors.errors.txt -@@= skipped -0, +0 lines =@@ -+error TS5055: Cannot write file 'uniqueSymbolsDeclarationsInJsErrors.js' because it would overwrite input file. -+ Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - uniqueSymbolsDeclarationsInJsErrors.js(5,12): error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'. - uniqueSymbolsDeclarationsInJsErrors.js(14,12): error TS1331: A property of a class whose type is a 'unique symbol' type must be both 'static' and 'readonly'. - - -+!!! error TS5055: Cannot write file 'uniqueSymbolsDeclarationsInJsErrors.js' because it would overwrite input file. -+!!! error TS5055: Adding a tsconfig.json file will help organize projects that contain both TypeScript and JavaScript files. Learn more at https://aka.ms/tsconfig. -+!!! error TS5102: Option 'outFile' has been removed. Please remove it from your configuration. - ==== uniqueSymbolsDeclarationsInJsErrors.js (2 errors) ==== - class C { - /** \ No newline at end of file diff --git a/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module-with-isolatedModules.js b/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module-with-isolatedModules.js index 7b909938d8..32bc36e59d 100644 --- a/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module-with-isolatedModules.js +++ b/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module-with-isolatedModules.js @@ -124,10 +124,43 @@ export declare const lazyBar: LazyAction<(param: string) => void, typeof import( //// [/home/src/workspaces/project/obj/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.lazyBar = void 0; const bundling_1 = require("./bundling"); -const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(() => require('./lazyIndex'))); +const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(() => __importStar(require('./lazyIndex')))); exports.lazyBar = new bundling_1.LazyAction(lazyModule, m => m.bar); //// [/home/src/workspaces/project/obj/lazyIndex.d.ts] *new* @@ -135,10 +168,13 @@ export { default as bar } from './bar'; //// [/home/src/workspaces/project/obj/lazyIndex.js] *new* "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.bar = void 0; const bar_1 = require("./bar"); -Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } }); +Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } }); //// [/home/src/workspaces/project/obj/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[[2,6]],"fileNames":["lib.d.ts","../bar.ts","../bundling.ts","../global.d.ts","../lazyIndex.ts","../index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},{"version":"76a83326d4e197789f8362e994577f53-interface RawAction {\n (...args: any[]): Promise | void;\n}\ninterface ActionFactory {\n (target: T): T;\n}\ndeclare function foo(): ActionFactory;\nexport default foo()(function foobar(param: string): void {\n});","signature":"16f73d7e0c200fed165b8fa7d55fefbf-declare const _default: (param: string) => void;\nexport default _default;\n","impliedNodeFormat":1},{"version":"16bf1b870d8b21533eda3b1f1b87cd77-export class LazyModule {\n constructor(private importCallback: () => Promise) {}\n}\n\nexport class LazyAction<\n TAction extends (...args: any[]) => any,\n TModule\n> {\n constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction) {\n }\n}","signature":"5e4757586f6f5d494b6763f1e808313a-export declare class LazyModule {\n private importCallback;\n constructor(importCallback: () => Promise);\n}\nexport declare class LazyAction any, TModule> {\n constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction);\n}\n","impliedNodeFormat":1},{"version":"9c9274fd70d574f2b4b68a2891bd4c47-interface PromiseConstructor {\n new (): Promise;\n}\ndeclare var Promise: PromiseConstructor;\ninterface Promise {\n}","affectsGlobalScope":true,"impliedNodeFormat":1},{"version":"7c5cf52aadc65791601164da964e3110-export { default as bar } from './bar';","signature":"3a848e147ba2aebbd888c3c7bbab715b-export { default as bar } from './bar';\n","impliedNodeFormat":1},{"version":"d552d2a19fa05b15aa33018233d09810-import { LazyAction, LazyModule } from './bundling';\nconst lazyModule = new LazyModule(() =>\n import('./lazyIndex')\n);\nexport const lazyBar = new LazyAction(lazyModule, m => m.bar);","signature":"421664a6306d66498ea4a2e3065214b1-import { LazyAction } from './bundling';\nexport declare const lazyBar: LazyAction<(param: string) => void, typeof import(\"./lazyIndex\")>;\n","impliedNodeFormat":1}],"fileIdsList":[[3,5],[2]],"options":{"declaration":true,"outDir":"./","target":1},"referencedMap":[[6,1],[5,2]]} diff --git a/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module.js b/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module.js index d6c921c3f2..e00ab7efaa 100644 --- a/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module.js +++ b/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/inferred-type-from-transitive-module.js @@ -124,10 +124,43 @@ export declare const lazyBar: LazyAction<(param: string) => void, typeof import( //// [/home/src/workspaces/project/obj/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.lazyBar = void 0; const bundling_1 = require("./bundling"); -const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(() => require('./lazyIndex'))); +const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(() => __importStar(require('./lazyIndex')))); exports.lazyBar = new bundling_1.LazyAction(lazyModule, m => m.bar); //// [/home/src/workspaces/project/obj/lazyIndex.d.ts] *new* @@ -135,10 +168,13 @@ export { default as bar } from './bar'; //// [/home/src/workspaces/project/obj/lazyIndex.js] *new* "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.bar = void 0; const bar_1 = require("./bar"); -Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } }); +Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } }); //// [/home/src/workspaces/project/obj/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[[2,6]],"fileNames":["lib.d.ts","../bar.ts","../bundling.ts","../global.d.ts","../lazyIndex.ts","../index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},{"version":"76a83326d4e197789f8362e994577f53-interface RawAction {\n (...args: any[]): Promise | void;\n}\ninterface ActionFactory {\n (target: T): T;\n}\ndeclare function foo(): ActionFactory;\nexport default foo()(function foobar(param: string): void {\n});","signature":"16f73d7e0c200fed165b8fa7d55fefbf-declare const _default: (param: string) => void;\nexport default _default;\n","impliedNodeFormat":1},{"version":"16bf1b870d8b21533eda3b1f1b87cd77-export class LazyModule {\n constructor(private importCallback: () => Promise) {}\n}\n\nexport class LazyAction<\n TAction extends (...args: any[]) => any,\n TModule\n> {\n constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction) {\n }\n}","signature":"5e4757586f6f5d494b6763f1e808313a-export declare class LazyModule {\n private importCallback;\n constructor(importCallback: () => Promise);\n}\nexport declare class LazyAction any, TModule> {\n constructor(_lazyModule: LazyModule, _getter: (module: TModule) => TAction);\n}\n","impliedNodeFormat":1},{"version":"9c9274fd70d574f2b4b68a2891bd4c47-interface PromiseConstructor {\n new (): Promise;\n}\ndeclare var Promise: PromiseConstructor;\ninterface Promise {\n}","affectsGlobalScope":true,"impliedNodeFormat":1},{"version":"7c5cf52aadc65791601164da964e3110-export { default as bar } from './bar';","signature":"3a848e147ba2aebbd888c3c7bbab715b-export { default as bar } from './bar';\n","impliedNodeFormat":1},{"version":"d552d2a19fa05b15aa33018233d09810-import { LazyAction, LazyModule } from './bundling';\nconst lazyModule = new LazyModule(() =>\n import('./lazyIndex')\n);\nexport const lazyBar = new LazyAction(lazyModule, m => m.bar);","signature":"421664a6306d66498ea4a2e3065214b1-import { LazyAction } from './bundling';\nexport declare const lazyBar: LazyAction<(param: string) => void, typeof import(\"./lazyIndex\")>;\n","impliedNodeFormat":1}],"fileIdsList":[[3,5],[2]],"options":{"declaration":true,"outDir":"./","target":1},"referencedMap":[[6,1],[5,2]]} diff --git a/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js b/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js index bf8bfe4284..b58b23c468 100644 --- a/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js +++ b/testdata/baselines/reference/tsbuild/inferredTypeFromTransitiveModule/reports-errors-in-files-affected-by-change-in-signature-with-isolatedModules.js @@ -125,10 +125,43 @@ export declare const lazyBar: LazyAction<(param: string) => void, typeof import( //// [/home/src/workspaces/project/obj/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.lazyBar = void 0; const bundling_1 = require("./bundling"); -const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(() => require('./lazyIndex'))); +const lazyModule = new bundling_1.LazyModule(() => Promise.resolve().then(() => __importStar(require('./lazyIndex')))); exports.lazyBar = new bundling_1.LazyAction(lazyModule, m => m.bar); //// [/home/src/workspaces/project/obj/lazyIndex.d.ts] *new* @@ -136,11 +169,14 @@ export { default as bar } from './bar'; //// [/home/src/workspaces/project/obj/lazyIndex.js] *new* "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.bar = void 0; const bar_1 = require("./bar"); -Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } }); -const bar_2 = require("./bar"); +Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } }); +const bar_2 = __importDefault(require("./bar")); (0, bar_2.default)("hello"); //// [/home/src/workspaces/project/obj/tsconfig.tsbuildinfo] *new* @@ -860,11 +896,14 @@ Output:: //// [/home/src/workspaces/project/obj/lazyIndex.d.ts] *rewrite with same content* //// [/home/src/workspaces/project/obj/lazyIndex.js] *modified* "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.bar = void 0; const bar_1 = require("./bar"); -Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return bar_1.default; } }); -const bar_2 = require("./bar"); +Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return __importDefault(bar_1).default; } }); +const bar_2 = __importDefault(require("./bar")); (0, bar_2.default)(); //// [/home/src/workspaces/project/obj/tsconfig.tsbuildinfo] *modified* diff --git a/testdata/baselines/reference/tsbuild/sample/always-builds-under-with-force-option.js b/testdata/baselines/reference/tsbuild/sample/always-builds-under-with-force-option.js index f8ea0d9f23..d2e0c62018 100644 --- a/testdata/baselines/reference/tsbuild/sample/always-builds-under-with-force-option.js +++ b/testdata/baselines/reference/tsbuild/sample/always-builds-under-with-force-option.js @@ -202,18 +202,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -297,13 +330,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/builds-correctly-when-declarationDir-is-specified.js b/testdata/baselines/reference/tsbuild/sample/builds-correctly-when-declarationDir-is-specified.js index c3265da6f8..93e1df01d3 100644 --- a/testdata/baselines/reference/tsbuild/sample/builds-correctly-when-declarationDir-is-specified.js +++ b/testdata/baselines/reference/tsbuild/sample/builds-correctly-when-declarationDir-is-specified.js @@ -197,18 +197,51 @@ function multiply(a, b) { return a * b; } } //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/out/decls/index.d.ts] *new* export declare function getSecondsInDay(): number; import * as mod from '../core/anotherModule'; @@ -297,13 +330,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/builds-correctly-when-outDir-is-specified.js b/testdata/baselines/reference/tsbuild/sample/builds-correctly-when-outDir-is-specified.js index 2e36adda35..05794d55ab 100644 --- a/testdata/baselines/reference/tsbuild/sample/builds-correctly-when-outDir-is-specified.js +++ b/testdata/baselines/reference/tsbuild/sample/builds-correctly-when-outDir-is-specified.js @@ -202,18 +202,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/outDir/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/outDir/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/outDir/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../../core/index.d.ts","../../core/anotherModule.d.ts","../index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"outDir":"./","sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/outDir/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -297,13 +330,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/builds-downstream-projects-even-if-upstream-projects-have-errors.js b/testdata/baselines/reference/tsbuild/sample/builds-downstream-projects-even-if-upstream-projects-have-errors.js index fc975d6e23..0e42fc149c 100644 --- a/testdata/baselines/reference/tsbuild/sample/builds-downstream-projects-even-if-upstream-projects-have-errors.js +++ b/testdata/baselines/reference/tsbuild/sample/builds-downstream-projects-even-if-upstream-projects-have-errors.js @@ -227,18 +227,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.muitply(); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AAAA,CACtB;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;AAAA,CACtB;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"4da0a6ee7d4a662685afc8fe143c994d-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.muitply();\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"07587a8dc02fb971c487c21dd8f4849b-export declare function getSecondsInDay(): any;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"semanticDiagnosticsPerFile":[[4,[{"pos":85,"end":92,"code":2339,"category":1,"message":"Property 'muitply' does not exist on type 'typeof import(\"/user/username/projects/sample1/core/index\")'."}]]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -336,13 +369,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/can-detect-when-and-what-to-rebuild.js b/testdata/baselines/reference/tsbuild/sample/can-detect-when-and-what-to-rebuild.js index 4de6163398..4a8ea4fa3d 100644 --- a/testdata/baselines/reference/tsbuild/sample/can-detect-when-and-what-to-rebuild.js +++ b/testdata/baselines/reference/tsbuild/sample/can-detect-when-and-what-to-rebuild.js @@ -219,18 +219,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -314,13 +347,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/explainFiles.js b/testdata/baselines/reference/tsbuild/sample/explainFiles.js index 34f858c988..40d59adb7e 100644 --- a/testdata/baselines/reference/tsbuild/sample/explainFiles.js +++ b/testdata/baselines/reference/tsbuild/sample/explainFiles.js @@ -251,18 +251,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -346,13 +379,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/indicates-that-it-would-skip-builds-during-a-dry-build.js b/testdata/baselines/reference/tsbuild/sample/indicates-that-it-would-skip-builds-during-a-dry-build.js index 0f87cbd2cf..07231b8451 100644 --- a/testdata/baselines/reference/tsbuild/sample/indicates-that-it-would-skip-builds-during-a-dry-build.js +++ b/testdata/baselines/reference/tsbuild/sample/indicates-that-it-would-skip-builds-during-a-dry-build.js @@ -202,18 +202,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -297,13 +330,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/listEmittedFiles.js b/testdata/baselines/reference/tsbuild/sample/listEmittedFiles.js index e714739a80..f25e16ba07 100644 --- a/testdata/baselines/reference/tsbuild/sample/listEmittedFiles.js +++ b/testdata/baselines/reference/tsbuild/sample/listEmittedFiles.js @@ -216,18 +216,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -311,13 +344,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/listFiles.js b/testdata/baselines/reference/tsbuild/sample/listFiles.js index 3f6d7f9965..8b6a194fa6 100644 --- a/testdata/baselines/reference/tsbuild/sample/listFiles.js +++ b/testdata/baselines/reference/tsbuild/sample/listFiles.js @@ -215,18 +215,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -310,13 +343,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js b/testdata/baselines/reference/tsbuild/sample/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js index 0a3b7949b0..f04de74af2 100644 --- a/testdata/baselines/reference/tsbuild/sample/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js +++ b/testdata/baselines/reference/tsbuild/sample/rebuilds-completely-when-version-in-tsbuildinfo-doesnt-match-ts-version.js @@ -219,18 +219,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -314,13 +347,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/rebuilds-from-start-if-force-option-is-set.js b/testdata/baselines/reference/tsbuild/sample/rebuilds-from-start-if-force-option-is-set.js index fe5b8a8b51..cd96dbdec9 100644 --- a/testdata/baselines/reference/tsbuild/sample/rebuilds-from-start-if-force-option-is-set.js +++ b/testdata/baselines/reference/tsbuild/sample/rebuilds-from-start-if-force-option-is-set.js @@ -202,18 +202,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -297,13 +330,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/rebuilds-when-extended-config-file-changes.js b/testdata/baselines/reference/tsbuild/sample/rebuilds-when-extended-config-file-changes.js index 529bf18c46..eadc874d41 100644 --- a/testdata/baselines/reference/tsbuild/sample/rebuilds-when-extended-config-file-changes.js +++ b/testdata/baselines/reference/tsbuild/sample/rebuilds-when-extended-config-file-changes.js @@ -225,18 +225,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -320,13 +353,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/removes-all-files-it-built.js b/testdata/baselines/reference/tsbuild/sample/removes-all-files-it-built.js index 4dbbe4597f..7d62a90c41 100644 --- a/testdata/baselines/reference/tsbuild/sample/removes-all-files-it-built.js +++ b/testdata/baselines/reference/tsbuild/sample/removes-all-files-it-built.js @@ -202,18 +202,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -297,13 +330,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/reports-error-if-input-file-is-missing-with-force.js b/testdata/baselines/reference/tsbuild/sample/reports-error-if-input-file-is-missing-with-force.js index 11c9af0739..69a3eed6d1 100644 --- a/testdata/baselines/reference/tsbuild/sample/reports-error-if-input-file-is-missing-with-force.js +++ b/testdata/baselines/reference/tsbuild/sample/reports-error-if-input-file-is-missing-with-force.js @@ -200,18 +200,51 @@ export declare const m: any; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[3],"fileNames":["lib.d.ts","../core/index.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"da642d80443e7ccd327091080a82a43c-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"40bb9a18ac3dbfd340fea197221fa9dd-export declare function getSecondsInDay(): number;\nexport declare const m: any;\n","impliedNodeFormat":1}],"fileIdsList":[[2]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[[3,[{"pos":126,"end":149,"code":2307,"category":1,"message":"Cannot find module '../core/anotherModule' or its corresponding type declarations."}]]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -299,13 +332,46 @@ export declare const m: any; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/reports-error-if-input-file-is-missing.js b/testdata/baselines/reference/tsbuild/sample/reports-error-if-input-file-is-missing.js index 7a726b775a..d546837a27 100644 --- a/testdata/baselines/reference/tsbuild/sample/reports-error-if-input-file-is-missing.js +++ b/testdata/baselines/reference/tsbuild/sample/reports-error-if-input-file-is-missing.js @@ -200,18 +200,51 @@ export declare const m: any; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[3],"fileNames":["lib.d.ts","../core/index.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"da642d80443e7ccd327091080a82a43c-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"40bb9a18ac3dbfd340fea197221fa9dd-export declare function getSecondsInDay(): number;\nexport declare const m: any;\n","impliedNodeFormat":1}],"fileIdsList":[[2]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[3,1]],"semanticDiagnosticsPerFile":[[3,[{"pos":126,"end":149,"code":2307,"category":1,"message":"Cannot find module '../core/anotherModule' or its corresponding type declarations."}]]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -299,13 +332,46 @@ export declare const m: any; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/sample.js b/testdata/baselines/reference/tsbuild/sample/sample.js index 2adc9789dc..4b7809803b 100644 --- a/testdata/baselines/reference/tsbuild/sample/sample.js +++ b/testdata/baselines/reference/tsbuild/sample/sample.js @@ -219,18 +219,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -314,13 +347,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js b/testdata/baselines/reference/tsbuild/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js index e356660329..2a9339f273 100644 --- a/testdata/baselines/reference/tsbuild/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js +++ b/testdata/baselines/reference/tsbuild/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js @@ -424,18 +424,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -519,13 +552,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js b/testdata/baselines/reference/tsbuild/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js index c498d0fbe7..065dec9b3d 100644 --- a/testdata/baselines/reference/tsbuild/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js +++ b/testdata/baselines/reference/tsbuild/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js @@ -425,18 +425,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -520,13 +553,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/when-declarationMap-changes.js b/testdata/baselines/reference/tsbuild/sample/when-declarationMap-changes.js index 19114f67c1..35545fdb50 100644 --- a/testdata/baselines/reference/tsbuild/sample/when-declarationMap-changes.js +++ b/testdata/baselines/reference/tsbuild/sample/when-declarationMap-changes.js @@ -219,18 +219,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -314,13 +347,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/when-esModuleInterop-option-changes.js b/testdata/baselines/reference/tsbuild/sample/when-esModuleInterop-option-changes.js index ad887c9a82..58604381f2 100644 --- a/testdata/baselines/reference/tsbuild/sample/when-esModuleInterop-option-changes.js +++ b/testdata/baselines/reference/tsbuild/sample/when-esModuleInterop-option-changes.js @@ -220,18 +220,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -315,13 +348,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* @@ -479,50 +545,7 @@ Output:: [HH:MM:SS AM] Building project 'tests/tsconfig.json'... -//// [/user/username/projects/sample1/tests/index.js] *modified* -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { - Object.defineProperty(o, "default", { enumerable: true, value: v }); -}) : function(o, v) { - o["default"] = v; -}); -var __importStar = (this && this.__importStar) || (function () { - var ownKeys = function(o) { - ownKeys = Object.getOwnPropertyNames || function (o) { - var ar = []; - for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; - return ar; - }; - return ownKeys(o); - }; - return function (mod) { - if (mod && mod.__esModule) return mod; - var result = {}; - if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); - __setModuleDefault(result, mod); - return result; - }; -})(); -Object.defineProperty(exports, "__esModule", { value: true }); -exports.m = void 0; -const c = __importStar(require("../core/index")); -const logic = __importStar(require("../logic/index")); -c.leftPad("", 10); -logic.getSecondsInDay(); -const mod = __importStar(require("../core/anotherModule")); -exports.m = mod; - +//// [/user/username/projects/sample1/tests/index.js] *rewrite with same content* //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *modified* {"version":"FakeTSVersion","root":[5],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","../logic/index.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map","487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n",{"version":"7fa4162f733e6b9e7f7d9d9410e62f61-import * as c from '../core/index';\nimport * as logic from '../logic/index';\n\nc.leftPad(\"\", 10);\nlogic.getSecondsInDay();\n\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"4b3c99afe665034856f74c660f74d6fd-import * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[3],[2,3,4]],"options":{"composite":true,"declaration":true,"esModuleInterop":true,"skipDefaultLibCheck":true},"referencedMap":[[4,1],[5,2]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* diff --git a/testdata/baselines/reference/tsbuild/sample/when-input-file-text-does-not-change-but-its-modified-time-changes.js b/testdata/baselines/reference/tsbuild/sample/when-input-file-text-does-not-change-but-its-modified-time-changes.js index c0fbf9ee98..9f96ac80dd 100644 --- a/testdata/baselines/reference/tsbuild/sample/when-input-file-text-does-not-change-but-its-modified-time-changes.js +++ b/testdata/baselines/reference/tsbuild/sample/when-input-file-text-does-not-change-but-its-modified-time-changes.js @@ -219,18 +219,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -314,13 +347,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuild/sample/when-logic-specifies-tsBuildInfoFile.js b/testdata/baselines/reference/tsbuild/sample/when-logic-specifies-tsBuildInfoFile.js index b00d0590df..503139c150 100644 --- a/testdata/baselines/reference/tsbuild/sample/when-logic-specifies-tsBuildInfoFile.js +++ b/testdata/baselines/reference/tsbuild/sample/when-logic-specifies-tsBuildInfoFile.js @@ -220,18 +220,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/ownFile.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true,"tsBuildInfoFile":"./ownFile.tsbuildinfo"},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/ownFile.tsbuildinfo.readable.baseline.txt] *new* @@ -316,13 +349,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/builds-when-new-file-is-added,-and-its-subsequent-updates-with-circular-references.js b/testdata/baselines/reference/tsbuildWatch/sample/builds-when-new-file-is-added,-and-its-subsequent-updates-with-circular-references.js index 4ecab36d83..d84e11bb2f 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/builds-when-new-file-is-added,-and-its-subsequent-updates-with-circular-references.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/builds-when-new-file-is-added,-and-its-subsequent-updates-with-circular-references.js @@ -201,18 +201,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"da642d80443e7ccd327091080a82a43c-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n","5aad0de3e7b08bb6e110c7b97361b89e-export declare const World = \"hello\";\n",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -296,13 +329,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/builds-when-new-file-is-added,-and-its-subsequent-updates.js b/testdata/baselines/reference/tsbuildWatch/sample/builds-when-new-file-is-added,-and-its-subsequent-updates.js index 16f7da7a0d..e292b3ce77 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/builds-when-new-file-is-added,-and-its-subsequent-updates.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/builds-when-new-file-is-added,-and-its-subsequent-updates.js @@ -206,18 +206,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -301,13 +334,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/change-builds-changes-and-reports-found-errors-message-with-circular-references.js b/testdata/baselines/reference/tsbuildWatch/sample/change-builds-changes-and-reports-found-errors-message-with-circular-references.js index c3368f7f8f..437f589cf9 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/change-builds-changes-and-reports-found-errors-message-with-circular-references.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/change-builds-changes-and-reports-found-errors-message-with-circular-references.js @@ -201,18 +201,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"da642d80443e7ccd327091080a82a43c-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n","5aad0de3e7b08bb6e110c7b97361b89e-export declare const World = \"hello\";\n",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -296,13 +329,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/change-builds-changes-and-reports-found-errors-message.js b/testdata/baselines/reference/tsbuildWatch/sample/change-builds-changes-and-reports-found-errors-message.js index ef0e973e10..11af883cbe 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/change-builds-changes-and-reports-found-errors-message.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/change-builds-changes-and-reports-found-errors-message.js @@ -206,18 +206,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -301,13 +334,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/incremental-updates-in-verbose-mode.js b/testdata/baselines/reference/tsbuildWatch/sample/incremental-updates-in-verbose-mode.js index 9eb820ff03..3c5b6ae149 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/incremental-updates-in-verbose-mode.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/incremental-updates-in-verbose-mode.js @@ -223,18 +223,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -318,13 +351,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* @@ -480,19 +546,52 @@ Output:: //// [/user/username/projects/sample1/logic/index.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; function someFn() { } //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *modified* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,MAAM,GAAG,EAAC,CAAE"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,SAAS,MAAM,GAAG,EAAC,CAAE"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *modified* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"56bc284b087dd9cc90ffa4704740b86c-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;\nfunction someFn() { }","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* @@ -616,20 +715,53 @@ export declare function someFn(): void; //// [/user/username/projects/sample1/logic/index.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; exports.someFn = someFn; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; function someFn() { } //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *modified* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,kBAAyB,EAAC,CAAE"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,kBAAyB,EAAC,CAAE"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *modified* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"d749596c6d4d5a27ed436fc0d564335c-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;\nexport function someFn() { }","signature":"2e576d48e524436cd9a1f5da08ccc740-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\nexport declare function someFn(): void;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/non-local-change-does-not-start-build-of-referencing-projects-with-circular-references.js b/testdata/baselines/reference/tsbuildWatch/sample/non-local-change-does-not-start-build-of-referencing-projects-with-circular-references.js index 5c7569ea6b..0690e8f202 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/non-local-change-does-not-start-build-of-referencing-projects-with-circular-references.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/non-local-change-does-not-start-build-of-referencing-projects-with-circular-references.js @@ -201,18 +201,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"da642d80443e7ccd327091080a82a43c-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n","5aad0de3e7b08bb6e110c7b97361b89e-export declare const World = \"hello\";\n",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -296,13 +329,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/non-local-change-does-not-start-build-of-referencing-projects.js b/testdata/baselines/reference/tsbuildWatch/sample/non-local-change-does-not-start-build-of-referencing-projects.js index 89d76bca33..03ba286123 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/non-local-change-does-not-start-build-of-referencing-projects.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/non-local-change-does-not-start-build-of-referencing-projects.js @@ -206,18 +206,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -301,13 +334,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-preserveWatchOutput-is-not-used.js b/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-preserveWatchOutput-is-not-used.js index 1597a6769e..52aaf107d3 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-preserveWatchOutput-is-not-used.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-preserveWatchOutput-is-not-used.js @@ -206,18 +206,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -301,13 +334,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* @@ -455,19 +521,52 @@ Output:: //// [/user/username/projects/sample1/logic/index.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; let y = 10; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *modified* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,IAAI,CAAC,GAAW,EAAE,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,IAAI,CAAC,GAAW,EAAE,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *modified* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"3abed61bf6897ffa70a069303f7ee37f-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;\nlet y: string = 10;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"semanticDiagnosticsPerFile":[[4,[{"pos":177,"end":178,"code":2322,"category":1,"message":"Type 'number' is not assignable to type 'string'."}]]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* @@ -734,18 +833,51 @@ Output:: //// [/user/username/projects/sample1/logic/index.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *modified* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *modified* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-preserveWatchOutput-is-passed-on-command-line.js b/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-preserveWatchOutput-is-passed-on-command-line.js index 7f1d0027b3..34661be266 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-preserveWatchOutput-is-passed-on-command-line.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-preserveWatchOutput-is-passed-on-command-line.js @@ -206,18 +206,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -301,13 +334,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* @@ -455,19 +521,52 @@ Output:: //// [/user/username/projects/sample1/logic/index.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; let y = 10; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *modified* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,IAAI,CAAC,GAAW,EAAE,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,IAAI,CAAC,GAAW,EAAE,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *modified* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"3abed61bf6897ffa70a069303f7ee37f-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;\nlet y: string = 10;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"semanticDiagnosticsPerFile":[[4,[{"pos":177,"end":178,"code":2322,"category":1,"message":"Type 'number' is not assignable to type 'string'."}]]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* @@ -734,18 +833,51 @@ Output:: //// [/user/username/projects/sample1/logic/index.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *modified* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *modified* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-stopBuildOnErrors-is-passed-on-command-line.js b/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-stopBuildOnErrors-is-passed-on-command-line.js index bb6fe8e3ae..f39b616388 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-stopBuildOnErrors-is-passed-on-command-line.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/reportErrors-when-stopBuildOnErrors-is-passed-on-command-line.js @@ -206,18 +206,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -301,13 +334,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* @@ -455,19 +521,52 @@ Output:: //// [/user/username/projects/sample1/logic/index.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; let y = 10; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *modified* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,IAAI,CAAC,GAAW,EAAE,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC;AACrB,IAAI,CAAC,GAAW,EAAE,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *modified* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"3abed61bf6897ffa70a069303f7ee37f-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;\nlet y: string = 10;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"semanticDiagnosticsPerFile":[[4,[{"pos":177,"end":178,"code":2322,"category":1,"message":"Type 'number' is not assignable to type 'string'."}]]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *modified* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js b/testdata/baselines/reference/tsbuildWatch/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js index 080b2d9e4e..30362fa24d 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors-when-test-does-not-reference-core.js @@ -388,18 +388,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -483,13 +516,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js b/testdata/baselines/reference/tsbuildWatch/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js index b9b4ba3e5e..508c861c24 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/skips-builds-downstream-projects-if-upstream-projects-have-errors-with-stopBuildOnErrors.js @@ -389,18 +389,51 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* @@ -484,13 +517,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* diff --git a/testdata/baselines/reference/tsbuildWatch/sample/watches-config-files-that-are-not-present.js b/testdata/baselines/reference/tsbuildWatch/sample/watches-config-files-that-are-not-present.js index d33181dc37..0a6a51a5c1 100644 --- a/testdata/baselines/reference/tsbuildWatch/sample/watches-config-files-that-are-not-present.js +++ b/testdata/baselines/reference/tsbuildWatch/sample/watches-config-files-that-are-not-present.js @@ -200,14 +200,47 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/logic/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/index.d.ts] *new* @@ -216,13 +249,46 @@ export declare const m: typeof mod; //// [/user/username/projects/sample1/tests/index.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; -const c = require("../core/index"); -const logic = require("../logic/index"); +const c = __importStar(require("../core/index")); +const logic = __importStar(require("../logic/index")); c.leftPad("", 10); logic.getSecondsInDay(); -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //// [/user/username/projects/sample1/tests/tsconfig.tsbuildinfo] *new* @@ -377,18 +443,51 @@ Output:: //// [/user/username/projects/sample1/logic/index.d.ts] *rewrite with same content* //// [/user/username/projects/sample1/logic/index.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.m = void 0; exports.getSecondsInDay = getSecondsInDay; -const c = require("../core/index"); +const c = __importStar(require("../core/index")); function getSecondsInDay() { return c.multiply(10, 15); } -const mod = require("../core/anotherModule"); +const mod = __importStar(require("../core/anotherModule")); exports.m = mod; //# sourceMappingURL=index.js.map //// [/user/username/projects/sample1/logic/index.js.map] *new* -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;AAAA,MAAY,CAAC,4BAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,oCAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} +{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,MAAY,CAAC,0CAAsB;AACnC,2BAAkC;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAAA,CAC7B;AACD,MAAY,GAAG,kDAA8B;AAChC,QAAA,CAAC,GAAG,GAAG,CAAC"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[4],"fileNames":["lib.d.ts","../core/index.d.ts","../core/anotherModule.d.ts","./index.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},"fc70810d80f598d415c6f21c113a400b-export declare const someString: string;\nexport declare function leftPad(s: string, n: number): string;\nexport declare function multiply(a: number, b: number): number;\n//# sourceMappingURL=index.d.ts.map","5ef600f6f6585506cfe942fc161e76c5-export declare const World = \"hello\";\n//# sourceMappingURL=anotherModule.d.ts.map",{"version":"590556060bc156a64834010df8cda255-import * as c from '../core/index';\nexport function getSecondsInDay() {\n return c.multiply(10, 15);\n}\nimport * as mod from '../core/anotherModule';\nexport const m = mod;","signature":"487f7216384ec40e22ff7dc40c01be4b-export declare function getSecondsInDay(): number;\nimport * as mod from '../core/anotherModule';\nexport declare const m: typeof mod;\n","impliedNodeFormat":1}],"fileIdsList":[[2,3]],"options":{"composite":true,"declaration":true,"skipDefaultLibCheck":true,"sourceMap":true},"referencedMap":[[4,1]],"latestChangedDtsFile":"./index.d.ts"} //// [/user/username/projects/sample1/logic/tsconfig.tsbuildinfo.readable.baseline.txt] *new* diff --git a/testdata/baselines/reference/tsc/commandLine/help-all.js b/testdata/baselines/reference/tsc/commandLine/help-all.js index 7739fc641c..a43fd20900 100644 --- a/testdata/baselines/reference/tsc/commandLine/help-all.js +++ b/testdata/baselines/reference/tsc/commandLine/help-all.js @@ -84,7 +84,7 @@ default: undefined --moduleResolution Specify how TypeScript looks up a file from a given module specifier. one of: node16, nodenext, bundler -default: module === `AMD` or `UMD` or `System` or `ES6`, then `Classic`, Otherwise `Node` +default: `nodenext` if `module` is `nodenext`; `node16` if `module` is `node16` or `node18`; otherwise, `bundler`. --moduleSuffixes List of file name suffixes to search when resolving a module. diff --git a/testdata/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js b/testdata/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js index 14d135d72d..05c6212fe0 100644 --- a/testdata/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js +++ b/testdata/baselines/reference/tsc/incremental/change-to-type-that-gets-used-as-global-through-export-in-another-file-through-indirect-import.js @@ -64,10 +64,13 @@ export { default as ConstantNumber } from "./constants"; //// [/home/src/workspaces/project/reexport.js] *new* "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.ConstantNumber = void 0; const constants_1 = require("./constants"); -Object.defineProperty(exports, "ConstantNumber", { enumerable: true, get: function () { return constants_1.default; } }); +Object.defineProperty(exports, "ConstantNumber", { enumerable: true, get: function () { return __importDefault(constants_1).default; } }); //// [/home/src/workspaces/project/tsconfig.tsbuildinfo] *new* {"version":"FakeTSVersion","root":[[2,5]],"fileNames":["lib.d.ts","./class1.ts","./constants.ts","./reexport.ts","./types.d.ts"],"fileInfos":[{"version":"8859c12c614ce56ba9a18e58384a198f-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ninterface SymbolConstructor {\n (desc?: string | number): symbol;\n for(name: string): symbol;\n readonly toStringTag: symbol;\n}\ndeclare var Symbol: SymbolConstructor;\ninterface Symbol {\n readonly [Symbol.toStringTag]: string;\n}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true,"impliedNodeFormat":1},{"version":"881068d51dfd24d338a5f3706ee1097f-const a: MagicNumber = 1;\nconsole.log(a);","signature":"f59d1a67db5f979e23689dc09b68c628-declare const a = 1;\n","affectsGlobalScope":true,"impliedNodeFormat":1},{"version":"c93bc8f54a24dc311538894cf3d7ac17-export default 1;","signature":"18ae69a2c0b372747b9973ad9c14a1e0-declare const _default: number;\nexport default _default;\n","impliedNodeFormat":1},{"version":"75c0647a66f2f74c4448b4b393e889d1-export { default as ConstantNumber } from \"./constants\"","signature":"3c986fce7f0f21b6b269681962fc7feb-export { default as ConstantNumber } from \"./constants\";\n","impliedNodeFormat":1},{"version":"d84f446b9b1fc3f56545f03793b7992c-type MagicNumber = typeof import('./reexport').ConstantNumber","affectsGlobalScope":true,"impliedNodeFormat":1}],"fileIdsList":[[3],[4]],"options":{"composite":true},"referencedMap":[[4,1],[5,2]],"latestChangedDtsFile":"./reexport.d.ts"} diff --git a/testdata/baselines/reference/tsc/incremental/generates-typerefs-correctly.js b/testdata/baselines/reference/tsc/incremental/generates-typerefs-correctly.js index a8471af0bb..4c07451cdf 100644 --- a/testdata/baselines/reference/tsc/incremental/generates-typerefs-correctly.js +++ b/testdata/baselines/reference/tsc/incremental/generates-typerefs-correctly.js @@ -82,10 +82,43 @@ export declare const bug: W.Wrap<{ //// [/home/src/workspaces/project/outDir/src/bug.js] *new* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.bug = void 0; -const B = require("./box.js"); -const W = require("./wrap.js"); +const B = __importStar(require("./box.js")); +const W = __importStar(require("./wrap.js")); /** * @template {object} C * @param {C} source @@ -249,10 +282,43 @@ export declare const something = 1; //// [/home/src/workspaces/project/outDir/src/bug.js] *modified* "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.something = exports.bug = void 0; -const B = require("./box.js"); -const W = require("./wrap.js"); +const B = __importStar(require("./box.js")); +const W = __importStar(require("./wrap.js")); /** * @template {object} C * @param {C} source diff --git a/testdata/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js b/testdata/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js index 15244da570..01e668625c 100644 --- a/testdata/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js +++ b/testdata/baselines/reference/tsc/moduleResolution/pnpm-style-layout.js @@ -114,7 +114,7 @@ tsgo --traceResolution --explainFiles ExitStatus:: Success Output:: ======== Resolving module '@component-type-checker/sdk' from '/home/src/projects/component-type-checker/packages/app/src/app.tsx'. ======== -Explicitly specified module resolution kind: 'Bundler'. +Module resolution kind is not specified, using 'Bundler'. Resolving in CJS mode with conditions 'import', 'types'. File '/home/src/projects/component-type-checker/packages/app/src/package.json' does not exist. Found 'package.json' at '/home/src/projects/component-type-checker/packages/app/package.json'. @@ -136,7 +136,7 @@ File '/home/src/projects/component-type-checker/packages/app/node_modules/@compo Resolving real path for '/home/src/projects/component-type-checker/packages/app/node_modules/@component-type-checker/sdk/src/index.ts', result '/home/src/projects/component-type-checker/packages/sdk/src/index.ts'. ======== Module name '@component-type-checker/sdk' was successfully resolved to '/home/src/projects/component-type-checker/packages/sdk/src/index.ts' with Package ID '@component-type-checker/sdk1@0.0.2'. ======== ======== Resolving module '@component-type-checker/components' from '/home/src/projects/component-type-checker/packages/app/src/app.tsx'. ======== -Explicitly specified module resolution kind: 'Bundler'. +Module resolution kind is not specified, using 'Bundler'. Resolving in CJS mode with conditions 'import', 'types'. File '/home/src/projects/component-type-checker/packages/app/src/package.json' does not exist according to earlier cached lookups. File '/home/src/projects/component-type-checker/packages/app/package.json' exists according to earlier cached lookups. @@ -161,7 +161,7 @@ Found peerDependency '@component-type-checker/button' with '0.0.2' version. Resolving real path for '/home/src/projects/component-type-checker/packages/app/node_modules/@component-type-checker/components/src/index.ts', result '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.2/node_modules/@component-type-checker/components/src/index.ts'. ======== Module name '@component-type-checker/components' was successfully resolved to '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.2/node_modules/@component-type-checker/components/src/index.ts' with Package ID '@component-type-checker/components@0.0.1+@component-type-checker/button@0.0.2'. ======== ======== Resolving module '@component-type-checker/button' from '/home/src/projects/component-type-checker/packages/app/src/app.tsx'. ======== -Explicitly specified module resolution kind: 'Bundler'. +Module resolution kind is not specified, using 'Bundler'. Resolving in CJS mode with conditions 'import', 'types'. File '/home/src/projects/component-type-checker/packages/app/src/package.json' does not exist according to earlier cached lookups. File '/home/src/projects/component-type-checker/packages/app/package.json' exists according to earlier cached lookups. @@ -183,7 +183,7 @@ File '/home/src/projects/component-type-checker/packages/app/node_modules/@compo Resolving real path for '/home/src/projects/component-type-checker/packages/app/node_modules/@component-type-checker/button/src/index.ts', result '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+button@0.0.2/node_modules/@component-type-checker/button/src/index.ts'. ======== Module name '@component-type-checker/button' was successfully resolved to '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+button@0.0.2/node_modules/@component-type-checker/button/src/index.ts' with Package ID '@component-type-checker/button@0.0.2'. ======== ======== Resolving module '@component-type-checker/components' from '/home/src/projects/component-type-checker/packages/sdk/src/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. +Module resolution kind is not specified, using 'Bundler'. Resolving in CJS mode with conditions 'import', 'types'. File '/home/src/projects/component-type-checker/packages/sdk/src/package.json' does not exist. Found 'package.json' at '/home/src/projects/component-type-checker/packages/sdk/package.json'. @@ -208,7 +208,7 @@ Found peerDependency '@component-type-checker/button' with '0.0.1' version. Resolving real path for '/home/src/projects/component-type-checker/packages/sdk/node_modules/@component-type-checker/components/src/index.ts', result '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.1/node_modules/@component-type-checker/components/src/index.ts'. ======== Module name '@component-type-checker/components' was successfully resolved to '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.1/node_modules/@component-type-checker/components/src/index.ts' with Package ID '@component-type-checker/components@0.0.1+@component-type-checker/button@0.0.1'. ======== ======== Resolving module '@component-type-checker/button' from '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.1/node_modules/@component-type-checker/components/src/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. +Module resolution kind is not specified, using 'Bundler'. Resolving in CJS mode with conditions 'import', 'types'. File '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.1/node_modules/@component-type-checker/components/src/package.json' does not exist. Found 'package.json' at '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.1/node_modules/@component-type-checker/components/package.json'. @@ -236,7 +236,7 @@ File '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-ty Resolving real path for '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.1/node_modules/@component-type-checker/button/src/index.ts', result '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+button@0.0.1/node_modules/@component-type-checker/button/src/index.ts'. ======== Module name '@component-type-checker/button' was successfully resolved to '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+button@0.0.1/node_modules/@component-type-checker/button/src/index.ts' with Package ID '@component-type-checker/button@0.0.1'. ======== ======== Resolving module '@component-type-checker/button' from '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.2/node_modules/@component-type-checker/components/src/index.ts'. ======== -Explicitly specified module resolution kind: 'Bundler'. +Module resolution kind is not specified, using 'Bundler'. Resolving in CJS mode with conditions 'import', 'types'. File '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.2/node_modules/@component-type-checker/components/src/package.json' does not exist. Found 'package.json' at '/home/src/projects/component-type-checker/node_modules/.pnpm/@component-type-checker+components@0.0.1_@component-type-checker+button@0.0.2/node_modules/@component-type-checker/components/package.json'.