diff --git a/tests/cases/conformance/es2018/dynamicImport/importCallExpression2ES2018.ts b/tests/cases/conformance/es2018/dynamicImport/importCallExpression2ES2018.ts index 57ea587ce73..3cb6fd7bc92 100644 --- a/tests/cases/conformance/es2018/dynamicImport/importCallExpression2ES2018.ts +++ b/tests/cases/conformance/es2018/dynamicImport/importCallExpression2ES2018.ts @@ -1,10 +1,17 @@ // @module: es2018 -// @lib: es2015 +// @target: esnext // @filename: 0.ts -export function foo(){} +export class B { + print() { return "I am B"} +} -// @filename: 1.ts -import * as Zero from "./0" // Should preserve ES2015 module syntax -import("./0"); -var p1 = import("./0"); -export default p1; +// @filename: 2.ts +// We use Promise for now as there is no way to specify shape of module object +function foo(x: Promise) { + x.then(value => { + let b = new value.B(); + b.print(); + }) +} + +foo(import("./0")); \ No newline at end of file diff --git a/tests/cases/conformance/es2018/dynamicImport/importCallExpression3ES2018.ts b/tests/cases/conformance/es2018/dynamicImport/importCallExpression3ES2018.ts index 3cb6fd7bc92..6b2fc219d24 100644 --- a/tests/cases/conformance/es2018/dynamicImport/importCallExpression3ES2018.ts +++ b/tests/cases/conformance/es2018/dynamicImport/importCallExpression3ES2018.ts @@ -6,12 +6,9 @@ export class B { } // @filename: 2.ts -// We use Promise for now as there is no way to specify shape of module object -function foo(x: Promise) { - x.then(value => { - let b = new value.B(); - b.print(); - }) +async function foo() { + class C extends (await import("./0")).B {} + var c = new C(); + c.print(); } - -foo(import("./0")); \ No newline at end of file +foo(); \ No newline at end of file diff --git a/tests/cases/conformance/es2018/dynamicImport/importCallExpression4ES2018.ts b/tests/cases/conformance/es2018/dynamicImport/importCallExpression4ES2018.ts index 6b2fc219d24..03e72bb6d4d 100644 --- a/tests/cases/conformance/es2018/dynamicImport/importCallExpression4ES2018.ts +++ b/tests/cases/conformance/es2018/dynamicImport/importCallExpression4ES2018.ts @@ -5,10 +5,22 @@ export class B { print() { return "I am B"} } +export function foo() { return "foo" } + +// @filename: 1.ts +export function backup() { return "backup"; } + // @filename: 2.ts -async function foo() { - class C extends (await import("./0")).B {} - var c = new C(); - c.print(); -} -foo(); \ No newline at end of file +declare var console: any; +class C { + private myModule = import("./0"); + method() { + this.myModule.then(Zero => { + console.log(Zero.foo()); + }, async err => { + console.log(err); + let one = await import("./1"); + console.log(one.backup()); + }); + } +} \ No newline at end of file diff --git a/tests/cases/conformance/es2018/dynamicImport/importCallExpression5ES2018.ts b/tests/cases/conformance/es2018/dynamicImport/importCallExpression5ES2018.ts deleted file mode 100644 index 03e72bb6d4d..00000000000 --- a/tests/cases/conformance/es2018/dynamicImport/importCallExpression5ES2018.ts +++ /dev/null @@ -1,26 +0,0 @@ -// @module: es2018 -// @target: esnext -// @filename: 0.ts -export class B { - print() { return "I am B"} -} - -export function foo() { return "foo" } - -// @filename: 1.ts -export function backup() { return "backup"; } - -// @filename: 2.ts -declare var console: any; -class C { - private myModule = import("./0"); - method() { - this.myModule.then(Zero => { - console.log(Zero.foo()); - }, async err => { - console.log(err); - let one = await import("./1"); - console.log(one.backup()); - }); - } -} \ No newline at end of file