From 7d64ec94a0ec9e656b70cadc9532d15093ab719d Mon Sep 17 00:00:00 2001 From: Yui T Date: Sun, 4 Jun 2017 21:18:42 -0700 Subject: [PATCH] Update baselines from moving out of es2018 --- src/harness/unittests/commandLineParsing.ts | 2 +- .../convertCompilerOptionsFromJson.ts | 2 +- ...tCallExpressionCheckReturntype1.errors.txt | 30 ++++++++--------- .../importCallExpressionCheckReturntype1.js | 2 +- ...portCallExpressionDeclarationEmit1.symbols | 2 +- ...importCallExpressionDeclarationEmit1.types | 2 +- ...tCallExpressionDeclarationEmit2.errors.txt | 8 ++--- .../importCallExpressionDeclarationEmit2.js | 2 +- .../importCallExpressionDeclarationEmit3.js | 2 +- ...portCallExpressionDeclarationEmit3.symbols | 4 +-- ...importCallExpressionDeclarationEmit3.types | 4 +-- .../reference/importCallExpressionES5AMD.js | 2 +- .../importCallExpressionES5AMD.symbols | 4 +-- .../importCallExpressionES5AMD.types | 26 +++++++-------- .../reference/importCallExpressionES5CJS.js | 2 +- .../importCallExpressionES5CJS.symbols | 4 +-- .../importCallExpressionES5CJS.types | 26 +++++++-------- .../importCallExpressionES5System.js | 2 +- .../importCallExpressionES5System.symbols | 4 +-- .../importCallExpressionES5System.types | 26 +++++++-------- .../reference/importCallExpressionES5UMD.js | 2 +- .../importCallExpressionES5UMD.symbols | 4 +-- .../importCallExpressionES5UMD.types | 26 +++++++-------- ...portCallExpressionErrorInES2015.errors.txt | 10 +++--- .../importCallExpressionErrorInES2015.js | 2 +- ...mportCallExpressionGrammarError.errors.txt | 16 +++++----- .../reference/importCallExpressionInAMD1.js | 2 +- .../importCallExpressionInAMD1.symbols | 4 +-- .../importCallExpressionInAMD1.types | 26 +++++++-------- .../reference/importCallExpressionInAMD2.js | 2 +- .../importCallExpressionInAMD2.symbols | 4 +-- .../importCallExpressionInAMD2.types | 6 ++-- .../reference/importCallExpressionInAMD3.js | 2 +- .../importCallExpressionInAMD3.symbols | 4 +-- .../importCallExpressionInAMD3.types | 10 +++--- .../reference/importCallExpressionInAMD4.js | 2 +- .../importCallExpressionInAMD4.symbols | 6 ++-- .../importCallExpressionInAMD4.types | 32 +++++++++---------- .../reference/importCallExpressionInCJS1.js | 2 +- .../importCallExpressionInCJS1.symbols | 4 +-- .../importCallExpressionInCJS1.types | 26 +++++++-------- .../reference/importCallExpressionInCJS2.js | 2 +- .../importCallExpressionInCJS2.symbols | 6 ++-- .../importCallExpressionInCJS2.types | 14 ++++---- .../reference/importCallExpressionInCJS3.js | 2 +- .../importCallExpressionInCJS3.symbols | 4 +-- .../importCallExpressionInCJS3.types | 6 ++-- .../reference/importCallExpressionInCJS4.js | 2 +- .../importCallExpressionInCJS4.symbols | 4 +-- .../importCallExpressionInCJS4.types | 10 +++--- .../reference/importCallExpressionInCJS5.js | 2 +- .../importCallExpressionInCJS5.symbols | 6 ++-- .../importCallExpressionInCJS5.types | 32 +++++++++---------- .../importCallExpressionInScriptContext1.js | 2 +- ...portCallExpressionInScriptContext1.symbols | 4 +-- ...importCallExpressionInScriptContext1.types | 8 ++--- ...tCallExpressionInScriptContext2.errors.txt | 6 ++-- .../importCallExpressionInScriptContext2.js | 2 +- .../importCallExpressionInSystem1.js | 2 +- .../importCallExpressionInSystem1.symbols | 4 +-- .../importCallExpressionInSystem1.types | 26 +++++++-------- .../importCallExpressionInSystem2.js | 2 +- .../importCallExpressionInSystem2.symbols | 4 +-- .../importCallExpressionInSystem2.types | 6 ++-- .../importCallExpressionInSystem3.js | 2 +- .../importCallExpressionInSystem3.symbols | 4 +-- .../importCallExpressionInSystem3.types | 10 +++--- .../importCallExpressionInSystem4.js | 2 +- .../importCallExpressionInSystem4.symbols | 6 ++-- .../importCallExpressionInSystem4.types | 32 +++++++++---------- .../reference/importCallExpressionInUMD1.js | 2 +- .../importCallExpressionInUMD1.symbols | 4 +-- .../importCallExpressionInUMD1.types | 26 +++++++-------- .../reference/importCallExpressionInUMD2.js | 2 +- .../importCallExpressionInUMD2.symbols | 4 +-- .../importCallExpressionInUMD2.types | 6 ++-- .../reference/importCallExpressionInUMD3.js | 2 +- .../importCallExpressionInUMD3.symbols | 4 +-- .../importCallExpressionInUMD3.types | 10 +++--- .../reference/importCallExpressionInUMD4.js | 2 +- .../importCallExpressionInUMD4.symbols | 6 ++-- .../importCallExpressionInUMD4.types | 32 +++++++++---------- .../importCallExpressionReturnPromiseOfAny.js | 2 +- ...rtCallExpressionReturnPromiseOfAny.symbols | 4 +-- ...portCallExpressionReturnPromiseOfAny.types | 4 +-- ...sionSpecifierNotStringTypeError.errors.txt | 12 +++---- ...tCallExpressionWithTypeArgument.errors.txt | 8 ++--- .../importCallExpressionWithTypeArgument.js | 2 +- ...ons module-kind is out-of-range.errors.txt | 4 +-- ...s target-script is out-of-range.errors.txt | 4 +-- 90 files changed, 350 insertions(+), 350 deletions(-) diff --git a/src/harness/unittests/commandLineParsing.ts b/src/harness/unittests/commandLineParsing.ts index fc600bb55b4..01a208aa330 100644 --- a/src/harness/unittests/commandLineParsing.ts +++ b/src/harness/unittests/commandLineParsing.ts @@ -113,7 +113,7 @@ namespace ts { start: undefined, length: undefined, }, { - messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2018'.", + messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.", category: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.category, code: ts.Diagnostics.Argument_for_0_option_must_be_Colon_1.code, diff --git a/src/harness/unittests/convertCompilerOptionsFromJson.ts b/src/harness/unittests/convertCompilerOptionsFromJson.ts index 2fe4ba83aff..798f8c6a76b 100644 --- a/src/harness/unittests/convertCompilerOptionsFromJson.ts +++ b/src/harness/unittests/convertCompilerOptionsFromJson.ts @@ -122,7 +122,7 @@ namespace ts { file: undefined, start: 0, length: 0, - messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2018'.", + messageText: "Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'.", code: Diagnostics.Argument_for_0_option_must_be_Colon_1.code, category: Diagnostics.Argument_for_0_option_must_be_Colon_1.category }] diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt index adb904ce7fa..39622f39b3f 100644 --- a/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt +++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.errors.txt @@ -1,30 +1,30 @@ -tests/cases/conformance/es2018/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise' is not assignable to type 'Promise'. - Type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule"'. - Property 'D' is missing in type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"'. -tests/cases/conformance/es2018/dynamicImport/1.ts(5,10): error TS2352: Type 'Promise' cannot be converted to type 'Promise'. - Type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule"'. - Property 'D' is missing in type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"'. +tests/cases/conformance/dynamicImport/1.ts(4,5): error TS2322: Type 'Promise' is not assignable to type 'Promise'. + Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'. + Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'. +tests/cases/conformance/dynamicImport/1.ts(5,10): error TS2352: Type 'Promise' cannot be converted to type 'Promise'. + Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'. + Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'. -==== tests/cases/conformance/es2018/dynamicImport/anotherModule.ts (0 errors) ==== +==== tests/cases/conformance/dynamicImport/anotherModule.ts (0 errors) ==== export class D{} -==== tests/cases/conformance/es2018/dynamicImport/defaultPath.ts (0 errors) ==== +==== tests/cases/conformance/dynamicImport/defaultPath.ts (0 errors) ==== export class C {} -==== tests/cases/conformance/es2018/dynamicImport/1.ts (2 errors) ==== +==== tests/cases/conformance/dynamicImport/1.ts (2 errors) ==== import * as defaultModule from "./defaultPath"; import * as anotherModule from "./anotherModule"; let p1: Promise = import("./defaultPath"); ~~ -!!! error TS2322: Type 'Promise' is not assignable to type 'Promise'. -!!! error TS2322: Type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule"'. -!!! error TS2322: Property 'D' is missing in type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"'. +!!! error TS2322: Type 'Promise' is not assignable to type 'Promise'. +!!! error TS2322: Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not assignable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'. +!!! error TS2322: Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'. let p2 = import("./defaultPath") as Promise; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -!!! error TS2352: Type 'Promise' cannot be converted to type 'Promise'. -!!! error TS2352: Type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/es2018/dynamicImport/anotherModule"'. -!!! error TS2352: Property 'D' is missing in type 'typeof "tests/cases/conformance/es2018/dynamicImport/defaultPath"'. +!!! error TS2352: Type 'Promise' cannot be converted to type 'Promise'. +!!! error TS2352: Type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"' is not comparable to type 'typeof "tests/cases/conformance/dynamicImport/anotherModule"'. +!!! error TS2352: Property 'D' is missing in type 'typeof "tests/cases/conformance/dynamicImport/defaultPath"'. let p3: Promise = import("./defaultPath"); \ No newline at end of file diff --git a/tests/baselines/reference/importCallExpressionCheckReturntype1.js b/tests/baselines/reference/importCallExpressionCheckReturntype1.js index f317a799f13..facb6913388 100644 --- a/tests/baselines/reference/importCallExpressionCheckReturntype1.js +++ b/tests/baselines/reference/importCallExpressionCheckReturntype1.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionCheckReturntype1.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionCheckReturntype1.ts] //// //// [anotherModule.ts] export class D{} diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit1.symbols b/tests/baselines/reference/importCallExpressionDeclarationEmit1.symbols index 997911b9481..d2266cc768b 100644 --- a/tests/baselines/reference/importCallExpressionDeclarationEmit1.symbols +++ b/tests/baselines/reference/importCallExpressionDeclarationEmit1.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/importCallExpressionDeclarationEmit1.ts === +=== tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit1.ts === declare function getSpecifier(): string; >getSpecifier : Symbol(getSpecifier, Decl(importCallExpressionDeclarationEmit1.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit1.types b/tests/baselines/reference/importCallExpressionDeclarationEmit1.types index c45d3b3775e..db5400818c8 100644 --- a/tests/baselines/reference/importCallExpressionDeclarationEmit1.types +++ b/tests/baselines/reference/importCallExpressionDeclarationEmit1.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/importCallExpressionDeclarationEmit1.ts === +=== tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit1.ts === declare function getSpecifier(): string; >getSpecifier : () => string diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit2.errors.txt b/tests/baselines/reference/importCallExpressionDeclarationEmit2.errors.txt index f397ee1e95f..6c394c98bdf 100644 --- a/tests/baselines/reference/importCallExpressionDeclarationEmit2.errors.txt +++ b/tests/baselines/reference/importCallExpressionDeclarationEmit2.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/es2018/dynamicImport/1.ts(1,5): error TS4023: Exported variable 'p1' has or is using name '"tests/cases/conformance/es2018/dynamicImport/0"' from external module "tests/cases/conformance/es2018/dynamicImport/0" but cannot be named. +tests/cases/conformance/dynamicImport/1.ts(1,5): error TS4023: Exported variable 'p1' has or is using name '"tests/cases/conformance/dynamicImport/0"' from external module "tests/cases/conformance/dynamicImport/0" but cannot be named. -==== tests/cases/conformance/es2018/dynamicImport/0.ts (0 errors) ==== +==== tests/cases/conformance/dynamicImport/0.ts (0 errors) ==== export function foo() { return "foo"; } -==== tests/cases/conformance/es2018/dynamicImport/1.ts (1 errors) ==== +==== tests/cases/conformance/dynamicImport/1.ts (1 errors) ==== var p1 = import("./0"); ~~ -!!! error TS4023: Exported variable 'p1' has or is using name '"tests/cases/conformance/es2018/dynamicImport/0"' from external module "tests/cases/conformance/es2018/dynamicImport/0" but cannot be named. \ No newline at end of file +!!! error TS4023: Exported variable 'p1' has or is using name '"tests/cases/conformance/dynamicImport/0"' from external module "tests/cases/conformance/dynamicImport/0" but cannot be named. \ No newline at end of file diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit2.js b/tests/baselines/reference/importCallExpressionDeclarationEmit2.js index 49dee5c9f99..7659e94ee81 100644 --- a/tests/baselines/reference/importCallExpressionDeclarationEmit2.js +++ b/tests/baselines/reference/importCallExpressionDeclarationEmit2.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionDeclarationEmit2.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit2.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit3.js b/tests/baselines/reference/importCallExpressionDeclarationEmit3.js index 32775b00500..d38c2309a33 100644 --- a/tests/baselines/reference/importCallExpressionDeclarationEmit3.js +++ b/tests/baselines/reference/importCallExpressionDeclarationEmit3.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionDeclarationEmit3.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionDeclarationEmit3.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit3.symbols b/tests/baselines/reference/importCallExpressionDeclarationEmit3.symbols index 1e9e3ca9184..1491e05db55 100644 --- a/tests/baselines/reference/importCallExpressionDeclarationEmit3.symbols +++ b/tests/baselines/reference/importCallExpressionDeclarationEmit3.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === declare function getPath(): string; >getPath : Symbol(getPath, Decl(1.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionDeclarationEmit3.types b/tests/baselines/reference/importCallExpressionDeclarationEmit3.types index a3e2b58157f..fe4552b708f 100644 --- a/tests/baselines/reference/importCallExpressionDeclarationEmit3.types +++ b/tests/baselines/reference/importCallExpressionDeclarationEmit3.types @@ -1,9 +1,9 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === declare function getPath(): string; >getPath : () => string diff --git a/tests/baselines/reference/importCallExpressionES5AMD.js b/tests/baselines/reference/importCallExpressionES5AMD.js index fd402c163e9..cce61a5a3f9 100644 --- a/tests/baselines/reference/importCallExpressionES5AMD.js +++ b/tests/baselines/reference/importCallExpressionES5AMD.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionES5AMD.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionES5AMD.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionES5AMD.symbols b/tests/baselines/reference/importCallExpressionES5AMD.symbols index 15356c694ed..333251da662 100644 --- a/tests/baselines/reference/importCallExpressionES5AMD.symbols +++ b/tests/baselines/reference/importCallExpressionES5AMD.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 1, 3)) diff --git a/tests/baselines/reference/importCallExpressionES5AMD.types b/tests/baselines/reference/importCallExpressionES5AMD.types index 2733f3ff14a..59da055ee01 100644 --- a/tests/baselines/reference/importCallExpressionES5AMD.types +++ b/tests/baselines/reference/importCallExpressionES5AMD.types @@ -1,30 +1,30 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" p1.then(zero => { >p1.then(zero => { return zero.foo();}) : Promise ->p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->p1 : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>p1 : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string +>zero : typeof "tests/cases/conformance/dynamicImport/0" return zero.foo(); >zero.foo() : string >zero.foo : () => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }); @@ -33,7 +33,7 @@ function foo() { >foo : () => void const p2 = import("./0"); ->p2 : Promise ->import("./0") : Promise +>p2 : Promise +>import("./0") : Promise >"./0" : "./0" } diff --git a/tests/baselines/reference/importCallExpressionES5CJS.js b/tests/baselines/reference/importCallExpressionES5CJS.js index c5c4f5933a8..11d1bf46319 100644 --- a/tests/baselines/reference/importCallExpressionES5CJS.js +++ b/tests/baselines/reference/importCallExpressionES5CJS.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionES5CJS.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionES5CJS.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionES5CJS.symbols b/tests/baselines/reference/importCallExpressionES5CJS.symbols index 15356c694ed..333251da662 100644 --- a/tests/baselines/reference/importCallExpressionES5CJS.symbols +++ b/tests/baselines/reference/importCallExpressionES5CJS.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 1, 3)) diff --git a/tests/baselines/reference/importCallExpressionES5CJS.types b/tests/baselines/reference/importCallExpressionES5CJS.types index 2733f3ff14a..59da055ee01 100644 --- a/tests/baselines/reference/importCallExpressionES5CJS.types +++ b/tests/baselines/reference/importCallExpressionES5CJS.types @@ -1,30 +1,30 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" p1.then(zero => { >p1.then(zero => { return zero.foo();}) : Promise ->p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->p1 : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>p1 : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string +>zero : typeof "tests/cases/conformance/dynamicImport/0" return zero.foo(); >zero.foo() : string >zero.foo : () => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }); @@ -33,7 +33,7 @@ function foo() { >foo : () => void const p2 = import("./0"); ->p2 : Promise ->import("./0") : Promise +>p2 : Promise +>import("./0") : Promise >"./0" : "./0" } diff --git a/tests/baselines/reference/importCallExpressionES5System.js b/tests/baselines/reference/importCallExpressionES5System.js index e0b017370a0..1842fc6e60a 100644 --- a/tests/baselines/reference/importCallExpressionES5System.js +++ b/tests/baselines/reference/importCallExpressionES5System.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionES5System.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionES5System.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionES5System.symbols b/tests/baselines/reference/importCallExpressionES5System.symbols index 15356c694ed..333251da662 100644 --- a/tests/baselines/reference/importCallExpressionES5System.symbols +++ b/tests/baselines/reference/importCallExpressionES5System.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 1, 3)) diff --git a/tests/baselines/reference/importCallExpressionES5System.types b/tests/baselines/reference/importCallExpressionES5System.types index 2733f3ff14a..59da055ee01 100644 --- a/tests/baselines/reference/importCallExpressionES5System.types +++ b/tests/baselines/reference/importCallExpressionES5System.types @@ -1,30 +1,30 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" p1.then(zero => { >p1.then(zero => { return zero.foo();}) : Promise ->p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->p1 : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>p1 : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string +>zero : typeof "tests/cases/conformance/dynamicImport/0" return zero.foo(); >zero.foo() : string >zero.foo : () => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }); @@ -33,7 +33,7 @@ function foo() { >foo : () => void const p2 = import("./0"); ->p2 : Promise ->import("./0") : Promise +>p2 : Promise +>import("./0") : Promise >"./0" : "./0" } diff --git a/tests/baselines/reference/importCallExpressionES5UMD.js b/tests/baselines/reference/importCallExpressionES5UMD.js index 2952a43cd24..dfe6813839c 100644 --- a/tests/baselines/reference/importCallExpressionES5UMD.js +++ b/tests/baselines/reference/importCallExpressionES5UMD.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionES5UMD.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionES5UMD.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionES5UMD.symbols b/tests/baselines/reference/importCallExpressionES5UMD.symbols index 15356c694ed..333251da662 100644 --- a/tests/baselines/reference/importCallExpressionES5UMD.symbols +++ b/tests/baselines/reference/importCallExpressionES5UMD.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 1, 3)) diff --git a/tests/baselines/reference/importCallExpressionES5UMD.types b/tests/baselines/reference/importCallExpressionES5UMD.types index 2733f3ff14a..59da055ee01 100644 --- a/tests/baselines/reference/importCallExpressionES5UMD.types +++ b/tests/baselines/reference/importCallExpressionES5UMD.types @@ -1,30 +1,30 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" p1.then(zero => { >p1.then(zero => { return zero.foo();}) : Promise ->p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->p1 : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>p1 : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string +>zero : typeof "tests/cases/conformance/dynamicImport/0" return zero.foo(); >zero.foo() : string >zero.foo : () => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }); @@ -33,7 +33,7 @@ function foo() { >foo : () => void const p2 = import("./0"); ->p2 : Promise ->import("./0") : Promise +>p2 : Promise +>import("./0") : Promise >"./0" : "./0" } diff --git a/tests/baselines/reference/importCallExpressionErrorInES2015.errors.txt b/tests/baselines/reference/importCallExpressionErrorInES2015.errors.txt index 0c31a0f434c..d47980d1312 100644 --- a/tests/baselines/reference/importCallExpressionErrorInES2015.errors.txt +++ b/tests/baselines/reference/importCallExpressionErrorInES2015.errors.txt @@ -1,12 +1,12 @@ -tests/cases/conformance/es2018/dynamicImport/1.ts(1,1): error TS1323: Dynamic import cannot be used when targeting ECMAScript 2015 modules. -tests/cases/conformance/es2018/dynamicImport/1.ts(2,10): error TS1323: Dynamic import cannot be used when targeting ECMAScript 2015 modules. -tests/cases/conformance/es2018/dynamicImport/1.ts(8,16): error TS1323: Dynamic import cannot be used when targeting ECMAScript 2015 modules. +tests/cases/conformance/dynamicImport/1.ts(1,1): error TS1323: Dynamic import cannot be used when targeting ECMAScript 2015 modules. +tests/cases/conformance/dynamicImport/1.ts(2,10): error TS1323: Dynamic import cannot be used when targeting ECMAScript 2015 modules. +tests/cases/conformance/dynamicImport/1.ts(8,16): error TS1323: Dynamic import cannot be used when targeting ECMAScript 2015 modules. -==== tests/cases/conformance/es2018/dynamicImport/0.ts (0 errors) ==== +==== tests/cases/conformance/dynamicImport/0.ts (0 errors) ==== export function foo() { return "foo"; } -==== tests/cases/conformance/es2018/dynamicImport/1.ts (3 errors) ==== +==== tests/cases/conformance/dynamicImport/1.ts (3 errors) ==== import("./0"); ~~~~~~~~~~~~~ !!! error TS1323: Dynamic import cannot be used when targeting ECMAScript 2015 modules. diff --git a/tests/baselines/reference/importCallExpressionErrorInES2015.js b/tests/baselines/reference/importCallExpressionErrorInES2015.js index afe29bbe9ca..f07486504ee 100644 --- a/tests/baselines/reference/importCallExpressionErrorInES2015.js +++ b/tests/baselines/reference/importCallExpressionErrorInES2015.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionErrorInES2015.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionErrorInES2015.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionGrammarError.errors.txt b/tests/baselines/reference/importCallExpressionGrammarError.errors.txt index c0684edaabe..6d64808e111 100644 --- a/tests/baselines/reference/importCallExpressionGrammarError.errors.txt +++ b/tests/baselines/reference/importCallExpressionGrammarError.errors.txt @@ -1,13 +1,13 @@ -tests/cases/conformance/es2018/dynamicImport/importCallExpressionGrammarError.ts(5,8): error TS1325: Specifier of dynamic import cannot be spread element. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionGrammarError.ts(7,17): error TS1325: Specifier of dynamic import cannot be spread element. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionGrammarError.ts(8,12): error TS1324: Dynamic import must have one specifier as an argument. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionGrammarError.ts(9,19): error TS1135: Argument expression expected. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionGrammarError.ts(9,19): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'undefined'. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionGrammarError.ts(10,12): error TS1324: Dynamic import must have one specifier as an argument. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionGrammarError.ts(10,19): error TS2307: Cannot find module 'pathToModule'. +tests/cases/conformance/dynamicImport/importCallExpressionGrammarError.ts(5,8): error TS1325: Specifier of dynamic import cannot be spread element. +tests/cases/conformance/dynamicImport/importCallExpressionGrammarError.ts(7,17): error TS1325: Specifier of dynamic import cannot be spread element. +tests/cases/conformance/dynamicImport/importCallExpressionGrammarError.ts(8,12): error TS1324: Dynamic import must have one specifier as an argument. +tests/cases/conformance/dynamicImport/importCallExpressionGrammarError.ts(9,19): error TS1135: Argument expression expected. +tests/cases/conformance/dynamicImport/importCallExpressionGrammarError.ts(9,19): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'undefined'. +tests/cases/conformance/dynamicImport/importCallExpressionGrammarError.ts(10,12): error TS1324: Dynamic import must have one specifier as an argument. +tests/cases/conformance/dynamicImport/importCallExpressionGrammarError.ts(10,19): error TS2307: Cannot find module 'pathToModule'. -==== tests/cases/conformance/es2018/dynamicImport/importCallExpressionGrammarError.ts (7 errors) ==== +==== tests/cases/conformance/dynamicImport/importCallExpressionGrammarError.ts (7 errors) ==== declare function getSpecifier(): string; declare var whatToLoad: boolean; diff --git a/tests/baselines/reference/importCallExpressionInAMD1.js b/tests/baselines/reference/importCallExpressionInAMD1.js index b55066a1b6a..e1758173646 100644 --- a/tests/baselines/reference/importCallExpressionInAMD1.js +++ b/tests/baselines/reference/importCallExpressionInAMD1.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInAMD1.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInAMD1.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionInAMD1.symbols b/tests/baselines/reference/importCallExpressionInAMD1.symbols index 15356c694ed..333251da662 100644 --- a/tests/baselines/reference/importCallExpressionInAMD1.symbols +++ b/tests/baselines/reference/importCallExpressionInAMD1.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 1, 3)) diff --git a/tests/baselines/reference/importCallExpressionInAMD1.types b/tests/baselines/reference/importCallExpressionInAMD1.types index 2733f3ff14a..59da055ee01 100644 --- a/tests/baselines/reference/importCallExpressionInAMD1.types +++ b/tests/baselines/reference/importCallExpressionInAMD1.types @@ -1,30 +1,30 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" p1.then(zero => { >p1.then(zero => { return zero.foo();}) : Promise ->p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->p1 : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>p1 : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string +>zero : typeof "tests/cases/conformance/dynamicImport/0" return zero.foo(); >zero.foo() : string >zero.foo : () => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }); @@ -33,7 +33,7 @@ function foo() { >foo : () => void const p2 = import("./0"); ->p2 : Promise ->import("./0") : Promise +>p2 : Promise +>import("./0") : Promise >"./0" : "./0" } diff --git a/tests/baselines/reference/importCallExpressionInAMD2.js b/tests/baselines/reference/importCallExpressionInAMD2.js index bac579d0507..7347e2f8105 100644 --- a/tests/baselines/reference/importCallExpressionInAMD2.js +++ b/tests/baselines/reference/importCallExpressionInAMD2.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInAMD2.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInAMD2.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInAMD2.symbols b/tests/baselines/reference/importCallExpressionInAMD2.symbols index 7db47944520..16fc79c774f 100644 --- a/tests/baselines/reference/importCallExpressionInAMD2.symbols +++ b/tests/baselines/reference/importCallExpressionInAMD2.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -6,7 +6,7 @@ export class B { >print : Symbol(B.print, Decl(0.ts, 0, 16)) } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === // We use Promise for now as there is no way to specify shape of module object function foo(x: Promise) { >foo : Symbol(foo, Decl(2.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionInAMD2.types b/tests/baselines/reference/importCallExpressionInAMD2.types index 2db06142911..44b17eb51fd 100644 --- a/tests/baselines/reference/importCallExpressionInAMD2.types +++ b/tests/baselines/reference/importCallExpressionInAMD2.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -7,7 +7,7 @@ export class B { >"I am B" : "I am B" } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === // We use Promise for now as there is no way to specify shape of module object function foo(x: Promise) { >foo : (x: Promise) => void @@ -41,6 +41,6 @@ function foo(x: Promise) { foo(import("./0")); >foo(import("./0")) : void >foo : (x: Promise) => void ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" diff --git a/tests/baselines/reference/importCallExpressionInAMD3.js b/tests/baselines/reference/importCallExpressionInAMD3.js index 6245f437398..471f35a6415 100644 --- a/tests/baselines/reference/importCallExpressionInAMD3.js +++ b/tests/baselines/reference/importCallExpressionInAMD3.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInAMD3.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInAMD3.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInAMD3.symbols b/tests/baselines/reference/importCallExpressionInAMD3.symbols index 06b328f5745..5ca85d6e693 100644 --- a/tests/baselines/reference/importCallExpressionInAMD3.symbols +++ b/tests/baselines/reference/importCallExpressionInAMD3.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -6,7 +6,7 @@ export class B { >print : Symbol(B.print, Decl(0.ts, 0, 16)) } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function foo() { >foo : Symbol(foo, Decl(2.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionInAMD3.types b/tests/baselines/reference/importCallExpressionInAMD3.types index e88ddd04431..e517be6e722 100644 --- a/tests/baselines/reference/importCallExpressionInAMD3.types +++ b/tests/baselines/reference/importCallExpressionInAMD3.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -7,16 +7,16 @@ export class B { >"I am B" : "I am B" } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function foo() { >foo : () => Promise class C extends (await import("./0")).B {} >C : C >(await import("./0")).B : B ->(await import("./0")) : typeof "tests/cases/conformance/es2018/dynamicImport/0" ->await import("./0") : typeof "tests/cases/conformance/es2018/dynamicImport/0" ->import("./0") : Promise +>(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0" +>await import("./0") : typeof "tests/cases/conformance/dynamicImport/0" +>import("./0") : Promise >"./0" : "./0" >B : typeof B diff --git a/tests/baselines/reference/importCallExpressionInAMD4.js b/tests/baselines/reference/importCallExpressionInAMD4.js index d498b3df080..6e50e139116 100644 --- a/tests/baselines/reference/importCallExpressionInAMD4.js +++ b/tests/baselines/reference/importCallExpressionInAMD4.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInAMD4.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInAMD4.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInAMD4.symbols b/tests/baselines/reference/importCallExpressionInAMD4.symbols index 1d2a9aec25c..34a1dcf4d7b 100644 --- a/tests/baselines/reference/importCallExpressionInAMD4.symbols +++ b/tests/baselines/reference/importCallExpressionInAMD4.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -9,11 +9,11 @@ export class B { export function foo() { return "foo" } >foo : Symbol(foo, Decl(0.ts, 2, 1)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : Symbol(backup, Decl(1.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === declare var console: any; >console : Symbol(console, Decl(2.ts, 0, 11)) diff --git a/tests/baselines/reference/importCallExpressionInAMD4.types b/tests/baselines/reference/importCallExpressionInAMD4.types index 6da36879f64..2ea666ba672 100644 --- a/tests/baselines/reference/importCallExpressionInAMD4.types +++ b/tests/baselines/reference/importCallExpressionInAMD4.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -11,12 +11,12 @@ export function foo() { return "foo" } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : () => string >"backup" : "backup" -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === declare var console: any; >console : any @@ -24,8 +24,8 @@ class C { >C : C private myModule = import("./0"); ->myModule : Promise ->import("./0") : Promise +>myModule : Promise +>import("./0") : Promise >"./0" : "./0" method() { @@ -33,13 +33,13 @@ class C { this.myModule.then(Zero => { >this.myModule.then(Zero => { console.log(Zero.foo()); }, async err => { console.log(err); let one = await import("./1"); console.log(one.backup()); }) : Promise ->this.myModule.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->this.myModule : Promise +>this.myModule.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>this.myModule : Promise >this : this ->myModule : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->Zero => { console.log(Zero.foo()); } : (Zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => void ->Zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>myModule : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>Zero => { console.log(Zero.foo()); } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void +>Zero : typeof "tests/cases/conformance/dynamicImport/0" console.log(Zero.foo()); >console.log(Zero.foo()) : any @@ -48,7 +48,7 @@ class C { >log : any >Zero.foo() : string >Zero.foo : () => string ->Zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>Zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }, async err => { @@ -63,9 +63,9 @@ class C { >err : any let one = await import("./1"); ->one : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->await import("./1") : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->import("./1") : Promise +>one : typeof "tests/cases/conformance/dynamicImport/1" +>await import("./1") : typeof "tests/cases/conformance/dynamicImport/1" +>import("./1") : Promise >"./1" : "./1" console.log(one.backup()); @@ -75,7 +75,7 @@ class C { >log : any >one.backup() : string >one.backup : () => string ->one : typeof "tests/cases/conformance/es2018/dynamicImport/1" +>one : typeof "tests/cases/conformance/dynamicImport/1" >backup : () => string }); diff --git a/tests/baselines/reference/importCallExpressionInCJS1.js b/tests/baselines/reference/importCallExpressionInCJS1.js index 1b0783fe018..3fb298b5bde 100644 --- a/tests/baselines/reference/importCallExpressionInCJS1.js +++ b/tests/baselines/reference/importCallExpressionInCJS1.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInCJS1.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInCJS1.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionInCJS1.symbols b/tests/baselines/reference/importCallExpressionInCJS1.symbols index 15356c694ed..333251da662 100644 --- a/tests/baselines/reference/importCallExpressionInCJS1.symbols +++ b/tests/baselines/reference/importCallExpressionInCJS1.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 1, 3)) diff --git a/tests/baselines/reference/importCallExpressionInCJS1.types b/tests/baselines/reference/importCallExpressionInCJS1.types index 2733f3ff14a..59da055ee01 100644 --- a/tests/baselines/reference/importCallExpressionInCJS1.types +++ b/tests/baselines/reference/importCallExpressionInCJS1.types @@ -1,30 +1,30 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" p1.then(zero => { >p1.then(zero => { return zero.foo();}) : Promise ->p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->p1 : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>p1 : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string +>zero : typeof "tests/cases/conformance/dynamicImport/0" return zero.foo(); >zero.foo() : string >zero.foo : () => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }); @@ -33,7 +33,7 @@ function foo() { >foo : () => void const p2 = import("./0"); ->p2 : Promise ->import("./0") : Promise +>p2 : Promise +>import("./0") : Promise >"./0" : "./0" } diff --git a/tests/baselines/reference/importCallExpressionInCJS2.js b/tests/baselines/reference/importCallExpressionInCJS2.js index 4a845e2e4e3..aa983a7a2fe 100644 --- a/tests/baselines/reference/importCallExpressionInCJS2.js +++ b/tests/baselines/reference/importCallExpressionInCJS2.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInCJS2.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInCJS2.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionInCJS2.symbols b/tests/baselines/reference/importCallExpressionInCJS2.symbols index 8a62908868c..24f7a5cdb48 100644 --- a/tests/baselines/reference/importCallExpressionInCJS2.symbols +++ b/tests/baselines/reference/importCallExpressionInCJS2.symbols @@ -1,12 +1,12 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : Symbol(backup, Decl(1.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function compute(promise: Promise) { >compute : Symbol(compute, Decl(2.ts, 0, 0)) >promise : Symbol(promise, Decl(2.ts, 0, 23)) diff --git a/tests/baselines/reference/importCallExpressionInCJS2.types b/tests/baselines/reference/importCallExpressionInCJS2.types index 88317f387fe..063a5224539 100644 --- a/tests/baselines/reference/importCallExpressionInCJS2.types +++ b/tests/baselines/reference/importCallExpressionInCJS2.types @@ -1,14 +1,14 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : () => string >"backup" : "backup" -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function compute(promise: Promise) { >compute : (promise: Promise) => Promise >promise : Promise @@ -24,10 +24,10 @@ async function compute(promise: Promise) { >j : any j = await import("./1"); ->j = await import("./1") : typeof "tests/cases/conformance/es2018/dynamicImport/1" +>j = await import("./1") : typeof "tests/cases/conformance/dynamicImport/1" >j : any ->await import("./1") : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->import("./1") : Promise +>await import("./1") : typeof "tests/cases/conformance/dynamicImport/1" +>import("./1") : Promise >"./1" : "./1" return j.backup(); @@ -46,6 +46,6 @@ async function compute(promise: Promise) { compute(import("./0")); >compute(import("./0")) : Promise >compute : (promise: Promise) => Promise ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" diff --git a/tests/baselines/reference/importCallExpressionInCJS3.js b/tests/baselines/reference/importCallExpressionInCJS3.js index a55f57c5674..2f956d9ac3a 100644 --- a/tests/baselines/reference/importCallExpressionInCJS3.js +++ b/tests/baselines/reference/importCallExpressionInCJS3.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInCJS3.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInCJS3.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInCJS3.symbols b/tests/baselines/reference/importCallExpressionInCJS3.symbols index 7db47944520..16fc79c774f 100644 --- a/tests/baselines/reference/importCallExpressionInCJS3.symbols +++ b/tests/baselines/reference/importCallExpressionInCJS3.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -6,7 +6,7 @@ export class B { >print : Symbol(B.print, Decl(0.ts, 0, 16)) } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === // We use Promise for now as there is no way to specify shape of module object function foo(x: Promise) { >foo : Symbol(foo, Decl(2.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionInCJS3.types b/tests/baselines/reference/importCallExpressionInCJS3.types index 2db06142911..44b17eb51fd 100644 --- a/tests/baselines/reference/importCallExpressionInCJS3.types +++ b/tests/baselines/reference/importCallExpressionInCJS3.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -7,7 +7,7 @@ export class B { >"I am B" : "I am B" } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === // We use Promise for now as there is no way to specify shape of module object function foo(x: Promise) { >foo : (x: Promise) => void @@ -41,6 +41,6 @@ function foo(x: Promise) { foo(import("./0")); >foo(import("./0")) : void >foo : (x: Promise) => void ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" diff --git a/tests/baselines/reference/importCallExpressionInCJS4.js b/tests/baselines/reference/importCallExpressionInCJS4.js index 0264be113ee..554a0b222ab 100644 --- a/tests/baselines/reference/importCallExpressionInCJS4.js +++ b/tests/baselines/reference/importCallExpressionInCJS4.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInCJS4.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInCJS4.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInCJS4.symbols b/tests/baselines/reference/importCallExpressionInCJS4.symbols index 06b328f5745..5ca85d6e693 100644 --- a/tests/baselines/reference/importCallExpressionInCJS4.symbols +++ b/tests/baselines/reference/importCallExpressionInCJS4.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -6,7 +6,7 @@ export class B { >print : Symbol(B.print, Decl(0.ts, 0, 16)) } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function foo() { >foo : Symbol(foo, Decl(2.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionInCJS4.types b/tests/baselines/reference/importCallExpressionInCJS4.types index e88ddd04431..e517be6e722 100644 --- a/tests/baselines/reference/importCallExpressionInCJS4.types +++ b/tests/baselines/reference/importCallExpressionInCJS4.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -7,16 +7,16 @@ export class B { >"I am B" : "I am B" } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function foo() { >foo : () => Promise class C extends (await import("./0")).B {} >C : C >(await import("./0")).B : B ->(await import("./0")) : typeof "tests/cases/conformance/es2018/dynamicImport/0" ->await import("./0") : typeof "tests/cases/conformance/es2018/dynamicImport/0" ->import("./0") : Promise +>(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0" +>await import("./0") : typeof "tests/cases/conformance/dynamicImport/0" +>import("./0") : Promise >"./0" : "./0" >B : typeof B diff --git a/tests/baselines/reference/importCallExpressionInCJS5.js b/tests/baselines/reference/importCallExpressionInCJS5.js index 196c37e6e72..762da592827 100644 --- a/tests/baselines/reference/importCallExpressionInCJS5.js +++ b/tests/baselines/reference/importCallExpressionInCJS5.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInCJS5.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInCJS5.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInCJS5.symbols b/tests/baselines/reference/importCallExpressionInCJS5.symbols index 1d2a9aec25c..34a1dcf4d7b 100644 --- a/tests/baselines/reference/importCallExpressionInCJS5.symbols +++ b/tests/baselines/reference/importCallExpressionInCJS5.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -9,11 +9,11 @@ export class B { export function foo() { return "foo" } >foo : Symbol(foo, Decl(0.ts, 2, 1)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : Symbol(backup, Decl(1.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === declare var console: any; >console : Symbol(console, Decl(2.ts, 0, 11)) diff --git a/tests/baselines/reference/importCallExpressionInCJS5.types b/tests/baselines/reference/importCallExpressionInCJS5.types index 6da36879f64..2ea666ba672 100644 --- a/tests/baselines/reference/importCallExpressionInCJS5.types +++ b/tests/baselines/reference/importCallExpressionInCJS5.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -11,12 +11,12 @@ export function foo() { return "foo" } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : () => string >"backup" : "backup" -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === declare var console: any; >console : any @@ -24,8 +24,8 @@ class C { >C : C private myModule = import("./0"); ->myModule : Promise ->import("./0") : Promise +>myModule : Promise +>import("./0") : Promise >"./0" : "./0" method() { @@ -33,13 +33,13 @@ class C { this.myModule.then(Zero => { >this.myModule.then(Zero => { console.log(Zero.foo()); }, async err => { console.log(err); let one = await import("./1"); console.log(one.backup()); }) : Promise ->this.myModule.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->this.myModule : Promise +>this.myModule.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>this.myModule : Promise >this : this ->myModule : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->Zero => { console.log(Zero.foo()); } : (Zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => void ->Zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>myModule : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>Zero => { console.log(Zero.foo()); } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void +>Zero : typeof "tests/cases/conformance/dynamicImport/0" console.log(Zero.foo()); >console.log(Zero.foo()) : any @@ -48,7 +48,7 @@ class C { >log : any >Zero.foo() : string >Zero.foo : () => string ->Zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>Zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }, async err => { @@ -63,9 +63,9 @@ class C { >err : any let one = await import("./1"); ->one : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->await import("./1") : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->import("./1") : Promise +>one : typeof "tests/cases/conformance/dynamicImport/1" +>await import("./1") : typeof "tests/cases/conformance/dynamicImport/1" +>import("./1") : Promise >"./1" : "./1" console.log(one.backup()); @@ -75,7 +75,7 @@ class C { >log : any >one.backup() : string >one.backup : () => string ->one : typeof "tests/cases/conformance/es2018/dynamicImport/1" +>one : typeof "tests/cases/conformance/dynamicImport/1" >backup : () => string }); diff --git a/tests/baselines/reference/importCallExpressionInScriptContext1.js b/tests/baselines/reference/importCallExpressionInScriptContext1.js index 68e51497d14..2c2d2f904d5 100644 --- a/tests/baselines/reference/importCallExpressionInScriptContext1.js +++ b/tests/baselines/reference/importCallExpressionInScriptContext1.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInScriptContext1.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInScriptContext1.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionInScriptContext1.symbols b/tests/baselines/reference/importCallExpressionInScriptContext1.symbols index 21e63635ed4..513612056a8 100644 --- a/tests/baselines/reference/importCallExpressionInScriptContext1.symbols +++ b/tests/baselines/reference/importCallExpressionInScriptContext1.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 0, 3)) diff --git a/tests/baselines/reference/importCallExpressionInScriptContext1.types b/tests/baselines/reference/importCallExpressionInScriptContext1.types index 82e00221e33..c318667c7d8 100644 --- a/tests/baselines/reference/importCallExpressionInScriptContext1.types +++ b/tests/baselines/reference/importCallExpressionInScriptContext1.types @@ -1,12 +1,12 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" function arguments() { } // this is allow as the file doesn't have implicit "use strict" diff --git a/tests/baselines/reference/importCallExpressionInScriptContext2.errors.txt b/tests/baselines/reference/importCallExpressionInScriptContext2.errors.txt index d87798eb0c9..9020963f68f 100644 --- a/tests/baselines/reference/importCallExpressionInScriptContext2.errors.txt +++ b/tests/baselines/reference/importCallExpressionInScriptContext2.errors.txt @@ -1,10 +1,10 @@ -tests/cases/conformance/es2018/dynamicImport/1.ts(3,10): error TS1100: Invalid use of 'arguments' in strict mode. +tests/cases/conformance/dynamicImport/1.ts(3,10): error TS1100: Invalid use of 'arguments' in strict mode. -==== tests/cases/conformance/es2018/dynamicImport/0.ts (0 errors) ==== +==== tests/cases/conformance/dynamicImport/0.ts (0 errors) ==== export function foo() { return "foo"; } -==== tests/cases/conformance/es2018/dynamicImport/1.ts (1 errors) ==== +==== tests/cases/conformance/dynamicImport/1.ts (1 errors) ==== "use strict" var p1 = import("./0"); function arguments() { } diff --git a/tests/baselines/reference/importCallExpressionInScriptContext2.js b/tests/baselines/reference/importCallExpressionInScriptContext2.js index f8bf268468c..6b6e0109fda 100644 --- a/tests/baselines/reference/importCallExpressionInScriptContext2.js +++ b/tests/baselines/reference/importCallExpressionInScriptContext2.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInScriptContext2.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInScriptContext2.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionInSystem1.js b/tests/baselines/reference/importCallExpressionInSystem1.js index d200111c70c..d74eb6ffc76 100644 --- a/tests/baselines/reference/importCallExpressionInSystem1.js +++ b/tests/baselines/reference/importCallExpressionInSystem1.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInSystem1.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInSystem1.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionInSystem1.symbols b/tests/baselines/reference/importCallExpressionInSystem1.symbols index 15356c694ed..333251da662 100644 --- a/tests/baselines/reference/importCallExpressionInSystem1.symbols +++ b/tests/baselines/reference/importCallExpressionInSystem1.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 1, 3)) diff --git a/tests/baselines/reference/importCallExpressionInSystem1.types b/tests/baselines/reference/importCallExpressionInSystem1.types index 2733f3ff14a..59da055ee01 100644 --- a/tests/baselines/reference/importCallExpressionInSystem1.types +++ b/tests/baselines/reference/importCallExpressionInSystem1.types @@ -1,30 +1,30 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" p1.then(zero => { >p1.then(zero => { return zero.foo();}) : Promise ->p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->p1 : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>p1 : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string +>zero : typeof "tests/cases/conformance/dynamicImport/0" return zero.foo(); >zero.foo() : string >zero.foo : () => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }); @@ -33,7 +33,7 @@ function foo() { >foo : () => void const p2 = import("./0"); ->p2 : Promise ->import("./0") : Promise +>p2 : Promise +>import("./0") : Promise >"./0" : "./0" } diff --git a/tests/baselines/reference/importCallExpressionInSystem2.js b/tests/baselines/reference/importCallExpressionInSystem2.js index 704af5822b3..ea84e47e63c 100644 --- a/tests/baselines/reference/importCallExpressionInSystem2.js +++ b/tests/baselines/reference/importCallExpressionInSystem2.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInSystem2.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInSystem2.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInSystem2.symbols b/tests/baselines/reference/importCallExpressionInSystem2.symbols index 7db47944520..16fc79c774f 100644 --- a/tests/baselines/reference/importCallExpressionInSystem2.symbols +++ b/tests/baselines/reference/importCallExpressionInSystem2.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -6,7 +6,7 @@ export class B { >print : Symbol(B.print, Decl(0.ts, 0, 16)) } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === // We use Promise for now as there is no way to specify shape of module object function foo(x: Promise) { >foo : Symbol(foo, Decl(2.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionInSystem2.types b/tests/baselines/reference/importCallExpressionInSystem2.types index 2db06142911..44b17eb51fd 100644 --- a/tests/baselines/reference/importCallExpressionInSystem2.types +++ b/tests/baselines/reference/importCallExpressionInSystem2.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -7,7 +7,7 @@ export class B { >"I am B" : "I am B" } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === // We use Promise for now as there is no way to specify shape of module object function foo(x: Promise) { >foo : (x: Promise) => void @@ -41,6 +41,6 @@ function foo(x: Promise) { foo(import("./0")); >foo(import("./0")) : void >foo : (x: Promise) => void ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" diff --git a/tests/baselines/reference/importCallExpressionInSystem3.js b/tests/baselines/reference/importCallExpressionInSystem3.js index cdc6856d96b..309be9114fe 100644 --- a/tests/baselines/reference/importCallExpressionInSystem3.js +++ b/tests/baselines/reference/importCallExpressionInSystem3.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInSystem3.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInSystem3.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInSystem3.symbols b/tests/baselines/reference/importCallExpressionInSystem3.symbols index 06b328f5745..5ca85d6e693 100644 --- a/tests/baselines/reference/importCallExpressionInSystem3.symbols +++ b/tests/baselines/reference/importCallExpressionInSystem3.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -6,7 +6,7 @@ export class B { >print : Symbol(B.print, Decl(0.ts, 0, 16)) } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function foo() { >foo : Symbol(foo, Decl(2.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionInSystem3.types b/tests/baselines/reference/importCallExpressionInSystem3.types index e88ddd04431..e517be6e722 100644 --- a/tests/baselines/reference/importCallExpressionInSystem3.types +++ b/tests/baselines/reference/importCallExpressionInSystem3.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -7,16 +7,16 @@ export class B { >"I am B" : "I am B" } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function foo() { >foo : () => Promise class C extends (await import("./0")).B {} >C : C >(await import("./0")).B : B ->(await import("./0")) : typeof "tests/cases/conformance/es2018/dynamicImport/0" ->await import("./0") : typeof "tests/cases/conformance/es2018/dynamicImport/0" ->import("./0") : Promise +>(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0" +>await import("./0") : typeof "tests/cases/conformance/dynamicImport/0" +>import("./0") : Promise >"./0" : "./0" >B : typeof B diff --git a/tests/baselines/reference/importCallExpressionInSystem4.js b/tests/baselines/reference/importCallExpressionInSystem4.js index 81562b65212..ac01a0439e8 100644 --- a/tests/baselines/reference/importCallExpressionInSystem4.js +++ b/tests/baselines/reference/importCallExpressionInSystem4.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInSystem4.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInSystem4.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInSystem4.symbols b/tests/baselines/reference/importCallExpressionInSystem4.symbols index 1d2a9aec25c..34a1dcf4d7b 100644 --- a/tests/baselines/reference/importCallExpressionInSystem4.symbols +++ b/tests/baselines/reference/importCallExpressionInSystem4.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -9,11 +9,11 @@ export class B { export function foo() { return "foo" } >foo : Symbol(foo, Decl(0.ts, 2, 1)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : Symbol(backup, Decl(1.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === declare var console: any; >console : Symbol(console, Decl(2.ts, 0, 11)) diff --git a/tests/baselines/reference/importCallExpressionInSystem4.types b/tests/baselines/reference/importCallExpressionInSystem4.types index 6da36879f64..2ea666ba672 100644 --- a/tests/baselines/reference/importCallExpressionInSystem4.types +++ b/tests/baselines/reference/importCallExpressionInSystem4.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -11,12 +11,12 @@ export function foo() { return "foo" } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : () => string >"backup" : "backup" -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === declare var console: any; >console : any @@ -24,8 +24,8 @@ class C { >C : C private myModule = import("./0"); ->myModule : Promise ->import("./0") : Promise +>myModule : Promise +>import("./0") : Promise >"./0" : "./0" method() { @@ -33,13 +33,13 @@ class C { this.myModule.then(Zero => { >this.myModule.then(Zero => { console.log(Zero.foo()); }, async err => { console.log(err); let one = await import("./1"); console.log(one.backup()); }) : Promise ->this.myModule.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->this.myModule : Promise +>this.myModule.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>this.myModule : Promise >this : this ->myModule : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->Zero => { console.log(Zero.foo()); } : (Zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => void ->Zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>myModule : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>Zero => { console.log(Zero.foo()); } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void +>Zero : typeof "tests/cases/conformance/dynamicImport/0" console.log(Zero.foo()); >console.log(Zero.foo()) : any @@ -48,7 +48,7 @@ class C { >log : any >Zero.foo() : string >Zero.foo : () => string ->Zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>Zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }, async err => { @@ -63,9 +63,9 @@ class C { >err : any let one = await import("./1"); ->one : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->await import("./1") : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->import("./1") : Promise +>one : typeof "tests/cases/conformance/dynamicImport/1" +>await import("./1") : typeof "tests/cases/conformance/dynamicImport/1" +>import("./1") : Promise >"./1" : "./1" console.log(one.backup()); @@ -75,7 +75,7 @@ class C { >log : any >one.backup() : string >one.backup : () => string ->one : typeof "tests/cases/conformance/es2018/dynamicImport/1" +>one : typeof "tests/cases/conformance/dynamicImport/1" >backup : () => string }); diff --git a/tests/baselines/reference/importCallExpressionInUMD1.js b/tests/baselines/reference/importCallExpressionInUMD1.js index 0886da93287..f1bfcd3cc71 100644 --- a/tests/baselines/reference/importCallExpressionInUMD1.js +++ b/tests/baselines/reference/importCallExpressionInUMD1.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInUMD1.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInUMD1.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/importCallExpressionInUMD1.symbols b/tests/baselines/reference/importCallExpressionInUMD1.symbols index 15356c694ed..333251da662 100644 --- a/tests/baselines/reference/importCallExpressionInUMD1.symbols +++ b/tests/baselines/reference/importCallExpressionInUMD1.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : Symbol(foo, Decl(0.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); var p1 = import("./0"); >p1 : Symbol(p1, Decl(1.ts, 1, 3)) diff --git a/tests/baselines/reference/importCallExpressionInUMD1.types b/tests/baselines/reference/importCallExpressionInUMD1.types index 2733f3ff14a..59da055ee01 100644 --- a/tests/baselines/reference/importCallExpressionInUMD1.types +++ b/tests/baselines/reference/importCallExpressionInUMD1.types @@ -1,30 +1,30 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export function foo() { return "foo"; } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import("./0"); ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" var p1 = import("./0"); ->p1 : Promise ->import("./0") : Promise +>p1 : Promise +>import("./0") : Promise >"./0" : "./0" p1.then(zero => { >p1.then(zero => { return zero.foo();}) : Promise ->p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->p1 : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>p1.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>p1 : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>zero => { return zero.foo();} : (zero: typeof "tests/cases/conformance/dynamicImport/0") => string +>zero : typeof "tests/cases/conformance/dynamicImport/0" return zero.foo(); >zero.foo() : string >zero.foo : () => string ->zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }); @@ -33,7 +33,7 @@ function foo() { >foo : () => void const p2 = import("./0"); ->p2 : Promise ->import("./0") : Promise +>p2 : Promise +>import("./0") : Promise >"./0" : "./0" } diff --git a/tests/baselines/reference/importCallExpressionInUMD2.js b/tests/baselines/reference/importCallExpressionInUMD2.js index 1e268403088..db8b87a2f79 100644 --- a/tests/baselines/reference/importCallExpressionInUMD2.js +++ b/tests/baselines/reference/importCallExpressionInUMD2.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInUMD2.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInUMD2.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInUMD2.symbols b/tests/baselines/reference/importCallExpressionInUMD2.symbols index 7db47944520..16fc79c774f 100644 --- a/tests/baselines/reference/importCallExpressionInUMD2.symbols +++ b/tests/baselines/reference/importCallExpressionInUMD2.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -6,7 +6,7 @@ export class B { >print : Symbol(B.print, Decl(0.ts, 0, 16)) } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === // We use Promise for now as there is no way to specify shape of module object function foo(x: Promise) { >foo : Symbol(foo, Decl(2.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionInUMD2.types b/tests/baselines/reference/importCallExpressionInUMD2.types index 2db06142911..44b17eb51fd 100644 --- a/tests/baselines/reference/importCallExpressionInUMD2.types +++ b/tests/baselines/reference/importCallExpressionInUMD2.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -7,7 +7,7 @@ export class B { >"I am B" : "I am B" } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === // We use Promise for now as there is no way to specify shape of module object function foo(x: Promise) { >foo : (x: Promise) => void @@ -41,6 +41,6 @@ function foo(x: Promise) { foo(import("./0")); >foo(import("./0")) : void >foo : (x: Promise) => void ->import("./0") : Promise +>import("./0") : Promise >"./0" : "./0" diff --git a/tests/baselines/reference/importCallExpressionInUMD3.js b/tests/baselines/reference/importCallExpressionInUMD3.js index 228c43fd0a2..41106e3ab78 100644 --- a/tests/baselines/reference/importCallExpressionInUMD3.js +++ b/tests/baselines/reference/importCallExpressionInUMD3.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInUMD3.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInUMD3.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInUMD3.symbols b/tests/baselines/reference/importCallExpressionInUMD3.symbols index 06b328f5745..5ca85d6e693 100644 --- a/tests/baselines/reference/importCallExpressionInUMD3.symbols +++ b/tests/baselines/reference/importCallExpressionInUMD3.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -6,7 +6,7 @@ export class B { >print : Symbol(B.print, Decl(0.ts, 0, 16)) } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function foo() { >foo : Symbol(foo, Decl(2.ts, 0, 0)) diff --git a/tests/baselines/reference/importCallExpressionInUMD3.types b/tests/baselines/reference/importCallExpressionInUMD3.types index e88ddd04431..e517be6e722 100644 --- a/tests/baselines/reference/importCallExpressionInUMD3.types +++ b/tests/baselines/reference/importCallExpressionInUMD3.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -7,16 +7,16 @@ export class B { >"I am B" : "I am B" } -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === async function foo() { >foo : () => Promise class C extends (await import("./0")).B {} >C : C >(await import("./0")).B : B ->(await import("./0")) : typeof "tests/cases/conformance/es2018/dynamicImport/0" ->await import("./0") : typeof "tests/cases/conformance/es2018/dynamicImport/0" ->import("./0") : Promise +>(await import("./0")) : typeof "tests/cases/conformance/dynamicImport/0" +>await import("./0") : typeof "tests/cases/conformance/dynamicImport/0" +>import("./0") : Promise >"./0" : "./0" >B : typeof B diff --git a/tests/baselines/reference/importCallExpressionInUMD4.js b/tests/baselines/reference/importCallExpressionInUMD4.js index 677ba8c3d27..47ba83b1718 100644 --- a/tests/baselines/reference/importCallExpressionInUMD4.js +++ b/tests/baselines/reference/importCallExpressionInUMD4.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionInUMD4.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionInUMD4.ts] //// //// [0.ts] export class B { diff --git a/tests/baselines/reference/importCallExpressionInUMD4.symbols b/tests/baselines/reference/importCallExpressionInUMD4.symbols index 1d2a9aec25c..34a1dcf4d7b 100644 --- a/tests/baselines/reference/importCallExpressionInUMD4.symbols +++ b/tests/baselines/reference/importCallExpressionInUMD4.symbols @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : Symbol(B, Decl(0.ts, 0, 0)) @@ -9,11 +9,11 @@ export class B { export function foo() { return "foo" } >foo : Symbol(foo, Decl(0.ts, 2, 1)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : Symbol(backup, Decl(1.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === declare var console: any; >console : Symbol(console, Decl(2.ts, 0, 11)) diff --git a/tests/baselines/reference/importCallExpressionInUMD4.types b/tests/baselines/reference/importCallExpressionInUMD4.types index 6da36879f64..2ea666ba672 100644 --- a/tests/baselines/reference/importCallExpressionInUMD4.types +++ b/tests/baselines/reference/importCallExpressionInUMD4.types @@ -1,4 +1,4 @@ -=== tests/cases/conformance/es2018/dynamicImport/0.ts === +=== tests/cases/conformance/dynamicImport/0.ts === export class B { >B : B @@ -11,12 +11,12 @@ export function foo() { return "foo" } >foo : () => string >"foo" : "foo" -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === export function backup() { return "backup"; } >backup : () => string >"backup" : "backup" -=== tests/cases/conformance/es2018/dynamicImport/2.ts === +=== tests/cases/conformance/dynamicImport/2.ts === declare var console: any; >console : any @@ -24,8 +24,8 @@ class C { >C : C private myModule = import("./0"); ->myModule : Promise ->import("./0") : Promise +>myModule : Promise +>import("./0") : Promise >"./0" : "./0" method() { @@ -33,13 +33,13 @@ class C { this.myModule.then(Zero => { >this.myModule.then(Zero => { console.log(Zero.foo()); }, async err => { console.log(err); let one = await import("./1"); console.log(one.backup()); }) : Promise ->this.myModule.then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->this.myModule : Promise +>this.myModule.then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>this.myModule : Promise >this : this ->myModule : Promise ->then : (onfulfilled?: (value: typeof "tests/cases/conformance/es2018/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise ->Zero => { console.log(Zero.foo()); } : (Zero: typeof "tests/cases/conformance/es2018/dynamicImport/0") => void ->Zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>myModule : Promise +>then : (onfulfilled?: (value: typeof "tests/cases/conformance/dynamicImport/0") => TResult1 | PromiseLike, onrejected?: (reason: any) => TResult2 | PromiseLike) => Promise +>Zero => { console.log(Zero.foo()); } : (Zero: typeof "tests/cases/conformance/dynamicImport/0") => void +>Zero : typeof "tests/cases/conformance/dynamicImport/0" console.log(Zero.foo()); >console.log(Zero.foo()) : any @@ -48,7 +48,7 @@ class C { >log : any >Zero.foo() : string >Zero.foo : () => string ->Zero : typeof "tests/cases/conformance/es2018/dynamicImport/0" +>Zero : typeof "tests/cases/conformance/dynamicImport/0" >foo : () => string }, async err => { @@ -63,9 +63,9 @@ class C { >err : any let one = await import("./1"); ->one : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->await import("./1") : typeof "tests/cases/conformance/es2018/dynamicImport/1" ->import("./1") : Promise +>one : typeof "tests/cases/conformance/dynamicImport/1" +>await import("./1") : typeof "tests/cases/conformance/dynamicImport/1" +>import("./1") : Promise >"./1" : "./1" console.log(one.backup()); @@ -75,7 +75,7 @@ class C { >log : any >one.backup() : string >one.backup : () => string ->one : typeof "tests/cases/conformance/es2018/dynamicImport/1" +>one : typeof "tests/cases/conformance/dynamicImport/1" >backup : () => string }); diff --git a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js index d9dba458296..728d6636953 100644 --- a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js +++ b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionReturnPromiseOfAny.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionReturnPromiseOfAny.ts] //// //// [defaultPath.ts] export class C {} diff --git a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.symbols b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.symbols index 275bedd4c93..0d46961475f 100644 --- a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.symbols +++ b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.symbols @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/defaultPath.ts === +=== tests/cases/conformance/dynamicImport/defaultPath.ts === export class C {} >C : Symbol(C, Decl(defaultPath.ts, 0, 0)) -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import * as defaultModule from "./defaultPath"; >defaultModule : Symbol(defaultModule, Decl(1.ts, 0, 6)) diff --git a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types index 4337e970bd1..fc52b38c1fb 100644 --- a/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types +++ b/tests/baselines/reference/importCallExpressionReturnPromiseOfAny.types @@ -1,8 +1,8 @@ -=== tests/cases/conformance/es2018/dynamicImport/defaultPath.ts === +=== tests/cases/conformance/dynamicImport/defaultPath.ts === export class C {} >C : C -=== tests/cases/conformance/es2018/dynamicImport/1.ts === +=== tests/cases/conformance/dynamicImport/1.ts === import * as defaultModule from "./defaultPath"; >defaultModule : typeof defaultModule diff --git a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.errors.txt b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.errors.txt index dd705582827..a1159a31ebd 100644 --- a/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.errors.txt +++ b/tests/baselines/reference/importCallExpressionSpecifierNotStringTypeError.errors.txt @@ -1,11 +1,11 @@ -tests/cases/conformance/es2018/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(5,8): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean'. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(6,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean'. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(7,19): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean | "defaulPath"'. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(12,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'string[]'. -tests/cases/conformance/es2018/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(13,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type '() => string'. +tests/cases/conformance/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(5,8): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean'. +tests/cases/conformance/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(6,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean'. +tests/cases/conformance/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(7,19): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'boolean | "defaulPath"'. +tests/cases/conformance/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(12,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type 'string[]'. +tests/cases/conformance/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts(13,17): error TS7036: Dynamic import's specifier must be of type 'string', but here has type '() => string'. -==== tests/cases/conformance/es2018/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts (5 errors) ==== +==== tests/cases/conformance/dynamicImport/importCallExpressionSpecifierNotStringTypeError.ts (5 errors) ==== declare function getSpecifier(): boolean; declare var whatToLoad: boolean; diff --git a/tests/baselines/reference/importCallExpressionWithTypeArgument.errors.txt b/tests/baselines/reference/importCallExpressionWithTypeArgument.errors.txt index f9375ec695f..8adf2789585 100644 --- a/tests/baselines/reference/importCallExpressionWithTypeArgument.errors.txt +++ b/tests/baselines/reference/importCallExpressionWithTypeArgument.errors.txt @@ -1,11 +1,11 @@ -tests/cases/conformance/es2018/dynamicImport/1.ts(2,10): error TS1326: Dynamic import cannot have type arguments -tests/cases/conformance/es2018/dynamicImport/1.ts(3,10): error TS1326: Dynamic import cannot have type arguments +tests/cases/conformance/dynamicImport/1.ts(2,10): error TS1326: Dynamic import cannot have type arguments +tests/cases/conformance/dynamicImport/1.ts(3,10): error TS1326: Dynamic import cannot have type arguments -==== tests/cases/conformance/es2018/dynamicImport/0.ts (0 errors) ==== +==== tests/cases/conformance/dynamicImport/0.ts (0 errors) ==== export function foo() { return "foo"; } -==== tests/cases/conformance/es2018/dynamicImport/1.ts (2 errors) ==== +==== tests/cases/conformance/dynamicImport/1.ts (2 errors) ==== "use strict" var p1 = import>("./0"); // error ~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/baselines/reference/importCallExpressionWithTypeArgument.js b/tests/baselines/reference/importCallExpressionWithTypeArgument.js index de487bc45cc..d8690cf5d75 100644 --- a/tests/baselines/reference/importCallExpressionWithTypeArgument.js +++ b/tests/baselines/reference/importCallExpressionWithTypeArgument.js @@ -1,4 +1,4 @@ -//// [tests/cases/conformance/es2018/dynamicImport/importCallExpressionWithTypeArgument.ts] //// +//// [tests/cases/conformance/dynamicImport/importCallExpressionWithTypeArgument.ts] //// //// [0.ts] export function foo() { return "foo"; } diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt index 16fb5e7b205..f746915da7d 100644 --- a/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt +++ b/tests/baselines/reference/transpile/Report an error when compiler-options module-kind is out-of-range.errors.txt @@ -1,6 +1,6 @@ -error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2018'. +error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'. -!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2018'. +!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'. ==== file.ts (0 errors) ==== \ No newline at end of file diff --git a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt index 16fb5e7b205..f746915da7d 100644 --- a/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt +++ b/tests/baselines/reference/transpile/Report an error when compiler-options target-script is out-of-range.errors.txt @@ -1,6 +1,6 @@ -error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2018'. +error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'. -!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'es2018'. +!!! error TS6046: Argument for '--module' option must be: 'none', 'commonjs', 'amd', 'system', 'umd', 'es6', 'es2015', 'esnext'. ==== file.ts (0 errors) ==== \ No newline at end of file