From b791fd89cdce0fd1eee7c9d1ee9c6767d2ca4ebe Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Sat, 6 Feb 2016 17:27:32 -0800 Subject: [PATCH 01/12] Changed node_modules and module defaults --- src/compiler/commandLineParser.ts | 16 +++++++++++++++- src/services/services.ts | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 0a4481483c577..dd16afbcea1f6 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -525,7 +525,21 @@ namespace ts { } else { const filesSeen: Map = {}; - const exclude = json["exclude"] instanceof Array ? map(json["exclude"], normalizeSlashes) : undefined; + + let exclude: string[] = []; + if(json["exclude"] instanceof Array){ + exclude = json["exclude"]; + } + else { + // by default exclude node_modules, and any specificied output directory + exclude = ["./node_modules"] + let outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"]; + if(outDir) { + exclude.push(outDir); + } + } + exclude = map(exclude, normalizeSlashes); + const supportedExtensions = getSupportedExtensions(options); Debug.assert(indexOf(supportedExtensions, ".ts") < indexOf(supportedExtensions, ".d.ts"), "Changed priority of extensions to pick"); diff --git a/src/services/services.ts b/src/services/services.ts index b553faad1ab18..7a7670111768f 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1712,7 +1712,7 @@ namespace ts { // Always default to "ScriptTarget.ES5" for the language service return { target: ScriptTarget.ES5, - module: ModuleKind.None, + module: ModuleKind.CommonJS, jsx: JsxEmit.Preserve }; } From 0e5a93b85aa6f6fa2f6d93870fa54c107fc1c566 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Wed, 10 Feb 2016 19:17:54 -0800 Subject: [PATCH 02/12] Changed further defaults to CommonJS --- src/compiler/checker.ts | 2 +- src/compiler/utilities.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 3965665ba19e1..986546772ef96 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -49,7 +49,7 @@ namespace ts { const compilerOptions = host.getCompilerOptions(); const languageVersion = compilerOptions.target || ScriptTarget.ES3; - const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None; + const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS; const allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ModuleKind.System; const emitResolver = createResolver(); diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index d93b37ce1add0..3406f40bf3453 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2013,7 +2013,7 @@ namespace ts { export function getEmitModuleKind(compilerOptions: CompilerOptions) { return compilerOptions.module ? compilerOptions.module : - getEmitScriptTarget(compilerOptions) === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.None; + getEmitScriptTarget(compilerOptions) === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS; } export interface EmitFileNames { From f2e7f9f50f58ebe35d31e04c8f82fb37ae9dbcef Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Wed, 10 Feb 2016 19:56:31 -0800 Subject: [PATCH 03/12] Removed errors for missing module specifier --- src/compiler/commandLineParser.ts | 2 +- src/compiler/diagnosticMessages.json | 10 +--------- src/compiler/program.ts | 9 --------- src/compiler/tsc.ts | 2 +- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index dd16afbcea1f6..029388b5380ee 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -575,8 +575,8 @@ namespace ts { const options: CompilerOptions = {}; const errors: Diagnostic[] = []; + options.module = ModuleKind.CommonJS; if (configFileName && getBaseFileName(configFileName) === "jsconfig.json") { - options.module = ModuleKind.CommonJS; options.allowJs = true; } diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 1a8a53d517c10..447fdd97994d0 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -439,10 +439,6 @@ "category": "Error", "code": 1147 }, - "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.": { - "category": "Error", - "code": 1148 - }, "File name '{0}' differs from already included file name '{1}' only in casing": { "category": "Error", "code": 1149 @@ -2131,10 +2127,6 @@ "category": "Error", "code": 5042 }, - "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.": { - "category": "Error", - "code": 5047 - }, "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.": { "category": "Error", "code": 5051 @@ -2171,7 +2163,7 @@ "category": "Error", "code": 5059 }, - + "Concatenate and emit output to single file.": { "category": "Message", diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 3c75f31add2a4..75de3ed52587a 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1290,21 +1290,12 @@ namespace ts { const firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined); if (options.isolatedModules) { - if (!options.module && languageVersion < ScriptTarget.ES6) { - programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher)); - } - const firstNonExternalModuleSourceFile = forEach(files, f => !isExternalModule(f) && !isDeclarationFile(f) ? f : undefined); if (firstNonExternalModuleSourceFile) { const span = getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile); programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided)); } } - else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && !options.module) { - // We cannot use createDiagnosticFromNode because nodes do not have parents yet - const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); - programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file)); - } // Cannot specify module gen target of es6 when below es6 if (options.module === ModuleKind.ES6 && languageVersion < ScriptTarget.ES6) { diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts index 9b2457d091692..998866c796cbe 100644 --- a/src/compiler/tsc.ts +++ b/src/compiler/tsc.ts @@ -376,7 +376,7 @@ namespace ts { sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); return; } - const configParseResult = parseJsonConfigFileContent(configObject, sys, getDirectoryPath(configFileName), commandLine.options); + const configParseResult = parseJsonConfigFileContent(configObject, sys, getDirectoryPath(configFileName), commandLine.options, configFileName); if (configParseResult.errors.length > 0) { reportDiagnostics(configParseResult.errors, /* compilerHost */ undefined); sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped); From f9fb68fbfcb0d3e6088386b67f69f66502931889 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Wed, 10 Feb 2016 22:08:56 -0800 Subject: [PATCH 04/12] Fixed up baselines --- .../reference/ExportAssignment7.errors.txt | 5 +- .../reference/ExportAssignment8.errors.txt | 5 +- ...hExportedLocalVarsOfTheSameName.errors.txt | 5 +- .../ambientDeclarationsExternal.errors.txt | 28 ---- .../ambientDeclarationsExternal.symbols | 36 ++++++ .../ambientDeclarationsExternal.types | 36 ++++++ .../reference/circularReference.errors.txt | 5 +- .../classAbstractManyKeywords.errors.txt | 5 +- ...berInitializerWithLamdaScoping3.errors.txt | 5 +- ...berInitializerWithLamdaScoping4.errors.txt | 5 +- .../duplicateExportAssignments.errors.txt | 5 +- .../duplicateLocalVariable1.errors.txt | 5 +- ...es5ModuleWithoutModuleGenTarget.errors.txt | 17 --- .../es5ModuleWithoutModuleGenTarget.symbols | 14 ++ .../es5ModuleWithoutModuleGenTarget.types | 15 +++ .../exportAssignDottedName.errors.txt | 14 -- .../reference/exportAssignDottedName.symbols | 16 +++ .../reference/exportAssignDottedName.types | 17 +++ .../exportAssignImportedIdentifier.errors.txt | 18 --- .../exportAssignImportedIdentifier.symbols | 28 ++++ .../exportAssignImportedIdentifier.types | 30 +++++ .../exportAssignNonIdentifier.errors.txt | 5 +- .../reference/exportAssignTypes.errors.txt | 57 -------- .../reference/exportAssignTypes.symbols | 113 ++++++++++++++++ .../reference/exportAssignTypes.types | 122 ++++++++++++++++++ .../reference/exportDeclaredModule.errors.txt | 16 --- .../reference/exportDeclaredModule.symbols | 24 ++++ .../reference/exportDeclaredModule.types | 25 ++++ .../reference/exportNonVisibleType.errors.txt | 39 ------ .../reference/exportNonVisibleType.symbols | 65 ++++++++++ .../reference/exportNonVisibleType.types | 68 ++++++++++ ...ernalModuleWithoutCompilerFlag1.errors.txt | 10 -- ...externalModuleWithoutCompilerFlag1.symbols | 6 + .../externalModuleWithoutCompilerFlag1.types | 6 + .../genericArrayExtenstions.errors.txt | 5 +- ...nalModuleInsideAnInternalModule.errors.txt | 18 --- ...ternalModuleInsideAnInternalModule.symbols | 28 ++++ ...ExternalModuleInsideAnInternalModule.types | 29 +++++ ...eingExternalModuleWithNoResolve.errors.txt | 5 +- .../importDeclWithDeclareModifier.errors.txt | 5 +- ...solatedModulesUnspecifiedModule.errors.txt | 6 - .../isolatedModulesUnspecifiedModule.symbols | 4 + .../isolatedModulesUnspecifiedModule.types | 4 + ...mpilationExportAssignmentSyntax.errors.txt | 5 +- ...CompilationLetDeclarationOrder2.errors.txt | 5 +- .../mergedModuleDeclarationCodeGen.errors.txt | 21 --- .../mergedModuleDeclarationCodeGen.symbols | 30 +++++ .../mergedModuleDeclarationCodeGen.types | 31 +++++ .../reference/moduleScoping.errors.txt | 26 ---- .../baselines/reference/moduleScoping.symbols | 47 +++++++ tests/baselines/reference/moduleScoping.types | 58 +++++++++ .../reference/nonMergedOverloads.errors.txt | 5 +- .../reference/parser0_004152.errors.txt | 5 +- .../reference/parser509546.errors.txt | 10 -- .../baselines/reference/parser509546.symbols | 8 ++ tests/baselines/reference/parser509546.types | 8 ++ .../reference/parser509546_1.errors.txt | 10 -- .../reference/parser509546_1.symbols | 8 ++ .../baselines/reference/parser509546_1.types | 8 ++ .../reference/parser509546_2.errors.txt | 12 -- .../reference/parser509546_2.symbols | 10 ++ .../baselines/reference/parser509546_2.types | 11 ++ .../reference/parser618973.errors.txt | 5 +- .../reference/parserArgumentList1.errors.txt | 5 +- .../reference/parserClass1.errors.txt | 5 +- .../reference/parserClass2.errors.txt | 5 +- .../reference/parserEnum1.errors.txt | 14 -- tests/baselines/reference/parserEnum1.symbols | 18 +++ tests/baselines/reference/parserEnum1.types | 26 ++++ .../reference/parserEnum2.errors.txt | 14 -- tests/baselines/reference/parserEnum2.symbols | 18 +++ tests/baselines/reference/parserEnum2.types | 26 ++++ .../reference/parserEnum3.errors.txt | 10 -- tests/baselines/reference/parserEnum3.symbols | 6 + tests/baselines/reference/parserEnum3.types | 6 + .../reference/parserEnum4.errors.txt | 5 +- .../parserExportAssignment1.errors.txt | 5 +- .../parserExportAssignment2.errors.txt | 5 +- .../parserExportAssignment3.errors.txt | 5 +- .../parserExportAssignment4.errors.txt | 5 +- .../parserExportAssignment7.errors.txt | 5 +- .../parserExportAssignment8.errors.txt | 5 +- .../parserInterfaceDeclaration6.errors.txt | 5 +- .../parserInterfaceDeclaration7.errors.txt | 8 -- .../parserInterfaceDeclaration7.symbols | 4 + .../parserInterfaceDeclaration7.types | 4 + ...rserModifierOnStatementInBlock1.errors.txt | 5 +- ...rserModifierOnStatementInBlock3.errors.txt | 5 +- .../reference/parserModule1.errors.txt | 37 ------ .../baselines/reference/parserModule1.symbols | 69 ++++++++++ tests/baselines/reference/parserModule1.types | 76 +++++++++++ .../relativePathToDeclarationFile.errors.txt | 30 ----- .../relativePathToDeclarationFile.symbols | 55 ++++++++ .../relativePathToDeclarationFile.types | 58 +++++++++ .../reference/reservedWords2.errors.txt | 5 +- .../reference/scannerClass2.errors.txt | 5 +- .../reference/scannerEnum1.errors.txt | 10 -- .../baselines/reference/scannerEnum1.symbols | 10 ++ tests/baselines/reference/scannerEnum1.types | 12 ++ ...InInvalidContextsExternalModule.errors.txt | 7 +- ...tsxStatelessFunctionComponents2.errors.txt | 5 +- .../typeofANonExportedType.errors.txt | 5 +- .../reference/typeofAnExportedType.errors.txt | 5 +- 103 files changed, 1331 insertions(+), 574 deletions(-) delete mode 100644 tests/baselines/reference/ambientDeclarationsExternal.errors.txt create mode 100644 tests/baselines/reference/ambientDeclarationsExternal.symbols create mode 100644 tests/baselines/reference/ambientDeclarationsExternal.types delete mode 100644 tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt create mode 100644 tests/baselines/reference/es5ModuleWithoutModuleGenTarget.symbols create mode 100644 tests/baselines/reference/es5ModuleWithoutModuleGenTarget.types delete mode 100644 tests/baselines/reference/exportAssignDottedName.errors.txt create mode 100644 tests/baselines/reference/exportAssignDottedName.symbols create mode 100644 tests/baselines/reference/exportAssignDottedName.types delete mode 100644 tests/baselines/reference/exportAssignImportedIdentifier.errors.txt create mode 100644 tests/baselines/reference/exportAssignImportedIdentifier.symbols create mode 100644 tests/baselines/reference/exportAssignImportedIdentifier.types delete mode 100644 tests/baselines/reference/exportAssignTypes.errors.txt create mode 100644 tests/baselines/reference/exportAssignTypes.symbols create mode 100644 tests/baselines/reference/exportAssignTypes.types delete mode 100644 tests/baselines/reference/exportDeclaredModule.errors.txt create mode 100644 tests/baselines/reference/exportDeclaredModule.symbols create mode 100644 tests/baselines/reference/exportDeclaredModule.types delete mode 100644 tests/baselines/reference/exportNonVisibleType.errors.txt create mode 100644 tests/baselines/reference/exportNonVisibleType.symbols create mode 100644 tests/baselines/reference/exportNonVisibleType.types delete mode 100644 tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt create mode 100644 tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols create mode 100644 tests/baselines/reference/externalModuleWithoutCompilerFlag1.types delete mode 100644 tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt create mode 100644 tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols create mode 100644 tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types delete mode 100644 tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt create mode 100644 tests/baselines/reference/isolatedModulesUnspecifiedModule.symbols create mode 100644 tests/baselines/reference/isolatedModulesUnspecifiedModule.types delete mode 100644 tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt create mode 100644 tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols create mode 100644 tests/baselines/reference/mergedModuleDeclarationCodeGen.types delete mode 100644 tests/baselines/reference/moduleScoping.errors.txt create mode 100644 tests/baselines/reference/moduleScoping.symbols create mode 100644 tests/baselines/reference/moduleScoping.types delete mode 100644 tests/baselines/reference/parser509546.errors.txt create mode 100644 tests/baselines/reference/parser509546.symbols create mode 100644 tests/baselines/reference/parser509546.types delete mode 100644 tests/baselines/reference/parser509546_1.errors.txt create mode 100644 tests/baselines/reference/parser509546_1.symbols create mode 100644 tests/baselines/reference/parser509546_1.types delete mode 100644 tests/baselines/reference/parser509546_2.errors.txt create mode 100644 tests/baselines/reference/parser509546_2.symbols create mode 100644 tests/baselines/reference/parser509546_2.types delete mode 100644 tests/baselines/reference/parserEnum1.errors.txt create mode 100644 tests/baselines/reference/parserEnum1.symbols create mode 100644 tests/baselines/reference/parserEnum1.types delete mode 100644 tests/baselines/reference/parserEnum2.errors.txt create mode 100644 tests/baselines/reference/parserEnum2.symbols create mode 100644 tests/baselines/reference/parserEnum2.types delete mode 100644 tests/baselines/reference/parserEnum3.errors.txt create mode 100644 tests/baselines/reference/parserEnum3.symbols create mode 100644 tests/baselines/reference/parserEnum3.types delete mode 100644 tests/baselines/reference/parserInterfaceDeclaration7.errors.txt create mode 100644 tests/baselines/reference/parserInterfaceDeclaration7.symbols create mode 100644 tests/baselines/reference/parserInterfaceDeclaration7.types delete mode 100644 tests/baselines/reference/parserModule1.errors.txt create mode 100644 tests/baselines/reference/parserModule1.symbols create mode 100644 tests/baselines/reference/parserModule1.types delete mode 100644 tests/baselines/reference/relativePathToDeclarationFile.errors.txt create mode 100644 tests/baselines/reference/relativePathToDeclarationFile.symbols create mode 100644 tests/baselines/reference/relativePathToDeclarationFile.types delete mode 100644 tests/baselines/reference/scannerEnum1.errors.txt create mode 100644 tests/baselines/reference/scannerEnum1.symbols create mode 100644 tests/baselines/reference/scannerEnum1.types diff --git a/tests/baselines/reference/ExportAssignment7.errors.txt b/tests/baselines/reference/ExportAssignment7.errors.txt index fe461785c6338..6535428e2e4ab 100644 --- a/tests/baselines/reference/ExportAssignment7.errors.txt +++ b/tests/baselines/reference/ExportAssignment7.errors.txt @@ -1,12 +1,9 @@ -tests/cases/compiler/ExportAssignment7.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/ExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements. tests/cases/compiler/ExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'. -==== tests/cases/compiler/ExportAssignment7.ts (3 errors) ==== +==== tests/cases/compiler/ExportAssignment7.ts (2 errors) ==== export class C { - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. } export = B; diff --git a/tests/baselines/reference/ExportAssignment8.errors.txt b/tests/baselines/reference/ExportAssignment8.errors.txt index 22e32c9c7d0f5..e346dcbab11a1 100644 --- a/tests/baselines/reference/ExportAssignment8.errors.txt +++ b/tests/baselines/reference/ExportAssignment8.errors.txt @@ -1,13 +1,10 @@ -tests/cases/compiler/ExportAssignment8.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/ExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements. tests/cases/compiler/ExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'. -==== tests/cases/compiler/ExportAssignment8.ts (3 errors) ==== +==== tests/cases/compiler/ExportAssignment8.ts (2 errors) ==== export = B; ~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - ~~~~~~~~~~~ !!! error TS2309: An export assignment cannot be used in a module with other exported elements. ~ !!! error TS2304: Cannot find name 'B'. diff --git a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt index e46805a6a2fa4..fd048a987a485 100644 --- a/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt +++ b/tests/baselines/reference/TwoInternalModulesThatMergeEachWithExportedLocalVarsOfTheSameName.errors.txt @@ -1,13 +1,10 @@ -tests/cases/conformance/internalModules/DeclarationMerging/part1.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(3,24): error TS2304: Cannot find name 'Point'. tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,36): error TS2304: Cannot find name 'Point'. tests/cases/conformance/internalModules/DeclarationMerging/part2.ts(7,54): error TS2304: Cannot find name 'Point'. -==== tests/cases/conformance/internalModules/DeclarationMerging/part1.ts (1 errors) ==== +==== tests/cases/conformance/internalModules/DeclarationMerging/part1.ts (0 errors) ==== export module A { - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. export interface Point { x: number; y: number; diff --git a/tests/baselines/reference/ambientDeclarationsExternal.errors.txt b/tests/baselines/reference/ambientDeclarationsExternal.errors.txt deleted file mode 100644 index 2a9b1fe48790c..0000000000000 --- a/tests/baselines/reference/ambientDeclarationsExternal.errors.txt +++ /dev/null @@ -1,28 +0,0 @@ -tests/cases/conformance/ambient/consumer.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/ambient/consumer.ts (1 errors) ==== - /// - import imp1 = require('equ'); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - - // Ambient external module members are always exported with or without export keyword when module lacks export assignment - import imp3 = require('equ2'); - var n = imp3.x; - var n: number; - -==== tests/cases/conformance/ambient/decls.ts (0 errors) ==== - - // Ambient external module with export assignment - declare module 'equ' { - var x; - export = x; - } - - declare module 'equ2' { - var x: number; - } - - // Ambient external import declaration referencing ambient external module using top level module name \ No newline at end of file diff --git a/tests/baselines/reference/ambientDeclarationsExternal.symbols b/tests/baselines/reference/ambientDeclarationsExternal.symbols new file mode 100644 index 0000000000000..f160751a19bc6 --- /dev/null +++ b/tests/baselines/reference/ambientDeclarationsExternal.symbols @@ -0,0 +1,36 @@ +=== tests/cases/conformance/ambient/consumer.ts === +/// +import imp1 = require('equ'); +>imp1 : Symbol(imp1, Decl(consumer.ts, 0, 0)) + + +// Ambient external module members are always exported with or without export keyword when module lacks export assignment +import imp3 = require('equ2'); +>imp3 : Symbol(imp3, Decl(consumer.ts, 1, 29)) + +var n = imp3.x; +>n : Symbol(n, Decl(consumer.ts, 6, 3), Decl(consumer.ts, 7, 3)) +>imp3.x : Symbol(imp3.x, Decl(decls.ts, 8, 7)) +>imp3 : Symbol(imp3, Decl(consumer.ts, 1, 29)) +>x : Symbol(imp3.x, Decl(decls.ts, 8, 7)) + +var n: number; +>n : Symbol(n, Decl(consumer.ts, 6, 3), Decl(consumer.ts, 7, 3)) + +=== tests/cases/conformance/ambient/decls.ts === + +// Ambient external module with export assignment +declare module 'equ' { + var x; +>x : Symbol(x, Decl(decls.ts, 3, 7)) + + export = x; +>x : Symbol(x, Decl(decls.ts, 3, 7)) +} + +declare module 'equ2' { + var x: number; +>x : Symbol(x, Decl(decls.ts, 8, 7)) +} + +// Ambient external import declaration referencing ambient external module using top level module name diff --git a/tests/baselines/reference/ambientDeclarationsExternal.types b/tests/baselines/reference/ambientDeclarationsExternal.types new file mode 100644 index 0000000000000..062e006cf0a97 --- /dev/null +++ b/tests/baselines/reference/ambientDeclarationsExternal.types @@ -0,0 +1,36 @@ +=== tests/cases/conformance/ambient/consumer.ts === +/// +import imp1 = require('equ'); +>imp1 : any + + +// Ambient external module members are always exported with or without export keyword when module lacks export assignment +import imp3 = require('equ2'); +>imp3 : typeof imp3 + +var n = imp3.x; +>n : number +>imp3.x : number +>imp3 : typeof imp3 +>x : number + +var n: number; +>n : number + +=== tests/cases/conformance/ambient/decls.ts === + +// Ambient external module with export assignment +declare module 'equ' { + var x; +>x : any + + export = x; +>x : any +} + +declare module 'equ2' { + var x: number; +>x : number +} + +// Ambient external import declaration referencing ambient external module using top level module name diff --git a/tests/baselines/reference/circularReference.errors.txt b/tests/baselines/reference/circularReference.errors.txt index 9954944ff1fc6..8f99c93be1e40 100644 --- a/tests/baselines/reference/circularReference.errors.txt +++ b/tests/baselines/reference/circularReference.errors.txt @@ -1,4 +1,3 @@ -tests/cases/conformance/externalModules/foo1.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/externalModules/foo1.ts(9,12): error TS2339: Property 'x' does not exist on type 'C1'. tests/cases/conformance/externalModules/foo2.ts(8,12): error TS2339: Property 'y' does not exist on type 'C1'. tests/cases/conformance/externalModules/foo2.ts(13,8): error TS2339: Property 'x' does not exist on type 'C1'. @@ -26,10 +25,8 @@ tests/cases/conformance/externalModules/foo2.ts(13,8): error TS2339: Property 'x } } -==== tests/cases/conformance/externalModules/foo1.ts (2 errors) ==== +==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== import foo2 = require('./foo2'); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. export module M1 { export class C1 { m1: foo2.M1.C1; diff --git a/tests/baselines/reference/classAbstractManyKeywords.errors.txt b/tests/baselines/reference/classAbstractManyKeywords.errors.txt index eec5ac4bc0ddd..8f9e3fed18eb0 100644 --- a/tests/baselines/reference/classAbstractManyKeywords.errors.txt +++ b/tests/baselines/reference/classAbstractManyKeywords.errors.txt @@ -1,13 +1,10 @@ -tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(1,25): error TS1005: ';' expected. tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(3,1): error TS1128: Declaration or statement expected. tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts(4,17): error TS1005: '=' expected. -==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts (4 errors) ==== +==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractManyKeywords.ts (3 errors) ==== export default abstract class A {} - ~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~~~ !!! error TS1005: ';' expected. export abstract class B {} diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt index b016952a3aafc..6af97590fa807 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping3.errors.txt @@ -1,17 +1,14 @@ -tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(4,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2301: Initializer of instance member variable 'messageHandler' cannot reference identifier 'field1' declared in the constructor. ==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (0 errors) ==== var field1: string; -==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (2 errors) ==== +==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (1 errors) ==== declare var console: { log(msg?: any): void; }; export class Test1 { - ~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. constructor(private field1: string) { } messageHandler = () => { diff --git a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt index 73fa862e82bf0..58a660c1ee859 100644 --- a/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt +++ b/tests/baselines/reference/classMemberInitializerWithLamdaScoping4.errors.txt @@ -1,11 +1,8 @@ -tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts(8,21): error TS2304: Cannot find name 'field1'. -==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (1 errors) ==== +==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_0.ts (0 errors) ==== export var field1: string; - ~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ==== tests/cases/compiler/classMemberInitializerWithLamdaScoping3_1.ts (1 errors) ==== declare var console: { diff --git a/tests/baselines/reference/duplicateExportAssignments.errors.txt b/tests/baselines/reference/duplicateExportAssignments.errors.txt index a76513133b944..17ad0a398479f 100644 --- a/tests/baselines/reference/duplicateExportAssignments.errors.txt +++ b/tests/baselines/reference/duplicateExportAssignments.errors.txt @@ -1,4 +1,3 @@ -tests/cases/conformance/externalModules/foo1.ts(3,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/externalModules/foo1.ts(3,1): error TS2300: Duplicate identifier 'export='. tests/cases/conformance/externalModules/foo1.ts(4,1): error TS2300: Duplicate identifier 'export='. tests/cases/conformance/externalModules/foo2.ts(3,1): error TS2300: Duplicate identifier 'export='. @@ -12,13 +11,11 @@ tests/cases/conformance/externalModules/foo5.ts(5,1): error TS2300: Duplicate id tests/cases/conformance/externalModules/foo5.ts(6,1): error TS2300: Duplicate identifier 'export='. -==== tests/cases/conformance/externalModules/foo1.ts (3 errors) ==== +==== tests/cases/conformance/externalModules/foo1.ts (2 errors) ==== var x = 10; var y = 20; export = x; ~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - ~~~~~~~~~~~ !!! error TS2300: Duplicate identifier 'export='. export = y; ~~~~~~~~~~~ diff --git a/tests/baselines/reference/duplicateLocalVariable1.errors.txt b/tests/baselines/reference/duplicateLocalVariable1.errors.txt index 90c5974cd2b6a..b264574ea0983 100644 --- a/tests/baselines/reference/duplicateLocalVariable1.errors.txt +++ b/tests/baselines/reference/duplicateLocalVariable1.errors.txt @@ -1,13 +1,12 @@ tests/cases/compiler/duplicateLocalVariable1.ts(2,4): error TS1005: ';' expected. tests/cases/compiler/duplicateLocalVariable1.ts(2,11): error TS1146: Declaration expected. tests/cases/compiler/duplicateLocalVariable1.ts(2,13): error TS2304: Cannot find name 'commonjs'. -tests/cases/compiler/duplicateLocalVariable1.ts(12,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/duplicateLocalVariable1.ts(187,22): error TS2403: Subsequent variable declarations must have the same type. Variable 'i' must be of type 'string', but here has type 'number'. tests/cases/compiler/duplicateLocalVariable1.ts(187,29): error TS2365: Operator '<' cannot be applied to types 'string' and 'number'. tests/cases/compiler/duplicateLocalVariable1.ts(187,37): error TS2356: An arithmetic operand must be of type 'any', 'number' or an enum type. -==== tests/cases/compiler/duplicateLocalVariable1.ts (7 errors) ==== +==== tests/cases/compiler/duplicateLocalVariable1.ts (6 errors) ==== / /@module: commonjs ~ @@ -26,8 +25,6 @@ tests/cases/compiler/duplicateLocalVariable1.ts(187,37): error TS2356: An arithm var TestFileDir = ".\\TempTestFiles"; export class TestCase { - ~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. constructor (public name: string, public test: ()=>boolean, public errorMessageRegEx?: string) { } } diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt deleted file mode 100644 index 90f10087194db..0000000000000 --- a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.errors.txt +++ /dev/null @@ -1,17 +0,0 @@ -tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts (1 errors) ==== - export class A - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - { - constructor () - { - } - - public B() - { - return 42; - } - } \ No newline at end of file diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.symbols b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.symbols new file mode 100644 index 0000000000000..d39ced975249b --- /dev/null +++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.symbols @@ -0,0 +1,14 @@ +=== tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts === +export class A +>A : Symbol(A, Decl(es5ModuleWithoutModuleGenTarget.ts, 0, 0)) +{ + constructor () + { + } + + public B() +>B : Symbol(B, Decl(es5ModuleWithoutModuleGenTarget.ts, 4, 5)) + { + return 42; + } +} diff --git a/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.types b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.types new file mode 100644 index 0000000000000..251e2be25a976 --- /dev/null +++ b/tests/baselines/reference/es5ModuleWithoutModuleGenTarget.types @@ -0,0 +1,15 @@ +=== tests/cases/compiler/es5ModuleWithoutModuleGenTarget.ts === +export class A +>A : A +{ + constructor () + { + } + + public B() +>B : () => number + { + return 42; +>42 : number + } +} diff --git a/tests/baselines/reference/exportAssignDottedName.errors.txt b/tests/baselines/reference/exportAssignDottedName.errors.txt deleted file mode 100644 index 3ed4f3c888f22..0000000000000 --- a/tests/baselines/reference/exportAssignDottedName.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ==== - import foo1 = require('./foo1'); - export = foo1.x; // Ok - -==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== - export function x(){ - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - return true; - } - \ No newline at end of file diff --git a/tests/baselines/reference/exportAssignDottedName.symbols b/tests/baselines/reference/exportAssignDottedName.symbols new file mode 100644 index 0000000000000..b7503380452ac --- /dev/null +++ b/tests/baselines/reference/exportAssignDottedName.symbols @@ -0,0 +1,16 @@ +=== tests/cases/conformance/externalModules/foo2.ts === +import foo1 = require('./foo1'); +>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) + +export = foo1.x; // Ok +>foo1.x : Symbol(foo1.x, Decl(foo1.ts, 0, 0)) +>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) +>x : Symbol(foo1.x, Decl(foo1.ts, 0, 0)) + +=== tests/cases/conformance/externalModules/foo1.ts === +export function x(){ +>x : Symbol(x, Decl(foo1.ts, 0, 0)) + + return true; +} + diff --git a/tests/baselines/reference/exportAssignDottedName.types b/tests/baselines/reference/exportAssignDottedName.types new file mode 100644 index 0000000000000..6fceb21231cba --- /dev/null +++ b/tests/baselines/reference/exportAssignDottedName.types @@ -0,0 +1,17 @@ +=== tests/cases/conformance/externalModules/foo2.ts === +import foo1 = require('./foo1'); +>foo1 : typeof foo1 + +export = foo1.x; // Ok +>foo1.x : () => boolean +>foo1 : typeof foo1 +>x : () => boolean + +=== tests/cases/conformance/externalModules/foo1.ts === +export function x(){ +>x : () => boolean + + return true; +>true : boolean +} + diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt b/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt deleted file mode 100644 index 167c0baca3d34..0000000000000 --- a/tests/baselines/reference/exportAssignImportedIdentifier.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -tests/cases/conformance/externalModules/foo1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/externalModules/foo3.ts (0 errors) ==== - import foo2 = require('./foo2'); - var x = foo2(); // should be boolean -==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== - export function x(){ - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - return true; - } - -==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ==== - import foo1 = require('./foo1'); - var x = foo1.x; - export = x; - \ No newline at end of file diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.symbols b/tests/baselines/reference/exportAssignImportedIdentifier.symbols new file mode 100644 index 0000000000000..8089e49825088 --- /dev/null +++ b/tests/baselines/reference/exportAssignImportedIdentifier.symbols @@ -0,0 +1,28 @@ +=== tests/cases/conformance/externalModules/foo3.ts === +import foo2 = require('./foo2'); +>foo2 : Symbol(foo2, Decl(foo3.ts, 0, 0)) + +var x = foo2(); // should be boolean +>x : Symbol(x, Decl(foo3.ts, 1, 3)) +>foo2 : Symbol(foo2, Decl(foo3.ts, 0, 0)) + +=== tests/cases/conformance/externalModules/foo1.ts === +export function x(){ +>x : Symbol(x, Decl(foo1.ts, 0, 0)) + + return true; +} + +=== tests/cases/conformance/externalModules/foo2.ts === +import foo1 = require('./foo1'); +>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) + +var x = foo1.x; +>x : Symbol(x, Decl(foo2.ts, 1, 3)) +>foo1.x : Symbol(foo1.x, Decl(foo1.ts, 0, 0)) +>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) +>x : Symbol(foo1.x, Decl(foo1.ts, 0, 0)) + +export = x; +>x : Symbol(x, Decl(foo2.ts, 1, 3)) + diff --git a/tests/baselines/reference/exportAssignImportedIdentifier.types b/tests/baselines/reference/exportAssignImportedIdentifier.types new file mode 100644 index 0000000000000..e70de6936241c --- /dev/null +++ b/tests/baselines/reference/exportAssignImportedIdentifier.types @@ -0,0 +1,30 @@ +=== tests/cases/conformance/externalModules/foo3.ts === +import foo2 = require('./foo2'); +>foo2 : () => boolean + +var x = foo2(); // should be boolean +>x : boolean +>foo2() : boolean +>foo2 : () => boolean + +=== tests/cases/conformance/externalModules/foo1.ts === +export function x(){ +>x : () => boolean + + return true; +>true : boolean +} + +=== tests/cases/conformance/externalModules/foo2.ts === +import foo1 = require('./foo1'); +>foo1 : typeof foo1 + +var x = foo1.x; +>x : () => boolean +>foo1.x : () => boolean +>foo1 : typeof foo1 +>x : () => boolean + +export = x; +>x : () => boolean + diff --git a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt index 9e8bfa8d74793..df227ff6c0bde 100644 --- a/tests/baselines/reference/exportAssignNonIdentifier.errors.txt +++ b/tests/baselines/reference/exportAssignNonIdentifier.errors.txt @@ -1,12 +1,9 @@ -tests/cases/conformance/externalModules/foo1.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/externalModules/foo6.ts(1,14): error TS1109: Expression expected. -==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== +==== tests/cases/conformance/externalModules/foo1.ts (0 errors) ==== var x = 10; export = typeof x; // Ok - ~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ==== export = "sausages"; // Ok diff --git a/tests/baselines/reference/exportAssignTypes.errors.txt b/tests/baselines/reference/exportAssignTypes.errors.txt deleted file mode 100644 index 9d39f48fec89f..0000000000000 --- a/tests/baselines/reference/exportAssignTypes.errors.txt +++ /dev/null @@ -1,57 +0,0 @@ -tests/cases/conformance/externalModules/expString.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/externalModules/consumer.ts (0 errors) ==== - import iString = require('./expString'); - var v1: string = iString; - - import iNumber = require('./expNumber'); - var v2: number = iNumber; - - import iBoolean = require('./expBoolean'); - var v3: boolean = iBoolean; - - import iArray = require('./expArray'); - var v4: Array = iArray; - - import iObject = require('./expObject'); - var v5: Object = iObject; - - import iAny = require('./expAny'); - var v6 = iAny; - - import iGeneric = require('./expGeneric'); - var v7: {(p1: x): x} = iGeneric; - -==== tests/cases/conformance/externalModules/expString.ts (1 errors) ==== - var x = "test"; - export = x; - ~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - -==== tests/cases/conformance/externalModules/expNumber.ts (0 errors) ==== - var x = 42; - export = x; - -==== tests/cases/conformance/externalModules/expBoolean.ts (0 errors) ==== - var x = true; - export = x; - -==== tests/cases/conformance/externalModules/expArray.ts (0 errors) ==== - var x = [1,2]; - export = x; - -==== tests/cases/conformance/externalModules/expObject.ts (0 errors) ==== - var x = { answer: 42, when: 1776}; - export = x; - -==== tests/cases/conformance/externalModules/expAny.ts (0 errors) ==== - var x; - export = x; - -==== tests/cases/conformance/externalModules/expGeneric.ts (0 errors) ==== - function x(a: T){ - return a; - } - export = x; - \ No newline at end of file diff --git a/tests/baselines/reference/exportAssignTypes.symbols b/tests/baselines/reference/exportAssignTypes.symbols new file mode 100644 index 0000000000000..4936d7388fed5 --- /dev/null +++ b/tests/baselines/reference/exportAssignTypes.symbols @@ -0,0 +1,113 @@ +=== tests/cases/conformance/externalModules/consumer.ts === +import iString = require('./expString'); +>iString : Symbol(iString, Decl(consumer.ts, 0, 0)) + +var v1: string = iString; +>v1 : Symbol(v1, Decl(consumer.ts, 1, 3)) +>iString : Symbol(iString, Decl(consumer.ts, 0, 0)) + +import iNumber = require('./expNumber'); +>iNumber : Symbol(iNumber, Decl(consumer.ts, 1, 25)) + +var v2: number = iNumber; +>v2 : Symbol(v2, Decl(consumer.ts, 4, 3)) +>iNumber : Symbol(iNumber, Decl(consumer.ts, 1, 25)) + +import iBoolean = require('./expBoolean'); +>iBoolean : Symbol(iBoolean, Decl(consumer.ts, 4, 25)) + +var v3: boolean = iBoolean; +>v3 : Symbol(v3, Decl(consumer.ts, 7, 3)) +>iBoolean : Symbol(iBoolean, Decl(consumer.ts, 4, 25)) + +import iArray = require('./expArray'); +>iArray : Symbol(iArray, Decl(consumer.ts, 7, 27)) + +var v4: Array = iArray; +>v4 : Symbol(v4, Decl(consumer.ts, 10, 3)) +>Array : Symbol(Array, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>iArray : Symbol(iArray, Decl(consumer.ts, 7, 27)) + +import iObject = require('./expObject'); +>iObject : Symbol(iObject, Decl(consumer.ts, 10, 31)) + +var v5: Object = iObject; +>v5 : Symbol(v5, Decl(consumer.ts, 13, 3)) +>Object : Symbol(Object, Decl(lib.d.ts, --, --), Decl(lib.d.ts, --, --)) +>iObject : Symbol(iObject, Decl(consumer.ts, 10, 31)) + +import iAny = require('./expAny'); +>iAny : Symbol(iAny, Decl(consumer.ts, 13, 25)) + +var v6 = iAny; +>v6 : Symbol(v6, Decl(consumer.ts, 16, 3)) +>iAny : Symbol(iAny, Decl(consumer.ts, 13, 25)) + +import iGeneric = require('./expGeneric'); +>iGeneric : Symbol(iGeneric, Decl(consumer.ts, 16, 14)) + +var v7: {(p1: x): x} = iGeneric; +>v7 : Symbol(v7, Decl(consumer.ts, 19, 3)) +>x : Symbol(x, Decl(consumer.ts, 19, 10)) +>p1 : Symbol(p1, Decl(consumer.ts, 19, 13)) +>x : Symbol(x, Decl(consumer.ts, 19, 10)) +>x : Symbol(x, Decl(consumer.ts, 19, 10)) +>iGeneric : Symbol(iGeneric, Decl(consumer.ts, 16, 14)) + +=== tests/cases/conformance/externalModules/expString.ts === +var x = "test"; +>x : Symbol(x, Decl(expString.ts, 0, 3)) + +export = x; +>x : Symbol(x, Decl(expString.ts, 0, 3)) + +=== tests/cases/conformance/externalModules/expNumber.ts === +var x = 42; +>x : Symbol(x, Decl(expNumber.ts, 0, 3)) + +export = x; +>x : Symbol(x, Decl(expNumber.ts, 0, 3)) + +=== tests/cases/conformance/externalModules/expBoolean.ts === +var x = true; +>x : Symbol(x, Decl(expBoolean.ts, 0, 3)) + +export = x; +>x : Symbol(x, Decl(expBoolean.ts, 0, 3)) + +=== tests/cases/conformance/externalModules/expArray.ts === +var x = [1,2]; +>x : Symbol(x, Decl(expArray.ts, 0, 3)) + +export = x; +>x : Symbol(x, Decl(expArray.ts, 0, 3)) + +=== tests/cases/conformance/externalModules/expObject.ts === +var x = { answer: 42, when: 1776}; +>x : Symbol(x, Decl(expObject.ts, 0, 3)) +>answer : Symbol(answer, Decl(expObject.ts, 0, 9)) +>when : Symbol(when, Decl(expObject.ts, 0, 21)) + +export = x; +>x : Symbol(x, Decl(expObject.ts, 0, 3)) + +=== tests/cases/conformance/externalModules/expAny.ts === +var x; +>x : Symbol(x, Decl(expAny.ts, 0, 3)) + +export = x; +>x : Symbol(x, Decl(expAny.ts, 0, 3)) + +=== tests/cases/conformance/externalModules/expGeneric.ts === +function x(a: T){ +>x : Symbol(x, Decl(expGeneric.ts, 0, 0)) +>T : Symbol(T, Decl(expGeneric.ts, 0, 11)) +>a : Symbol(a, Decl(expGeneric.ts, 0, 14)) +>T : Symbol(T, Decl(expGeneric.ts, 0, 11)) + + return a; +>a : Symbol(a, Decl(expGeneric.ts, 0, 14)) +} +export = x; +>x : Symbol(x, Decl(expGeneric.ts, 0, 0)) + diff --git a/tests/baselines/reference/exportAssignTypes.types b/tests/baselines/reference/exportAssignTypes.types new file mode 100644 index 0000000000000..dc99d1512f1b3 --- /dev/null +++ b/tests/baselines/reference/exportAssignTypes.types @@ -0,0 +1,122 @@ +=== tests/cases/conformance/externalModules/consumer.ts === +import iString = require('./expString'); +>iString : string + +var v1: string = iString; +>v1 : string +>iString : string + +import iNumber = require('./expNumber'); +>iNumber : number + +var v2: number = iNumber; +>v2 : number +>iNumber : number + +import iBoolean = require('./expBoolean'); +>iBoolean : boolean + +var v3: boolean = iBoolean; +>v3 : boolean +>iBoolean : boolean + +import iArray = require('./expArray'); +>iArray : number[] + +var v4: Array = iArray; +>v4 : number[] +>Array : T[] +>iArray : number[] + +import iObject = require('./expObject'); +>iObject : { answer: number; when: number; } + +var v5: Object = iObject; +>v5 : Object +>Object : Object +>iObject : { answer: number; when: number; } + +import iAny = require('./expAny'); +>iAny : any + +var v6 = iAny; +>v6 : any +>iAny : any + +import iGeneric = require('./expGeneric'); +>iGeneric : (a: T) => T + +var v7: {(p1: x): x} = iGeneric; +>v7 : (p1: x) => x +>x : x +>p1 : x +>x : x +>x : x +>iGeneric : (a: T) => T + +=== tests/cases/conformance/externalModules/expString.ts === +var x = "test"; +>x : string +>"test" : string + +export = x; +>x : string + +=== tests/cases/conformance/externalModules/expNumber.ts === +var x = 42; +>x : number +>42 : number + +export = x; +>x : number + +=== tests/cases/conformance/externalModules/expBoolean.ts === +var x = true; +>x : boolean +>true : boolean + +export = x; +>x : boolean + +=== tests/cases/conformance/externalModules/expArray.ts === +var x = [1,2]; +>x : number[] +>[1,2] : number[] +>1 : number +>2 : number + +export = x; +>x : number[] + +=== tests/cases/conformance/externalModules/expObject.ts === +var x = { answer: 42, when: 1776}; +>x : { answer: number; when: number; } +>{ answer: 42, when: 1776} : { answer: number; when: number; } +>answer : number +>42 : number +>when : number +>1776 : number + +export = x; +>x : { answer: number; when: number; } + +=== tests/cases/conformance/externalModules/expAny.ts === +var x; +>x : any + +export = x; +>x : any + +=== tests/cases/conformance/externalModules/expGeneric.ts === +function x(a: T){ +>x : (a: T) => T +>T : T +>a : T +>T : T + + return a; +>a : T +} +export = x; +>x : (a: T) => T + diff --git a/tests/baselines/reference/exportDeclaredModule.errors.txt b/tests/baselines/reference/exportDeclaredModule.errors.txt deleted file mode 100644 index c235d4c448f3c..0000000000000 --- a/tests/baselines/reference/exportDeclaredModule.errors.txt +++ /dev/null @@ -1,16 +0,0 @@ -tests/cases/conformance/externalModules/foo1.ts(6,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ==== - import foo1 = require('./foo1'); - var x: number = foo1.b(); -==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== - - declare module M1 { - export var a: string; - export function b(): number; - } - export = M1; - ~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - \ No newline at end of file diff --git a/tests/baselines/reference/exportDeclaredModule.symbols b/tests/baselines/reference/exportDeclaredModule.symbols new file mode 100644 index 0000000000000..a5259f795d9fd --- /dev/null +++ b/tests/baselines/reference/exportDeclaredModule.symbols @@ -0,0 +1,24 @@ +=== tests/cases/conformance/externalModules/foo2.ts === +import foo1 = require('./foo1'); +>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) + +var x: number = foo1.b(); +>x : Symbol(x, Decl(foo2.ts, 1, 3)) +>foo1.b : Symbol(foo1.b, Decl(foo1.ts, 2, 22)) +>foo1 : Symbol(foo1, Decl(foo2.ts, 0, 0)) +>b : Symbol(foo1.b, Decl(foo1.ts, 2, 22)) + +=== tests/cases/conformance/externalModules/foo1.ts === + +declare module M1 { +>M1 : Symbol(M1, Decl(foo1.ts, 0, 0)) + + export var a: string; +>a : Symbol(a, Decl(foo1.ts, 2, 11)) + + export function b(): number; +>b : Symbol(b, Decl(foo1.ts, 2, 22)) +} +export = M1; +>M1 : Symbol(M1, Decl(foo1.ts, 0, 0)) + diff --git a/tests/baselines/reference/exportDeclaredModule.types b/tests/baselines/reference/exportDeclaredModule.types new file mode 100644 index 0000000000000..00bb50ffa09fb --- /dev/null +++ b/tests/baselines/reference/exportDeclaredModule.types @@ -0,0 +1,25 @@ +=== tests/cases/conformance/externalModules/foo2.ts === +import foo1 = require('./foo1'); +>foo1 : typeof foo1 + +var x: number = foo1.b(); +>x : number +>foo1.b() : number +>foo1.b : () => number +>foo1 : typeof foo1 +>b : () => number + +=== tests/cases/conformance/externalModules/foo1.ts === + +declare module M1 { +>M1 : typeof M1 + + export var a: string; +>a : string + + export function b(): number; +>b : () => number +} +export = M1; +>M1 : typeof M1 + diff --git a/tests/baselines/reference/exportNonVisibleType.errors.txt b/tests/baselines/reference/exportNonVisibleType.errors.txt deleted file mode 100644 index bc4dac4ca58fe..0000000000000 --- a/tests/baselines/reference/exportNonVisibleType.errors.txt +++ /dev/null @@ -1,39 +0,0 @@ -tests/cases/conformance/externalModules/foo1.ts(7,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/externalModules/foo1.ts (1 errors) ==== - interface I1 { - a: string; - b: number; - } - - var x: I1 = {a: "test", b: 42}; - export = x; // Should fail, I1 not exported. - ~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/externalModules/foo2.ts (0 errors) ==== - interface I1 { - a: string; - b: number; - } - - class C1 { - m1: I1; - } - - export = C1; // Should fail, type I1 of visible member C1.m1 not exported. - -==== tests/cases/conformance/externalModules/foo3.ts (0 errors) ==== - interface I1 { - a: string; - b: number; - } - - class C1 { - private m1: I1; - } - - export = C1; // Should work, private type I1 of visible class C1 only used in private member m1. - \ No newline at end of file diff --git a/tests/baselines/reference/exportNonVisibleType.symbols b/tests/baselines/reference/exportNonVisibleType.symbols new file mode 100644 index 0000000000000..35526a8db8ce3 --- /dev/null +++ b/tests/baselines/reference/exportNonVisibleType.symbols @@ -0,0 +1,65 @@ +=== tests/cases/conformance/externalModules/foo1.ts === +interface I1 { +>I1 : Symbol(I1, Decl(foo1.ts, 0, 0)) + + a: string; +>a : Symbol(a, Decl(foo1.ts, 0, 14)) + + b: number; +>b : Symbol(b, Decl(foo1.ts, 1, 11)) +} + +var x: I1 = {a: "test", b: 42}; +>x : Symbol(x, Decl(foo1.ts, 5, 3)) +>I1 : Symbol(I1, Decl(foo1.ts, 0, 0)) +>a : Symbol(a, Decl(foo1.ts, 5, 13)) +>b : Symbol(b, Decl(foo1.ts, 5, 23)) + +export = x; // Should fail, I1 not exported. +>x : Symbol(x, Decl(foo1.ts, 5, 3)) + + +=== tests/cases/conformance/externalModules/foo2.ts === +interface I1 { +>I1 : Symbol(I1, Decl(foo2.ts, 0, 0)) + + a: string; +>a : Symbol(a, Decl(foo2.ts, 0, 14)) + + b: number; +>b : Symbol(b, Decl(foo2.ts, 1, 11)) +} + +class C1 { +>C1 : Symbol(C1, Decl(foo2.ts, 3, 1)) + + m1: I1; +>m1 : Symbol(m1, Decl(foo2.ts, 5, 10)) +>I1 : Symbol(I1, Decl(foo2.ts, 0, 0)) +} + +export = C1; // Should fail, type I1 of visible member C1.m1 not exported. +>C1 : Symbol(C1, Decl(foo2.ts, 3, 1)) + +=== tests/cases/conformance/externalModules/foo3.ts === +interface I1 { +>I1 : Symbol(I1, Decl(foo3.ts, 0, 0)) + + a: string; +>a : Symbol(a, Decl(foo3.ts, 0, 14)) + + b: number; +>b : Symbol(b, Decl(foo3.ts, 1, 11)) +} + +class C1 { +>C1 : Symbol(C1, Decl(foo3.ts, 3, 1)) + + private m1: I1; +>m1 : Symbol(m1, Decl(foo3.ts, 5, 10)) +>I1 : Symbol(I1, Decl(foo3.ts, 0, 0)) +} + +export = C1; // Should work, private type I1 of visible class C1 only used in private member m1. +>C1 : Symbol(C1, Decl(foo3.ts, 3, 1)) + diff --git a/tests/baselines/reference/exportNonVisibleType.types b/tests/baselines/reference/exportNonVisibleType.types new file mode 100644 index 0000000000000..2ad420ac531c9 --- /dev/null +++ b/tests/baselines/reference/exportNonVisibleType.types @@ -0,0 +1,68 @@ +=== tests/cases/conformance/externalModules/foo1.ts === +interface I1 { +>I1 : I1 + + a: string; +>a : string + + b: number; +>b : number +} + +var x: I1 = {a: "test", b: 42}; +>x : I1 +>I1 : I1 +>{a: "test", b: 42} : { a: string; b: number; } +>a : string +>"test" : string +>b : number +>42 : number + +export = x; // Should fail, I1 not exported. +>x : I1 + + +=== tests/cases/conformance/externalModules/foo2.ts === +interface I1 { +>I1 : I1 + + a: string; +>a : string + + b: number; +>b : number +} + +class C1 { +>C1 : C1 + + m1: I1; +>m1 : I1 +>I1 : I1 +} + +export = C1; // Should fail, type I1 of visible member C1.m1 not exported. +>C1 : C1 + +=== tests/cases/conformance/externalModules/foo3.ts === +interface I1 { +>I1 : I1 + + a: string; +>a : string + + b: number; +>b : number +} + +class C1 { +>C1 : C1 + + private m1: I1; +>m1 : I1 +>I1 : I1 +} + +export = C1; // Should work, private type I1 of visible class C1 only used in private member m1. +>C1 : C1 + diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt deleted file mode 100644 index e2ffd4ec372cc..0000000000000 --- a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts (1 errors) ==== - - // Not on line 0 because we want to verify the error is placed in the appropriate location. - export module M { - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - } \ No newline at end of file diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols new file mode 100644 index 0000000000000..21426e15e5d07 --- /dev/null +++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.symbols @@ -0,0 +1,6 @@ +=== tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts === + +// Not on line 0 because we want to verify the error is placed in the appropriate location. + export module M { +>M : Symbol(M, Decl(externalModuleWithoutCompilerFlag1.ts, 0, 0)) +} diff --git a/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types new file mode 100644 index 0000000000000..26d360d63a9b3 --- /dev/null +++ b/tests/baselines/reference/externalModuleWithoutCompilerFlag1.types @@ -0,0 +1,6 @@ +=== tests/cases/compiler/externalModuleWithoutCompilerFlag1.ts === + +// Not on line 0 because we want to verify the error is placed in the appropriate location. + export module M { +>M : any +} diff --git a/tests/baselines/reference/genericArrayExtenstions.errors.txt b/tests/baselines/reference/genericArrayExtenstions.errors.txt index 7b332366fed4f..ac0b40728498d 100644 --- a/tests/baselines/reference/genericArrayExtenstions.errors.txt +++ b/tests/baselines/reference/genericArrayExtenstions.errors.txt @@ -1,13 +1,10 @@ -tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/genericArrayExtenstions.ts(1,22): error TS2420: Class 'ObservableArray' incorrectly implements interface 'T[]'. Property 'length' is missing in type 'ObservableArray'. -==== tests/cases/compiler/genericArrayExtenstions.ts (2 errors) ==== +==== tests/cases/compiler/genericArrayExtenstions.ts (1 errors) ==== export declare class ObservableArray implements Array { // MS.Entertainment.ObservableArray ~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - ~~~~~~~~~~~~~~~ !!! error TS2420: Class 'ObservableArray' incorrectly implements interface 'T[]'. !!! error TS2420: Property 'length' is missing in type 'ObservableArray'. concat(...items: U[]): T[]; diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt deleted file mode 100644 index 56d1549f85339..0000000000000 --- a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.errors.txt +++ /dev/null @@ -1,18 +0,0 @@ -tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts (0 errors) ==== - import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0'); - module m_private { - //import r2 = require('m'); // would be error - export import C = r; // no error - C.m.foo(); - } - -==== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts (1 errors) ==== - export module m { - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - export function foo() { } - } - \ No newline at end of file diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols new file mode 100644 index 0000000000000..e16057cf11ae5 --- /dev/null +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.symbols @@ -0,0 +1,28 @@ +=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts === +import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0'); +>r : Symbol(r, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 0)) + +module m_private { +>m_private : Symbol(m_private, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 0, 78)) + + //import r2 = require('m'); // would be error + export import C = r; // no error +>C : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 1, 18)) +>r : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0)) + + C.m.foo(); +>C.m.foo : Symbol(C.m.foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17)) +>C.m : Symbol(C.m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0)) +>C : Symbol(C, Decl(importAliasAnExternalModuleInsideAnInternalModule_file1.ts, 1, 18)) +>m : Symbol(C.m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0)) +>foo : Symbol(C.m.foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17)) +} + +=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts === +export module m { +>m : Symbol(m, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 0)) + + export function foo() { } +>foo : Symbol(foo, Decl(importAliasAnExternalModuleInsideAnInternalModule_file0.ts, 0, 17)) +} + diff --git a/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types new file mode 100644 index 0000000000000..3293b3139e43a --- /dev/null +++ b/tests/baselines/reference/importAliasAnExternalModuleInsideAnInternalModule.types @@ -0,0 +1,29 @@ +=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file1.ts === +import r = require('importAliasAnExternalModuleInsideAnInternalModule_file0'); +>r : typeof r + +module m_private { +>m_private : typeof m_private + + //import r2 = require('m'); // would be error + export import C = r; // no error +>C : typeof C +>r : typeof C + + C.m.foo(); +>C.m.foo() : void +>C.m.foo : () => void +>C.m : typeof C.m +>C : typeof C +>m : typeof C.m +>foo : () => void +} + +=== tests/cases/compiler/importAliasAnExternalModuleInsideAnInternalModule_file0.ts === +export module m { +>m : typeof m + + export function foo() { } +>foo : () => void +} + diff --git a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt index 5d70b32aa1664..4bfe02c0467c6 100644 --- a/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt +++ b/tests/baselines/reference/importDeclRefereingExternalModuleWithNoResolve.errors.txt @@ -1,13 +1,10 @@ -tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(1,20): error TS2307: Cannot find module 'externalModule'. tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(2,16): error TS2664: Invalid module name in augmentation, module 'm1' cannot be found. tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts(3,26): error TS2307: Cannot find module 'externalModule'. -==== tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts (4 errors) ==== +==== tests/cases/compiler/importDeclRefereingExternalModuleWithNoResolve.ts (3 errors) ==== import b = require("externalModule"); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~~~~~~~~~~~~~~ !!! error TS2307: Cannot find module 'externalModule'. declare module "m1" { diff --git a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt index 9e3d012aeb6b5..cad498a84092a 100644 --- a/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt +++ b/tests/baselines/reference/importDeclWithDeclareModifier.errors.txt @@ -1,16 +1,13 @@ -tests/cases/compiler/importDeclWithDeclareModifier.ts(5,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/importDeclWithDeclareModifier.ts(5,9): error TS1029: 'export' modifier must precede 'declare' modifier. tests/cases/compiler/importDeclWithDeclareModifier.ts(5,29): error TS2305: Module 'x' has no exported member 'c'. -==== tests/cases/compiler/importDeclWithDeclareModifier.ts (3 errors) ==== +==== tests/cases/compiler/importDeclWithDeclareModifier.ts (2 errors) ==== module x { interface c { } } declare export import a = x.c; - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~~~~ !!! error TS1029: 'export' modifier must precede 'declare' modifier. ~ diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt b/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt deleted file mode 100644 index fbb2f0041d603..0000000000000 --- a/tests/baselines/reference/isolatedModulesUnspecifiedModule.errors.txt +++ /dev/null @@ -1,6 +0,0 @@ -error TS5047: Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher. - - -!!! error TS5047: Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher. -==== tests/cases/compiler/file1.ts (0 errors) ==== - export var x; \ No newline at end of file diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.symbols b/tests/baselines/reference/isolatedModulesUnspecifiedModule.symbols new file mode 100644 index 0000000000000..625dbfbe699b8 --- /dev/null +++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.symbols @@ -0,0 +1,4 @@ +=== tests/cases/compiler/file1.ts === +export var x; +>x : Symbol(x, Decl(file1.ts, 0, 10)) + diff --git a/tests/baselines/reference/isolatedModulesUnspecifiedModule.types b/tests/baselines/reference/isolatedModulesUnspecifiedModule.types new file mode 100644 index 0000000000000..27dca700bb904 --- /dev/null +++ b/tests/baselines/reference/isolatedModulesUnspecifiedModule.types @@ -0,0 +1,4 @@ +=== tests/cases/compiler/file1.ts === +export var x; +>x : any + diff --git a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt index 7e67c6325e01d..f537941c55cf1 100644 --- a/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt +++ b/tests/baselines/reference/jsFileCompilationExportAssignmentSyntax.errors.txt @@ -1,12 +1,9 @@ error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. -tests/cases/compiler/a.js(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/a.js(1,1): error TS8003: 'export=' can only be used in a .ts file. !!! error TS5055: Cannot write file 'tests/cases/compiler/a.js' because it would overwrite input file. -==== tests/cases/compiler/a.js (2 errors) ==== +==== tests/cases/compiler/a.js (1 errors) ==== export = b; ~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - ~~~~~~~~~~~ !!! error TS8003: 'export=' can only be used in a .ts file. \ No newline at end of file diff --git a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt index b88c73e043918..21390cc295530 100644 --- a/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt +++ b/tests/baselines/reference/jsFileCompilationLetDeclarationOrder2.errors.txt @@ -1,13 +1,10 @@ error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. -tests/cases/compiler/a.ts(2,1): error TS2448: Block-scoped variable 'a' used before its declaration. !!! error TS5053: Option 'allowJs' cannot be specified with option 'declaration'. -==== tests/cases/compiler/a.ts (1 errors) ==== +==== tests/cases/compiler/a.ts (0 errors) ==== let b = 30; a = 10; - ~ -!!! error TS2448: Block-scoped variable 'a' used before its declaration. ==== tests/cases/compiler/b.js (0 errors) ==== let a = 10; b = 30; diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt b/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt deleted file mode 100644 index a39c1c4d91ab8..0000000000000 --- a/tests/baselines/reference/mergedModuleDeclarationCodeGen.errors.txt +++ /dev/null @@ -1,21 +0,0 @@ -tests/cases/compiler/mergedModuleDeclarationCodeGen.ts(1,15): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/compiler/mergedModuleDeclarationCodeGen.ts (1 errors) ==== - export module X { - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - export module Y { - class A { - constructor(Y: any) { - new B(); - } - } - } - } - export module X { - export module Y { - export class B { - } - } - } \ No newline at end of file diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols b/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols new file mode 100644 index 0000000000000..21ec69df7dfd7 --- /dev/null +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.symbols @@ -0,0 +1,30 @@ +=== tests/cases/compiler/mergedModuleDeclarationCodeGen.ts === +export module X { +>X : Symbol(X, Decl(mergedModuleDeclarationCodeGen.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen.ts, 8, 1)) + + export module Y { +>Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 0, 17), Decl(mergedModuleDeclarationCodeGen.ts, 9, 17)) + + class A { +>A : Symbol(A, Decl(mergedModuleDeclarationCodeGen.ts, 1, 21)) + + constructor(Y: any) { +>Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 3, 24)) + + new B(); +>B : Symbol(B, Decl(mergedModuleDeclarationCodeGen.ts, 10, 21)) + } + } + } +} +export module X { +>X : Symbol(X, Decl(mergedModuleDeclarationCodeGen.ts, 0, 0), Decl(mergedModuleDeclarationCodeGen.ts, 8, 1)) + + export module Y { +>Y : Symbol(Y, Decl(mergedModuleDeclarationCodeGen.ts, 0, 17), Decl(mergedModuleDeclarationCodeGen.ts, 9, 17)) + + export class B { +>B : Symbol(B, Decl(mergedModuleDeclarationCodeGen.ts, 10, 21)) + } + } +} diff --git a/tests/baselines/reference/mergedModuleDeclarationCodeGen.types b/tests/baselines/reference/mergedModuleDeclarationCodeGen.types new file mode 100644 index 0000000000000..8d25025032369 --- /dev/null +++ b/tests/baselines/reference/mergedModuleDeclarationCodeGen.types @@ -0,0 +1,31 @@ +=== tests/cases/compiler/mergedModuleDeclarationCodeGen.ts === +export module X { +>X : typeof X + + export module Y { +>Y : typeof Y + + class A { +>A : A + + constructor(Y: any) { +>Y : any + + new B(); +>new B() : B +>B : typeof B + } + } + } +} +export module X { +>X : typeof X + + export module Y { +>Y : typeof Y + + export class B { +>B : B + } + } +} diff --git a/tests/baselines/reference/moduleScoping.errors.txt b/tests/baselines/reference/moduleScoping.errors.txt deleted file mode 100644 index 961715f2e710d..0000000000000 --- a/tests/baselines/reference/moduleScoping.errors.txt +++ /dev/null @@ -1,26 +0,0 @@ -tests/cases/conformance/externalModules/file3.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/externalModules/file1.ts (0 errors) ==== - var v1 = "sausages"; // Global scope - -==== tests/cases/conformance/externalModules/file2.ts (0 errors) ==== - var v2 = 42; // Global scope - var v4 = () => 5; - -==== tests/cases/conformance/externalModules/file3.ts (1 errors) ==== - export var v3 = true; - ~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - var v2 = [1,2,3]; // Module scope. Should not appear in global scope - -==== tests/cases/conformance/externalModules/file4.ts (0 errors) ==== - import file3 = require('./file3'); - var t1 = v1; - var t2 = v2; - var t3 = file3.v3; - var v4 = {a: true, b: NaN}; // Should shadow global v2 in this module - -==== tests/cases/conformance/externalModules/file5.ts (0 errors) ==== - var x = v2; // Should be global v2 of type number again - \ No newline at end of file diff --git a/tests/baselines/reference/moduleScoping.symbols b/tests/baselines/reference/moduleScoping.symbols new file mode 100644 index 0000000000000..7a63e8a60fcab --- /dev/null +++ b/tests/baselines/reference/moduleScoping.symbols @@ -0,0 +1,47 @@ +=== tests/cases/conformance/externalModules/file1.ts === +var v1 = "sausages"; // Global scope +>v1 : Symbol(v1, Decl(file1.ts, 0, 3)) + +=== tests/cases/conformance/externalModules/file2.ts === +var v2 = 42; // Global scope +>v2 : Symbol(v2, Decl(file2.ts, 0, 3)) + +var v4 = () => 5; +>v4 : Symbol(v4, Decl(file2.ts, 1, 3)) + +=== tests/cases/conformance/externalModules/file3.ts === +export var v3 = true; +>v3 : Symbol(v3, Decl(file3.ts, 0, 10)) + +var v2 = [1,2,3]; // Module scope. Should not appear in global scope +>v2 : Symbol(v2, Decl(file3.ts, 1, 3)) + +=== tests/cases/conformance/externalModules/file4.ts === +import file3 = require('./file3'); +>file3 : Symbol(file3, Decl(file4.ts, 0, 0)) + +var t1 = v1; +>t1 : Symbol(t1, Decl(file4.ts, 1, 3)) +>v1 : Symbol(v1, Decl(file1.ts, 0, 3)) + +var t2 = v2; +>t2 : Symbol(t2, Decl(file4.ts, 2, 3)) +>v2 : Symbol(v2, Decl(file2.ts, 0, 3)) + +var t3 = file3.v3; +>t3 : Symbol(t3, Decl(file4.ts, 3, 3)) +>file3.v3 : Symbol(file3.v3, Decl(file3.ts, 0, 10)) +>file3 : Symbol(file3, Decl(file4.ts, 0, 0)) +>v3 : Symbol(file3.v3, Decl(file3.ts, 0, 10)) + +var v4 = {a: true, b: NaN}; // Should shadow global v2 in this module +>v4 : Symbol(v4, Decl(file4.ts, 4, 3)) +>a : Symbol(a, Decl(file4.ts, 4, 10)) +>b : Symbol(b, Decl(file4.ts, 4, 18)) +>NaN : Symbol(NaN, Decl(lib.d.ts, --, --)) + +=== tests/cases/conformance/externalModules/file5.ts === +var x = v2; // Should be global v2 of type number again +>x : Symbol(x, Decl(file5.ts, 0, 3)) +>v2 : Symbol(v2, Decl(file2.ts, 0, 3)) + diff --git a/tests/baselines/reference/moduleScoping.types b/tests/baselines/reference/moduleScoping.types new file mode 100644 index 0000000000000..b2ee83dc69bbf --- /dev/null +++ b/tests/baselines/reference/moduleScoping.types @@ -0,0 +1,58 @@ +=== tests/cases/conformance/externalModules/file1.ts === +var v1 = "sausages"; // Global scope +>v1 : string +>"sausages" : string + +=== tests/cases/conformance/externalModules/file2.ts === +var v2 = 42; // Global scope +>v2 : number +>42 : number + +var v4 = () => 5; +>v4 : () => number +>() => 5 : () => number +>5 : number + +=== tests/cases/conformance/externalModules/file3.ts === +export var v3 = true; +>v3 : boolean +>true : boolean + +var v2 = [1,2,3]; // Module scope. Should not appear in global scope +>v2 : number[] +>[1,2,3] : number[] +>1 : number +>2 : number +>3 : number + +=== tests/cases/conformance/externalModules/file4.ts === +import file3 = require('./file3'); +>file3 : typeof file3 + +var t1 = v1; +>t1 : string +>v1 : string + +var t2 = v2; +>t2 : number +>v2 : number + +var t3 = file3.v3; +>t3 : boolean +>file3.v3 : boolean +>file3 : typeof file3 +>v3 : boolean + +var v4 = {a: true, b: NaN}; // Should shadow global v2 in this module +>v4 : { a: boolean; b: number; } +>{a: true, b: NaN} : { a: boolean; b: number; } +>a : boolean +>true : boolean +>b : number +>NaN : number + +=== tests/cases/conformance/externalModules/file5.ts === +var x = v2; // Should be global v2 of type number again +>x : number +>v2 : number + diff --git a/tests/baselines/reference/nonMergedOverloads.errors.txt b/tests/baselines/reference/nonMergedOverloads.errors.txt index f5fb58247da92..b21a471ea8c20 100644 --- a/tests/baselines/reference/nonMergedOverloads.errors.txt +++ b/tests/baselines/reference/nonMergedOverloads.errors.txt @@ -1,18 +1,15 @@ tests/cases/compiler/nonMergedOverloads.ts(1,5): error TS2300: Duplicate identifier 'f'. -tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/nonMergedOverloads.ts(3,17): error TS2300: Duplicate identifier 'f'. tests/cases/compiler/nonMergedOverloads.ts(4,17): error TS2300: Duplicate identifier 'f'. -==== tests/cases/compiler/nonMergedOverloads.ts (4 errors) ==== +==== tests/cases/compiler/nonMergedOverloads.ts (3 errors) ==== var f = 10; ~ !!! error TS2300: Duplicate identifier 'f'. export function f(); ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - ~ !!! error TS2300: Duplicate identifier 'f'. export function f() { ~ diff --git a/tests/baselines/reference/parser0_004152.errors.txt b/tests/baselines/reference/parser0_004152.errors.txt index 85c450ef39fe6..dfff2ea1a0968 100644 --- a/tests/baselines/reference/parser0_004152.errors.txt +++ b/tests/baselines/reference/parser0_004152.errors.txt @@ -1,4 +1,3 @@ -tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,28): error TS2304: Cannot find name 'DisplayPosition'. tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,45): error TS1137: Expression or comma expected. tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,46): error TS1005: ';' expected. @@ -35,10 +34,8 @@ tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(2,97): error T tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts(3,25): error TS2304: Cannot find name 'SeedCoords'. -==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (35 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/Fuzz/parser0_004152.ts (34 errors) ==== export class Game { - ~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. private position = new DisplayPosition([), 3, 3, 3, 3, 3, 0, 3, 3, 3, 3, 3, 3, 0], NoMove, 0); ~~~~~~~~~~~~~~~ !!! error TS2304: Cannot find name 'DisplayPosition'. diff --git a/tests/baselines/reference/parser509546.errors.txt b/tests/baselines/reference/parser509546.errors.txt deleted file mode 100644 index 65e524cb0e7d3..0000000000000 --- a/tests/baselines/reference/parser509546.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts (1 errors) ==== - export class Logger { - ~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - public - } - \ No newline at end of file diff --git a/tests/baselines/reference/parser509546.symbols b/tests/baselines/reference/parser509546.symbols new file mode 100644 index 0000000000000..1b4e44312e597 --- /dev/null +++ b/tests/baselines/reference/parser509546.symbols @@ -0,0 +1,8 @@ +=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts === +export class Logger { +>Logger : Symbol(Logger, Decl(parser509546.ts, 0, 0)) + + public +>public : Symbol(public, Decl(parser509546.ts, 0, 21)) +} + diff --git a/tests/baselines/reference/parser509546.types b/tests/baselines/reference/parser509546.types new file mode 100644 index 0000000000000..250b249c04532 --- /dev/null +++ b/tests/baselines/reference/parser509546.types @@ -0,0 +1,8 @@ +=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546.ts === +export class Logger { +>Logger : Logger + + public +>public : any +} + diff --git a/tests/baselines/reference/parser509546_1.errors.txt b/tests/baselines/reference/parser509546_1.errors.txt deleted file mode 100644 index 1098adc1463a5..0000000000000 --- a/tests/baselines/reference/parser509546_1.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts (1 errors) ==== - export class Logger { - ~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - public - } - \ No newline at end of file diff --git a/tests/baselines/reference/parser509546_1.symbols b/tests/baselines/reference/parser509546_1.symbols new file mode 100644 index 0000000000000..730b1813cdd21 --- /dev/null +++ b/tests/baselines/reference/parser509546_1.symbols @@ -0,0 +1,8 @@ +=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts === +export class Logger { +>Logger : Symbol(Logger, Decl(parser509546_1.ts, 0, 0)) + + public +>public : Symbol(public, Decl(parser509546_1.ts, 0, 21)) +} + diff --git a/tests/baselines/reference/parser509546_1.types b/tests/baselines/reference/parser509546_1.types new file mode 100644 index 0000000000000..8392297ec27a4 --- /dev/null +++ b/tests/baselines/reference/parser509546_1.types @@ -0,0 +1,8 @@ +=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_1.ts === +export class Logger { +>Logger : Logger + + public +>public : any +} + diff --git a/tests/baselines/reference/parser509546_2.errors.txt b/tests/baselines/reference/parser509546_2.errors.txt deleted file mode 100644 index ad551887dda7a..0000000000000 --- a/tests/baselines/reference/parser509546_2.errors.txt +++ /dev/null @@ -1,12 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts(3,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts (1 errors) ==== - "use strict"; - - export class Logger { - ~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - public - } - \ No newline at end of file diff --git a/tests/baselines/reference/parser509546_2.symbols b/tests/baselines/reference/parser509546_2.symbols new file mode 100644 index 0000000000000..83872a7e82f90 --- /dev/null +++ b/tests/baselines/reference/parser509546_2.symbols @@ -0,0 +1,10 @@ +=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts === +"use strict"; + +export class Logger { +>Logger : Symbol(Logger, Decl(parser509546_2.ts, 0, 13)) + + public +>public : Symbol(public, Decl(parser509546_2.ts, 2, 21)) +} + diff --git a/tests/baselines/reference/parser509546_2.types b/tests/baselines/reference/parser509546_2.types new file mode 100644 index 0000000000000..211553286a54d --- /dev/null +++ b/tests/baselines/reference/parser509546_2.types @@ -0,0 +1,11 @@ +=== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser509546_2.ts === +"use strict"; +>"use strict" : string + +export class Logger { +>Logger : Logger + + public +>public : any +} + diff --git a/tests/baselines/reference/parser618973.errors.txt b/tests/baselines/reference/parser618973.errors.txt index b76aa15c858c7..5c67c9066b627 100644 --- a/tests/baselines/reference/parser618973.errors.txt +++ b/tests/baselines/reference/parser618973.errors.txt @@ -1,13 +1,10 @@ tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts(1,8): error TS1030: 'export' modifier already seen. -tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts(1,21): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. -==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/RegressionTests/parser618973.ts (1 errors) ==== export export class Foo { ~~~~~~ !!! error TS1030: 'export' modifier already seen. - ~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. public Bar() { } } \ No newline at end of file diff --git a/tests/baselines/reference/parserArgumentList1.errors.txt b/tests/baselines/reference/parserArgumentList1.errors.txt index 01575cec0c449..f01dfb531f00b 100644 --- a/tests/baselines/reference/parserArgumentList1.errors.txt +++ b/tests/baselines/reference/parserArgumentList1.errors.txt @@ -1,12 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(1,35): error TS2304: Cannot find name 'HTMLElement'. tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts(2,42): error TS2304: Cannot find name '_classNameRegexp'. -==== tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts (3 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/parserArgumentList1.ts (2 errors) ==== export function removeClass (node:HTMLElement, className:string) { - ~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~~~~~~~~~ !!! error TS2304: Cannot find name 'HTMLElement'. node.className = node.className.replace(_classNameRegexp(className), function (everything, leftDelimiter, name, rightDelimiter) { diff --git a/tests/baselines/reference/parserClass1.errors.txt b/tests/baselines/reference/parserClass1.errors.txt index 03ec87f66a63c..dd9e39b40752f 100644 --- a/tests/baselines/reference/parserClass1.errors.txt +++ b/tests/baselines/reference/parserClass1.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts(1,18): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts(1,40): error TS2304: Cannot find name 'ILogger'. -==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass1.ts (1 errors) ==== export class NullLogger implements ILogger { - ~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~~~~~ !!! error TS2304: Cannot find name 'ILogger'. public information(): boolean { return false; } diff --git a/tests/baselines/reference/parserClass2.errors.txt b/tests/baselines/reference/parserClass2.errors.txt index ee67b262fe538..6bd60fc84d7f7 100644 --- a/tests/baselines/reference/parserClass2.errors.txt +++ b/tests/baselines/reference/parserClass2.errors.txt @@ -1,15 +1,12 @@ -tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(3,18): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(3,43): error TS2304: Cannot find name 'ILogger'. tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(4,37): error TS2304: Cannot find name 'ILogger'. tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts(5,18): error TS2339: Property '_information' does not exist on type 'LoggerAdapter'. -==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts (4 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ClassDeclarations/parserClass2.ts (3 errors) ==== export class LoggerAdapter implements ILogger { - ~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~~~~~ !!! error TS2304: Cannot find name 'ILogger'. constructor (public logger: ILogger) { diff --git a/tests/baselines/reference/parserEnum1.errors.txt b/tests/baselines/reference/parserEnum1.errors.txt deleted file mode 100644 index dd8cd23fe2cd1..0000000000000 --- a/tests/baselines/reference/parserEnum1.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts (1 errors) ==== - - - export enum SignatureFlags { - ~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - None = 0, - IsIndexer = 1, - IsStringIndexer = 1 << 1, - IsNumberIndexer = 1 << 2, - } \ No newline at end of file diff --git a/tests/baselines/reference/parserEnum1.symbols b/tests/baselines/reference/parserEnum1.symbols new file mode 100644 index 0000000000000..ec9a3d8aa2160 --- /dev/null +++ b/tests/baselines/reference/parserEnum1.symbols @@ -0,0 +1,18 @@ +=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts === + + + export enum SignatureFlags { +>SignatureFlags : Symbol(SignatureFlags, Decl(parserEnum1.ts, 0, 0)) + + None = 0, +>None : Symbol(SignatureFlags.None, Decl(parserEnum1.ts, 2, 32)) + + IsIndexer = 1, +>IsIndexer : Symbol(SignatureFlags.IsIndexer, Decl(parserEnum1.ts, 3, 17)) + + IsStringIndexer = 1 << 1, +>IsStringIndexer : Symbol(SignatureFlags.IsStringIndexer, Decl(parserEnum1.ts, 4, 22)) + + IsNumberIndexer = 1 << 2, +>IsNumberIndexer : Symbol(SignatureFlags.IsNumberIndexer, Decl(parserEnum1.ts, 5, 33)) + } diff --git a/tests/baselines/reference/parserEnum1.types b/tests/baselines/reference/parserEnum1.types new file mode 100644 index 0000000000000..34d11a1858d5c --- /dev/null +++ b/tests/baselines/reference/parserEnum1.types @@ -0,0 +1,26 @@ +=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum1.ts === + + + export enum SignatureFlags { +>SignatureFlags : SignatureFlags + + None = 0, +>None : SignatureFlags +>0 : number + + IsIndexer = 1, +>IsIndexer : SignatureFlags +>1 : number + + IsStringIndexer = 1 << 1, +>IsStringIndexer : SignatureFlags +>1 << 1 : number +>1 : number +>1 : number + + IsNumberIndexer = 1 << 2, +>IsNumberIndexer : SignatureFlags +>1 << 2 : number +>1 : number +>2 : number + } diff --git a/tests/baselines/reference/parserEnum2.errors.txt b/tests/baselines/reference/parserEnum2.errors.txt deleted file mode 100644 index 242b624ad8839..0000000000000 --- a/tests/baselines/reference/parserEnum2.errors.txt +++ /dev/null @@ -1,14 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts (1 errors) ==== - - - export enum SignatureFlags { - ~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - None = 0, - IsIndexer = 1, - IsStringIndexer = 1 << 1, - IsNumberIndexer = 1 << 2 - } \ No newline at end of file diff --git a/tests/baselines/reference/parserEnum2.symbols b/tests/baselines/reference/parserEnum2.symbols new file mode 100644 index 0000000000000..dc745ca726ee8 --- /dev/null +++ b/tests/baselines/reference/parserEnum2.symbols @@ -0,0 +1,18 @@ +=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts === + + + export enum SignatureFlags { +>SignatureFlags : Symbol(SignatureFlags, Decl(parserEnum2.ts, 0, 0)) + + None = 0, +>None : Symbol(SignatureFlags.None, Decl(parserEnum2.ts, 2, 32)) + + IsIndexer = 1, +>IsIndexer : Symbol(SignatureFlags.IsIndexer, Decl(parserEnum2.ts, 3, 17)) + + IsStringIndexer = 1 << 1, +>IsStringIndexer : Symbol(SignatureFlags.IsStringIndexer, Decl(parserEnum2.ts, 4, 22)) + + IsNumberIndexer = 1 << 2 +>IsNumberIndexer : Symbol(SignatureFlags.IsNumberIndexer, Decl(parserEnum2.ts, 5, 33)) + } diff --git a/tests/baselines/reference/parserEnum2.types b/tests/baselines/reference/parserEnum2.types new file mode 100644 index 0000000000000..6d119d8f07934 --- /dev/null +++ b/tests/baselines/reference/parserEnum2.types @@ -0,0 +1,26 @@ +=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum2.ts === + + + export enum SignatureFlags { +>SignatureFlags : SignatureFlags + + None = 0, +>None : SignatureFlags +>0 : number + + IsIndexer = 1, +>IsIndexer : SignatureFlags +>1 : number + + IsStringIndexer = 1 << 1, +>IsStringIndexer : SignatureFlags +>1 << 1 : number +>1 : number +>1 : number + + IsNumberIndexer = 1 << 2 +>IsNumberIndexer : SignatureFlags +>1 << 2 : number +>1 : number +>2 : number + } diff --git a/tests/baselines/reference/parserEnum3.errors.txt b/tests/baselines/reference/parserEnum3.errors.txt deleted file mode 100644 index e0b3691dbdea2..0000000000000 --- a/tests/baselines/reference/parserEnum3.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts (1 errors) ==== - - - export enum SignatureFlags { - ~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - } \ No newline at end of file diff --git a/tests/baselines/reference/parserEnum3.symbols b/tests/baselines/reference/parserEnum3.symbols new file mode 100644 index 0000000000000..01e55693335db --- /dev/null +++ b/tests/baselines/reference/parserEnum3.symbols @@ -0,0 +1,6 @@ +=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts === + + + export enum SignatureFlags { +>SignatureFlags : Symbol(SignatureFlags, Decl(parserEnum3.ts, 0, 0)) + } diff --git a/tests/baselines/reference/parserEnum3.types b/tests/baselines/reference/parserEnum3.types new file mode 100644 index 0000000000000..21527136b32e2 --- /dev/null +++ b/tests/baselines/reference/parserEnum3.types @@ -0,0 +1,6 @@ +=== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum3.ts === + + + export enum SignatureFlags { +>SignatureFlags : SignatureFlags + } diff --git a/tests/baselines/reference/parserEnum4.errors.txt b/tests/baselines/reference/parserEnum4.errors.txt index 9329b484c92dd..d9a57b21daae5 100644 --- a/tests/baselines/reference/parserEnum4.errors.txt +++ b/tests/baselines/reference/parserEnum4.errors.txt @@ -1,13 +1,10 @@ -tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts(3,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts(4,9): error TS1132: Enum member expected. -==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/EnumDeclarations/parserEnum4.ts (1 errors) ==== export enum SignatureFlags { - ~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. , ~ !!! error TS1132: Enum member expected. diff --git a/tests/baselines/reference/parserExportAssignment1.errors.txt b/tests/baselines/reference/parserExportAssignment1.errors.txt index cb989f655cee2..41a428f6da219 100644 --- a/tests/baselines/reference/parserExportAssignment1.errors.txt +++ b/tests/baselines/reference/parserExportAssignment1.errors.txt @@ -1,10 +1,7 @@ -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts(1,10): error TS2304: Cannot find name 'foo'. -==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment1.ts (1 errors) ==== export = foo - ~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~ !!! error TS2304: Cannot find name 'foo'. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment2.errors.txt b/tests/baselines/reference/parserExportAssignment2.errors.txt index 7e7fcbd950f69..bd9291c4930e1 100644 --- a/tests/baselines/reference/parserExportAssignment2.errors.txt +++ b/tests/baselines/reference/parserExportAssignment2.errors.txt @@ -1,10 +1,7 @@ -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts(1,10): error TS2304: Cannot find name 'foo'. -==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment2.ts (1 errors) ==== export = foo; - ~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~ !!! error TS2304: Cannot find name 'foo'. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment3.errors.txt b/tests/baselines/reference/parserExportAssignment3.errors.txt index 5e2ff747e2d56..57bda04945eb2 100644 --- a/tests/baselines/reference/parserExportAssignment3.errors.txt +++ b/tests/baselines/reference/parserExportAssignment3.errors.txt @@ -1,10 +1,7 @@ -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts(1,9): error TS1109: Expression expected. -==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment3.ts (1 errors) ==== export = - ~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. !!! error TS1109: Expression expected. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment4.errors.txt b/tests/baselines/reference/parserExportAssignment4.errors.txt index 10830b9b9778d..950baf4b72cd6 100644 --- a/tests/baselines/reference/parserExportAssignment4.errors.txt +++ b/tests/baselines/reference/parserExportAssignment4.errors.txt @@ -1,10 +1,7 @@ -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts(1,10): error TS1109: Expression expected. -==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment4.ts (1 errors) ==== export = ; - ~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~ !!! error TS1109: Expression expected. \ No newline at end of file diff --git a/tests/baselines/reference/parserExportAssignment7.errors.txt b/tests/baselines/reference/parserExportAssignment7.errors.txt index c4ecd785484cc..3f1c14ddf708d 100644 --- a/tests/baselines/reference/parserExportAssignment7.errors.txt +++ b/tests/baselines/reference/parserExportAssignment7.errors.txt @@ -1,12 +1,9 @@ -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,1): error TS2309: An export assignment cannot be used in a module with other exported elements. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts(4,10): error TS2304: Cannot find name 'B'. -==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts (3 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment7.ts (2 errors) ==== export class C { - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. } export = B; diff --git a/tests/baselines/reference/parserExportAssignment8.errors.txt b/tests/baselines/reference/parserExportAssignment8.errors.txt index 39ccc32e495c3..4d4a3ad7eb122 100644 --- a/tests/baselines/reference/parserExportAssignment8.errors.txt +++ b/tests/baselines/reference/parserExportAssignment8.errors.txt @@ -1,13 +1,10 @@ -tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,1): error TS2309: An export assignment cannot be used in a module with other exported elements. tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts(1,10): error TS2304: Cannot find name 'B'. -==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts (3 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ExportAssignments/parserExportAssignment8.ts (2 errors) ==== export = B; ~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - ~~~~~~~~~~~ !!! error TS2309: An export assignment cannot be used in a module with other exported elements. ~ !!! error TS2304: Cannot find name 'B'. diff --git a/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt index 6820ecdd48cab..07734135de484 100644 --- a/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt +++ b/tests/baselines/reference/parserInterfaceDeclaration6.errors.txt @@ -1,11 +1,8 @@ tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts(1,8): error TS1030: 'export' modifier already seen. -tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts(1,25): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. -==== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration6.ts (1 errors) ==== export export interface I { ~~~~~~ !!! error TS1030: 'export' modifier already seen. - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. } \ No newline at end of file diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt b/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt deleted file mode 100644 index ecd59ae29e8fb..0000000000000 --- a/tests/baselines/reference/parserInterfaceDeclaration7.errors.txt +++ /dev/null @@ -1,8 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts(1,18): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts (1 errors) ==== - export interface I { - ~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - } \ No newline at end of file diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.symbols b/tests/baselines/reference/parserInterfaceDeclaration7.symbols new file mode 100644 index 0000000000000..c873239c71639 --- /dev/null +++ b/tests/baselines/reference/parserInterfaceDeclaration7.symbols @@ -0,0 +1,4 @@ +=== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts === +export interface I { +>I : Symbol(I, Decl(parserInterfaceDeclaration7.ts, 0, 0)) +} diff --git a/tests/baselines/reference/parserInterfaceDeclaration7.types b/tests/baselines/reference/parserInterfaceDeclaration7.types new file mode 100644 index 0000000000000..8119f50c9f265 --- /dev/null +++ b/tests/baselines/reference/parserInterfaceDeclaration7.types @@ -0,0 +1,4 @@ +=== tests/cases/conformance/parser/ecmascript5/InterfaceDeclarations/parserInterfaceDeclaration7.ts === +export interface I { +>I : I +} diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt b/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt index c73c52ddd35f6..e394705fac091 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt +++ b/tests/baselines/reference/parserModifierOnStatementInBlock1.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts(2,4): error TS1184: Modifiers cannot appear here. -==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock1.ts (1 errors) ==== export function foo() { - ~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. export var x = this; ~~~~~~ !!! error TS1184: Modifiers cannot appear here. diff --git a/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt b/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt index a480a0c433033..9c1ccf6835103 100644 --- a/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt +++ b/tests/baselines/reference/parserModifierOnStatementInBlock3.errors.txt @@ -1,11 +1,8 @@ -tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts(2,4): error TS1184: Modifiers cannot appear here. -==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts (2 errors) ==== +==== tests/cases/conformance/parser/ecmascript5/ErrorRecovery/parserModifierOnStatementInBlock3.ts (1 errors) ==== export function foo() { - ~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. export function bar() { ~~~~~~ !!! error TS1184: Modifiers cannot appear here. diff --git a/tests/baselines/reference/parserModule1.errors.txt b/tests/baselines/reference/parserModule1.errors.txt deleted file mode 100644 index dc5c9c2dd357d..0000000000000 --- a/tests/baselines/reference/parserModule1.errors.txt +++ /dev/null @@ -1,37 +0,0 @@ -tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts(1,19): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts (1 errors) ==== - export module CompilerDiagnostics { - ~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - export var debug = false; - export interface IDiagnosticWriter { - Alert(output: string): void; - } - - export var diagnosticWriter: IDiagnosticWriter = null; - - export var analysisPass: number = 0; - - export function Alert(output: string) { - if (diagnosticWriter) { - diagnosticWriter.Alert(output); - } - } - - export function debugPrint(s: string) { - if (debug) { - Alert(s); - } - } - - export function assert(condition: boolean, s: string) { - if (debug) { - if (!condition) { - Alert(s); - } - } - } - - } \ No newline at end of file diff --git a/tests/baselines/reference/parserModule1.symbols b/tests/baselines/reference/parserModule1.symbols new file mode 100644 index 0000000000000..18bae82da65b4 --- /dev/null +++ b/tests/baselines/reference/parserModule1.symbols @@ -0,0 +1,69 @@ +=== tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts === + export module CompilerDiagnostics { +>CompilerDiagnostics : Symbol(CompilerDiagnostics, Decl(parserModule1.ts, 0, 0)) + + export var debug = false; +>debug : Symbol(debug, Decl(parserModule1.ts, 1, 18)) + + export interface IDiagnosticWriter { +>IDiagnosticWriter : Symbol(IDiagnosticWriter, Decl(parserModule1.ts, 1, 33)) + + Alert(output: string): void; +>Alert : Symbol(Alert, Decl(parserModule1.ts, 2, 44)) +>output : Symbol(output, Decl(parserModule1.ts, 3, 18)) + } + + export var diagnosticWriter: IDiagnosticWriter = null; +>diagnosticWriter : Symbol(diagnosticWriter, Decl(parserModule1.ts, 6, 18)) +>IDiagnosticWriter : Symbol(IDiagnosticWriter, Decl(parserModule1.ts, 1, 33)) + + export var analysisPass: number = 0; +>analysisPass : Symbol(analysisPass, Decl(parserModule1.ts, 8, 18)) + + export function Alert(output: string) { +>Alert : Symbol(Alert, Decl(parserModule1.ts, 8, 44)) +>output : Symbol(output, Decl(parserModule1.ts, 10, 30)) + + if (diagnosticWriter) { +>diagnosticWriter : Symbol(diagnosticWriter, Decl(parserModule1.ts, 6, 18)) + + diagnosticWriter.Alert(output); +>diagnosticWriter.Alert : Symbol(IDiagnosticWriter.Alert, Decl(parserModule1.ts, 2, 44)) +>diagnosticWriter : Symbol(diagnosticWriter, Decl(parserModule1.ts, 6, 18)) +>Alert : Symbol(IDiagnosticWriter.Alert, Decl(parserModule1.ts, 2, 44)) +>output : Symbol(output, Decl(parserModule1.ts, 10, 30)) + } + } + + export function debugPrint(s: string) { +>debugPrint : Symbol(debugPrint, Decl(parserModule1.ts, 14, 9)) +>s : Symbol(s, Decl(parserModule1.ts, 16, 35)) + + if (debug) { +>debug : Symbol(debug, Decl(parserModule1.ts, 1, 18)) + + Alert(s); +>Alert : Symbol(Alert, Decl(parserModule1.ts, 8, 44)) +>s : Symbol(s, Decl(parserModule1.ts, 16, 35)) + } + } + + export function assert(condition: boolean, s: string) { +>assert : Symbol(assert, Decl(parserModule1.ts, 20, 9)) +>condition : Symbol(condition, Decl(parserModule1.ts, 22, 31)) +>s : Symbol(s, Decl(parserModule1.ts, 22, 50)) + + if (debug) { +>debug : Symbol(debug, Decl(parserModule1.ts, 1, 18)) + + if (!condition) { +>condition : Symbol(condition, Decl(parserModule1.ts, 22, 31)) + + Alert(s); +>Alert : Symbol(Alert, Decl(parserModule1.ts, 8, 44)) +>s : Symbol(s, Decl(parserModule1.ts, 22, 50)) + } + } + } + + } diff --git a/tests/baselines/reference/parserModule1.types b/tests/baselines/reference/parserModule1.types new file mode 100644 index 0000000000000..2d3b670aaa6f3 --- /dev/null +++ b/tests/baselines/reference/parserModule1.types @@ -0,0 +1,76 @@ +=== tests/cases/conformance/parser/ecmascript5/ModuleDeclarations/parserModule1.ts === + export module CompilerDiagnostics { +>CompilerDiagnostics : typeof CompilerDiagnostics + + export var debug = false; +>debug : boolean +>false : boolean + + export interface IDiagnosticWriter { +>IDiagnosticWriter : IDiagnosticWriter + + Alert(output: string): void; +>Alert : (output: string) => void +>output : string + } + + export var diagnosticWriter: IDiagnosticWriter = null; +>diagnosticWriter : IDiagnosticWriter +>IDiagnosticWriter : IDiagnosticWriter +>null : null + + export var analysisPass: number = 0; +>analysisPass : number +>0 : number + + export function Alert(output: string) { +>Alert : (output: string) => void +>output : string + + if (diagnosticWriter) { +>diagnosticWriter : IDiagnosticWriter + + diagnosticWriter.Alert(output); +>diagnosticWriter.Alert(output) : void +>diagnosticWriter.Alert : (output: string) => void +>diagnosticWriter : IDiagnosticWriter +>Alert : (output: string) => void +>output : string + } + } + + export function debugPrint(s: string) { +>debugPrint : (s: string) => void +>s : string + + if (debug) { +>debug : boolean + + Alert(s); +>Alert(s) : void +>Alert : (output: string) => void +>s : string + } + } + + export function assert(condition: boolean, s: string) { +>assert : (condition: boolean, s: string) => void +>condition : boolean +>s : string + + if (debug) { +>debug : boolean + + if (!condition) { +>!condition : boolean +>condition : boolean + + Alert(s); +>Alert(s) : void +>Alert : (output: string) => void +>s : string + } + } + } + + } diff --git a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt b/tests/baselines/reference/relativePathToDeclarationFile.errors.txt deleted file mode 100644 index 0431c3a5bfa2a..0000000000000 --- a/tests/baselines/reference/relativePathToDeclarationFile.errors.txt +++ /dev/null @@ -1,30 +0,0 @@ -tests/cases/conformance/externalModules/test/foo.d.ts(1,23): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/externalModules/test/file1.ts (0 errors) ==== - 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)); - } - -==== tests/cases/conformance/externalModules/test/foo.d.ts (1 errors) ==== - export declare module M2 { - ~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - export var x: boolean; - } - -==== tests/cases/conformance/externalModules/test/other.d.ts (0 errors) ==== - export declare module M2 { - export var x: string; - } - -==== tests/cases/conformance/externalModules/test/sub/relMod.d.ts (0 errors) ==== - declare class Test { - constructor(x: number); - } - export = Test; - \ No newline at end of file diff --git a/tests/baselines/reference/relativePathToDeclarationFile.symbols b/tests/baselines/reference/relativePathToDeclarationFile.symbols new file mode 100644 index 0000000000000..5aa953178d54e --- /dev/null +++ b/tests/baselines/reference/relativePathToDeclarationFile.symbols @@ -0,0 +1,55 @@ +=== tests/cases/conformance/externalModules/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.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)) +>relMod : Symbol(relMod, Decl(file1.ts, 1, 34)) +>other.M2.x.charCodeAt : Symbol(String.charCodeAt, Decl(lib.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.d.ts, --, --)) +} + +=== tests/cases/conformance/externalModules/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)) +} + +=== tests/cases/conformance/externalModules/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)) +} + +=== tests/cases/conformance/externalModules/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/tests/baselines/reference/relativePathToDeclarationFile.types b/tests/baselines/reference/relativePathToDeclarationFile.types new file mode 100644 index 0000000000000..ef77acc85b42b --- /dev/null +++ b/tests/baselines/reference/relativePathToDeclarationFile.types @@ -0,0 +1,58 @@ +=== tests/cases/conformance/externalModules/test/file1.ts === +import foo = require('foo'); +>foo : typeof foo + +import other = require('./other'); +>other : typeof other + +import relMod = require('./sub/relMod'); +>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 + + 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 : number +} + +=== tests/cases/conformance/externalModules/test/foo.d.ts === +export declare module M2 { +>M2 : typeof M2 + + export var x: boolean; +>x : boolean +} + +=== tests/cases/conformance/externalModules/test/other.d.ts === +export declare module M2 { +>M2 : typeof M2 + + export var x: string; +>x : string +} + +=== tests/cases/conformance/externalModules/test/sub/relMod.d.ts === +declare class Test { +>Test : Test + + constructor(x: number); +>x : number +} +export = Test; +>Test : Test + diff --git a/tests/baselines/reference/reservedWords2.errors.txt b/tests/baselines/reference/reservedWords2.errors.txt index fa89df3af7ae0..5aa1df63a96e6 100644 --- a/tests/baselines/reference/reservedWords2.errors.txt +++ b/tests/baselines/reference/reservedWords2.errors.txt @@ -1,4 +1,3 @@ -tests/cases/compiler/reservedWords2.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/compiler/reservedWords2.ts(1,8): error TS1109: Expression expected. tests/cases/compiler/reservedWords2.ts(1,14): error TS1005: '(' expected. tests/cases/compiler/reservedWords2.ts(1,16): error TS2304: Cannot find name 'require'. @@ -32,10 +31,8 @@ tests/cases/compiler/reservedWords2.ts(10,5): error TS2300: Duplicate identifier tests/cases/compiler/reservedWords2.ts(10,6): error TS1003: Identifier expected. -==== tests/cases/compiler/reservedWords2.ts (32 errors) ==== +==== tests/cases/compiler/reservedWords2.ts (31 errors) ==== import while = require("dfdf"); - ~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~~~ !!! error TS1109: Expression expected. ~ diff --git a/tests/baselines/reference/scannerClass2.errors.txt b/tests/baselines/reference/scannerClass2.errors.txt index d808f6fdd5997..e7a1765a76688 100644 --- a/tests/baselines/reference/scannerClass2.errors.txt +++ b/tests/baselines/reference/scannerClass2.errors.txt @@ -1,15 +1,12 @@ -tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(3,18): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(3,43): error TS2304: Cannot find name 'ILogger'. tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(4,37): error TS2304: Cannot find name 'ILogger'. tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts(5,18): error TS2339: Property '_information' does not exist on type 'LoggerAdapter'. -==== tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts (4 errors) ==== +==== tests/cases/conformance/scanner/ecmascript5/scannerClass2.ts (3 errors) ==== export class LoggerAdapter implements ILogger { - ~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. ~~~~~~~ !!! error TS2304: Cannot find name 'ILogger'. constructor (public logger: ILogger) { diff --git a/tests/baselines/reference/scannerEnum1.errors.txt b/tests/baselines/reference/scannerEnum1.errors.txt deleted file mode 100644 index d0bbf16743c1f..0000000000000 --- a/tests/baselines/reference/scannerEnum1.errors.txt +++ /dev/null @@ -1,10 +0,0 @@ -tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts(1,17): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - - -==== tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts (1 errors) ==== - export enum CodeGenTarget { - ~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. - ES3 = 0, - ES5 = 1, - } \ No newline at end of file diff --git a/tests/baselines/reference/scannerEnum1.symbols b/tests/baselines/reference/scannerEnum1.symbols new file mode 100644 index 0000000000000..cd40e63770f95 --- /dev/null +++ b/tests/baselines/reference/scannerEnum1.symbols @@ -0,0 +1,10 @@ +=== tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts === + export enum CodeGenTarget { +>CodeGenTarget : Symbol(CodeGenTarget, Decl(scannerEnum1.ts, 0, 0)) + + ES3 = 0, +>ES3 : Symbol(CodeGenTarget.ES3, Decl(scannerEnum1.ts, 0, 31)) + + ES5 = 1, +>ES5 : Symbol(CodeGenTarget.ES5, Decl(scannerEnum1.ts, 1, 16)) + } diff --git a/tests/baselines/reference/scannerEnum1.types b/tests/baselines/reference/scannerEnum1.types new file mode 100644 index 0000000000000..d75899a75f1f7 --- /dev/null +++ b/tests/baselines/reference/scannerEnum1.types @@ -0,0 +1,12 @@ +=== tests/cases/conformance/scanner/ecmascript5/scannerEnum1.ts === + export enum CodeGenTarget { +>CodeGenTarget : CodeGenTarget + + ES3 = 0, +>ES3 : CodeGenTarget +>0 : number + + ES5 = 1, +>ES5 : CodeGenTarget +>1 : number + } diff --git a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt index 6c1a257b5ea43..8f84793a49fbb 100644 --- a/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt +++ b/tests/baselines/reference/thisInInvalidContextsExternalModule.errors.txt @@ -6,10 +6,9 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(38,25): error TS2507: Type 'any' is not a constructor function type. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(44,9): error TS2332: 'this' cannot be referenced in current location. tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(45,9): error TS2332: 'this' cannot be referenced in current location. -tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts(48,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. -==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (9 errors) ==== +==== tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalModule.ts (8 errors) ==== //'this' in static member initializer class ErrClass1 { static t = this; // Error @@ -73,6 +72,4 @@ tests/cases/conformance/expressions/thisKeyword/thisInInvalidContextsExternalMod !!! error TS2332: 'this' cannot be referenced in current location. } - export = this; // Should be an error - ~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. \ No newline at end of file + export = this; // Should be an error \ No newline at end of file diff --git a/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt b/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt index cced3116b5e95..f8a569838ee45 100644 --- a/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt +++ b/tests/baselines/reference/tsxStatelessFunctionComponents2.errors.txt @@ -1,15 +1,12 @@ -tests/cases/conformance/jsx/file.tsx(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/jsx/file.tsx(20,16): error TS2339: Property 'ref' does not exist on type 'IntrinsicAttributes & { name?: string; }'. tests/cases/conformance/jsx/file.tsx(26,42): error TS2339: Property 'subtr' does not exist on type 'string'. tests/cases/conformance/jsx/file.tsx(28,33): error TS2339: Property 'notARealProperty' does not exist on type 'BigGreeter'. tests/cases/conformance/jsx/file.tsx(36,26): error TS2339: Property 'propertyNotOnHtmlDivElement' does not exist on type 'HTMLDivElement'. -==== tests/cases/conformance/jsx/file.tsx (5 errors) ==== +==== tests/cases/conformance/jsx/file.tsx (4 errors) ==== import React = require('react'); - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. function Greet(x: {name?: string}) { return
Hello, {x}
; diff --git a/tests/baselines/reference/typeofANonExportedType.errors.txt b/tests/baselines/reference/typeofANonExportedType.errors.txt index 2399938dcfccd..b54cbf74c66e4 100644 --- a/tests/baselines/reference/typeofANonExportedType.errors.txt +++ b/tests/baselines/reference/typeofANonExportedType.errors.txt @@ -1,14 +1,11 @@ -tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(2,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(20,12): error TS2323: Cannot redeclare exported variable 'r5'. tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(21,12): error TS2323: Cannot redeclare exported variable 'r5'. tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts(42,12): error TS2502: 'r12' is referenced directly or indirectly in its own type annotation. -==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts (4 errors) ==== +==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofANonExportedType.ts (3 errors) ==== var x = 1; export var r1: typeof x; - ~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. var y = { foo: '' }; export var r2: typeof y; class C { diff --git a/tests/baselines/reference/typeofAnExportedType.errors.txt b/tests/baselines/reference/typeofAnExportedType.errors.txt index 9740909bd5975..520b8138ba534 100644 --- a/tests/baselines/reference/typeofAnExportedType.errors.txt +++ b/tests/baselines/reference/typeofAnExportedType.errors.txt @@ -1,13 +1,10 @@ -tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(1,1): error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(20,12): error TS2323: Cannot redeclare exported variable 'r5'. tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(21,12): error TS2323: Cannot redeclare exported variable 'r5'. tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts(42,12): error TS2502: 'r12' is referenced directly or indirectly in its own type annotation. -==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts (4 errors) ==== +==== tests/cases/conformance/types/specifyingTypes/typeQueries/typeofAnExportedType.ts (3 errors) ==== export var x = 1; - ~~~~~~~~~~~~~~~~~ -!!! error TS1148: Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file. export var r1: typeof x; export var y = { foo: '' }; export var r2: typeof y; From ed1eb2b274369749b16a6d4bbdd7257e5c8a4d2c Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Wed, 10 Feb 2016 22:28:52 -0800 Subject: [PATCH 05/12] Fixed up paths in fourslash tests --- tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts | 7 ------- tests/cases/fourslash/server/definition01.ts | 2 +- tests/cases/fourslash/server/projectInfo01.ts | 2 +- tests/cases/fourslash/server/typedefinition01.ts | 2 +- tests/cases/unittests/transpile.ts | 5 ----- 5 files changed, 3 insertions(+), 15 deletions(-) diff --git a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts index 198c39abe4249..9ab29b417984b 100644 --- a/tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts +++ b/tests/cases/fourslash/getJavaScriptSemanticDiagnostics2.ts @@ -11,12 +11,5 @@ verify.getSemanticDiagnostics(`[ "length": 11, "category": "error", "code": 8003 - }, - { - "message": "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.", - "start": 0, - "length": 11, - "category": "error", - "code": 1148 } ]`); \ No newline at end of file diff --git a/tests/cases/fourslash/server/definition01.ts b/tests/cases/fourslash/server/definition01.ts index 8bf6e73c8409f..c0c297f89e587 100644 --- a/tests/cases/fourslash/server/definition01.ts +++ b/tests/cases/fourslash/server/definition01.ts @@ -1,7 +1,7 @@ /// // @Filename: b.ts -////import n = require('a/*1*/'); +////import n = require('./a/*1*/'); ////var x = new n.Foo(); // @Filename: a.ts diff --git a/tests/cases/fourslash/server/projectInfo01.ts b/tests/cases/fourslash/server/projectInfo01.ts index 656647715f03a..0d8707bf8a13d 100644 --- a/tests/cases/fourslash/server/projectInfo01.ts +++ b/tests/cases/fourslash/server/projectInfo01.ts @@ -4,7 +4,7 @@ ////export var test = "test String" // @Filename: b.ts -////import test from "a" +////import test from "./a" // @Filename: c.ts /////// diff --git a/tests/cases/fourslash/server/typedefinition01.ts b/tests/cases/fourslash/server/typedefinition01.ts index e7c37747abaad..bde9f4dc4d8a0 100644 --- a/tests/cases/fourslash/server/typedefinition01.ts +++ b/tests/cases/fourslash/server/typedefinition01.ts @@ -1,7 +1,7 @@ /// // @Filename: b.ts -////import n = require('a'); +////import n = require('./a'); ////var x/*1*/ = new n.Foo(); // @Filename: a.ts diff --git a/tests/cases/unittests/transpile.ts b/tests/cases/unittests/transpile.ts index 6f46bb53405c5..99a7de1394f2c 100644 --- a/tests/cases/unittests/transpile.ts +++ b/tests/cases/unittests/transpile.ts @@ -85,11 +85,6 @@ module ts { } - it("Generates correct compilerOptions diagnostics", () => { - // Expecting 5047: "Option 'isolatedModules' can only be used when either option'--module' is provided or option 'target' is 'ES6' or higher." - test(`var x = 0;`, { expectedDiagnosticCodes: [5047] }); - }); - it("Generates no diagnostics with valid inputs", () => { // No errors test(`var x = 0;`, { options: { compilerOptions: { module: ModuleKind.CommonJS } } }); From 2922bd59a6a73a99646b02e42ec40721dcb66835 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Wed, 10 Feb 2016 23:03:01 -0800 Subject: [PATCH 06/12] Fix node_modules exclude --- src/compiler/commandLineParser.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 029388b5380ee..a41038c5e4d5a 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -532,7 +532,7 @@ namespace ts { } else { // by default exclude node_modules, and any specificied output directory - exclude = ["./node_modules"] + exclude = ["node_modules"] let outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"]; if(outDir) { exclude.push(outDir); From 7404b901b962d0673b7d4522cd961c3dd8859e9b Mon Sep 17 00:00:00 2001 From: Vladimir Matveev Date: Thu, 11 Feb 2016 09:48:47 -0800 Subject: [PATCH 07/12] fix falling tests and linter issues --- src/compiler/commandLineParser.ts | 8 ++++---- src/compiler/program.ts | 1 - tests/cases/unittests/cachingInServerLSHost.ts | 12 +++++++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index a41038c5e4d5a..779db74048c66 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -527,14 +527,14 @@ namespace ts { const filesSeen: Map = {}; let exclude: string[] = []; - if(json["exclude"] instanceof Array){ + if (json["exclude"] instanceof Array) { exclude = json["exclude"]; } else { // by default exclude node_modules, and any specificied output directory - exclude = ["node_modules"] - let outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"]; - if(outDir) { + exclude = ["node_modules"]; + const outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"]; + if (outDir) { exclude.push(outDir); } } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 75de3ed52587a..47b6d44ccbfaf 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1288,7 +1288,6 @@ namespace ts { const languageVersion = options.target || ScriptTarget.ES3; const outFile = options.outFile || options.out; - const firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined); if (options.isolatedModules) { const firstNonExternalModuleSourceFile = forEach(files, f => !isExternalModule(f) && !isDeclarationFile(f) ? f : undefined); if (firstNonExternalModuleSourceFile) { diff --git a/tests/cases/unittests/cachingInServerLSHost.ts b/tests/cases/unittests/cachingInServerLSHost.ts index 88b44a693b940..2b6e24e5770c9 100644 --- a/tests/cases/unittests/cachingInServerLSHost.ts +++ b/tests/cases/unittests/cachingInServerLSHost.ts @@ -7,6 +7,16 @@ module ts { } function createDefaultServerHost(fileMap: Map): server.ServerHost { + let existingDirectories: Map = {}; + forEachValue(fileMap, v => { + let dir = getDirectoryPath(v.name); + let previous: string; + do { + existingDirectories[dir] = true; + previous = dir; + dir = getDirectoryPath(dir); + } while (dir !== previous); + }); return { args: [], newLine: "\r\n", @@ -26,7 +36,7 @@ module ts { return hasProperty(fileMap, path); }, directoryExists: (path: string): boolean => { - throw new Error("NYI"); + return hasProperty(existingDirectories, path); }, createDirectory: (path: string) => { }, From fc5d94df579414192dd074771e50f805466a3417 Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 11 Feb 2016 09:45:13 -0800 Subject: [PATCH 08/12] Do not add minified JavaScript files on file crawl --- src/compiler/commandLineParser.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 779db74048c66..82c6b852e236c 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -553,6 +553,11 @@ namespace ts { continue; } + // Skip over any minified JavaScript files (ending in ".min.js") + if (/\.min\.js$/.test(fileName)) { + continue; + } + // If this is one of the output extension (which would be .d.ts and .js if we are allowing compilation of js files) // do not include this file if we included .ts or .tsx file with same base name as it could be output of the earlier compilation if (extension === ".d.ts" || (options.allowJs && contains(supportedJavascriptExtensions, extension))) { From 73fa45bd2e118f7186016ea5fc52c19ec2061aaa Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 11 Feb 2016 11:01:10 -0800 Subject: [PATCH 09/12] Added back errors for module kind none --- src/compiler/checker.ts | 2 +- src/compiler/diagnosticMessages.json | 10 +++++++++- src/compiler/program.ts | 10 ++++++++++ src/compiler/utilities.ts | 2 +- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 986546772ef96..6001760c4a8f2 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -49,7 +49,7 @@ namespace ts { const compilerOptions = host.getCompilerOptions(); const languageVersion = compilerOptions.target || ScriptTarget.ES3; - const modulekind = compilerOptions.module ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS; + const modulekind = typeof compilerOptions.module === "number" ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS; const allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ModuleKind.System; const emitResolver = createResolver(); diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 447fdd97994d0..1a8a53d517c10 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -439,6 +439,10 @@ "category": "Error", "code": 1147 }, + "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.": { + "category": "Error", + "code": 1148 + }, "File name '{0}' differs from already included file name '{1}' only in casing": { "category": "Error", "code": 1149 @@ -2127,6 +2131,10 @@ "category": "Error", "code": 5042 }, + "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher.": { + "category": "Error", + "code": 5047 + }, "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.": { "category": "Error", "code": 5051 @@ -2163,7 +2171,7 @@ "category": "Error", "code": 5059 }, - + "Concatenate and emit output to single file.": { "category": "Message", diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 47b6d44ccbfaf..3c75f31add2a4 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1288,13 +1288,23 @@ namespace ts { const languageVersion = options.target || ScriptTarget.ES3; const outFile = options.outFile || options.out; + const firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined); if (options.isolatedModules) { + if (!options.module && languageVersion < ScriptTarget.ES6) { + programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher)); + } + const firstNonExternalModuleSourceFile = forEach(files, f => !isExternalModule(f) && !isDeclarationFile(f) ? f : undefined); if (firstNonExternalModuleSourceFile) { const span = getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile); programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided)); } } + else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && !options.module) { + // We cannot use createDiagnosticFromNode because nodes do not have parents yet + const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); + programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file)); + } // Cannot specify module gen target of es6 when below es6 if (options.module === ModuleKind.ES6 && languageVersion < ScriptTarget.ES6) { diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 3406f40bf3453..193807af1a3fa 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2011,7 +2011,7 @@ namespace ts { } export function getEmitModuleKind(compilerOptions: CompilerOptions) { - return compilerOptions.module ? + return typeof compilerOptions.module === "number" ? compilerOptions.module : getEmitScriptTarget(compilerOptions) === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS; } From 4a67dc5e0823ca934eda4cd62b99bf4e7270a1dd Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 11 Feb 2016 11:53:10 -0800 Subject: [PATCH 10/12] Dont default to CommonJS modules for ES6 target --- src/compiler/checker.ts | 2 +- src/compiler/commandLineParser.ts | 1 - src/compiler/program.ts | 4 ++-- src/harness/harness.ts | 1 - src/services/services.ts | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 6001760c4a8f2..de27376b17d20 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -49,7 +49,7 @@ namespace ts { const compilerOptions = host.getCompilerOptions(); const languageVersion = compilerOptions.target || ScriptTarget.ES3; - const modulekind = typeof compilerOptions.module === "number" ? compilerOptions.module : languageVersion === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS; + const modulekind = getEmitModuleKind(compilerOptions); const allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ModuleKind.System; const emitResolver = createResolver(); diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index 82c6b852e236c..d21a4b00a0366 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -580,7 +580,6 @@ namespace ts { const options: CompilerOptions = {}; const errors: Diagnostic[] = []; - options.module = ModuleKind.CommonJS; if (configFileName && getBaseFileName(configFileName) === "jsconfig.json") { options.allowJs = true; } diff --git a/src/compiler/program.ts b/src/compiler/program.ts index 3c75f31add2a4..bd811b9bea3ff 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1290,7 +1290,7 @@ namespace ts { const firstExternalModuleSourceFile = forEach(files, f => isExternalModule(f) ? f : undefined); if (options.isolatedModules) { - if (!options.module && languageVersion < ScriptTarget.ES6) { + if (options.module === ModuleKind.None && languageVersion < ScriptTarget.ES6) { programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher)); } @@ -1300,7 +1300,7 @@ namespace ts { programDiagnostics.add(createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided)); } } - else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && !options.module) { + else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && options.module === ModuleKind.None) { // We cannot use createDiagnosticFromNode because nodes do not have parents yet const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file)); diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 7fd819731721a..3536c6f113d65 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -974,7 +974,6 @@ namespace Harness { const options: ts.CompilerOptions & HarnessOptions = compilerOptions ? ts.clone(compilerOptions) : { noResolve: false }; options.target = options.target || ts.ScriptTarget.ES3; - options.module = options.module || ts.ModuleKind.None; options.newLine = options.newLine || ts.NewLineKind.CarriageReturnLineFeed; options.noErrorTruncation = true; options.skipDefaultLibCheck = true; diff --git a/src/services/services.ts b/src/services/services.ts index 7a7670111768f..0fb7f329dfeeb 100644 --- a/src/services/services.ts +++ b/src/services/services.ts @@ -1712,7 +1712,6 @@ namespace ts { // Always default to "ScriptTarget.ES5" for the language service return { target: ScriptTarget.ES5, - module: ModuleKind.CommonJS, jsx: JsxEmit.Preserve }; } From 195e69c8893a1b67f3a7885619d8df74b911c03a Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 11 Feb 2016 12:45:52 -0800 Subject: [PATCH 11/12] Added module: none as an option --- src/compiler/commandLineParser.ts | 3 ++- src/compiler/diagnosticMessages.json | 6 +++--- src/compiler/program.ts | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts index d21a4b00a0366..55cc2be0b72e8 100644 --- a/src/compiler/commandLineParser.ts +++ b/src/compiler/commandLineParser.ts @@ -78,6 +78,7 @@ namespace ts { name: "module", shortName: "m", type: { + "none": ModuleKind.None, "commonjs": ModuleKind.CommonJS, "amd": ModuleKind.AMD, "system": ModuleKind.System, @@ -87,7 +88,7 @@ namespace ts { }, description: Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015, paramType: Diagnostics.KIND, - error: Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_or_es2015 + error: Diagnostics.Argument_for_module_option_must_be_commonjs_amd_system_umd_es2015_or_none }, { name: "newLine", diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json index 1a8a53d517c10..1a850e0ec0e9c 100644 --- a/src/compiler/diagnosticMessages.json +++ b/src/compiler/diagnosticMessages.json @@ -439,7 +439,7 @@ "category": "Error", "code": 1147 }, - "Cannot compile modules unless the '--module' flag is provided. Consider setting the 'module' compiler option in a 'tsconfig.json' file.": { + "Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file.": { "category": "Error", "code": 1148 }, @@ -2171,7 +2171,7 @@ "category": "Error", "code": 5059 }, - + "Concatenate and emit output to single file.": { "category": "Message", @@ -2305,7 +2305,7 @@ "category": "Error", "code": 6045 }, - "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', or 'es2015'.": { + "Argument for '--module' option must be 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'none'.": { "category": "Error", "code": 6046 }, diff --git a/src/compiler/program.ts b/src/compiler/program.ts index bd811b9bea3ff..400885a1d7642 100644 --- a/src/compiler/program.ts +++ b/src/compiler/program.ts @@ -1303,7 +1303,7 @@ namespace ts { else if (firstExternalModuleSourceFile && languageVersion < ScriptTarget.ES6 && options.module === ModuleKind.None) { // We cannot use createDiagnosticFromNode because nodes do not have parents yet const span = getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator); - programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file)); + programDiagnostics.add(createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_compile_modules_unless_the_module_flag_is_provided_with_a_valid_module_type_Consider_setting_the_module_compiler_option_in_a_tsconfig_json_file)); } // Cannot specify module gen target of es6 when below es6 From d446d06f9616121b72d67e746d67fa8d1ca1f86b Mon Sep 17 00:00:00 2001 From: Bill Ticehurst Date: Thu, 11 Feb 2016 12:46:15 -0800 Subject: [PATCH 12/12] Added module: none baseline --- .../reference/moduleNoneErrors.errors.txt | 10 ++++++++++ tests/baselines/reference/moduleNoneErrors.js | 14 ++++++++++++++ tests/cases/compiler/moduleNoneErrors.ts | 5 +++++ 3 files changed, 29 insertions(+) create mode 100644 tests/baselines/reference/moduleNoneErrors.errors.txt create mode 100644 tests/baselines/reference/moduleNoneErrors.js create mode 100644 tests/cases/compiler/moduleNoneErrors.ts diff --git a/tests/baselines/reference/moduleNoneErrors.errors.txt b/tests/baselines/reference/moduleNoneErrors.errors.txt new file mode 100644 index 0000000000000..cb943050fa8c7 --- /dev/null +++ b/tests/baselines/reference/moduleNoneErrors.errors.txt @@ -0,0 +1,10 @@ +tests/cases/compiler/a.ts(1,14): error TS1148: Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file. + + +==== tests/cases/compiler/a.ts (1 errors) ==== + export class Foo { + ~~~ +!!! error TS1148: Cannot compile modules unless the '--module' flag is provided with a valid module type. Consider setting the 'module' compiler option in a 'tsconfig.json' file. + foo: string; + } + \ No newline at end of file diff --git a/tests/baselines/reference/moduleNoneErrors.js b/tests/baselines/reference/moduleNoneErrors.js new file mode 100644 index 0000000000000..c18f11d24b30b --- /dev/null +++ b/tests/baselines/reference/moduleNoneErrors.js @@ -0,0 +1,14 @@ +//// [a.ts] +export class Foo { + foo: string; +} + + +//// [a.js] +"use strict"; +var Foo = (function () { + function Foo() { + } + return Foo; +}()); +exports.Foo = Foo; diff --git a/tests/cases/compiler/moduleNoneErrors.ts b/tests/cases/compiler/moduleNoneErrors.ts new file mode 100644 index 0000000000000..c5f34a28c7753 --- /dev/null +++ b/tests/cases/compiler/moduleNoneErrors.ts @@ -0,0 +1,5 @@ +// @module: none +// @Filename: a.ts +export class Foo { + foo: string; +}