Merge branch 'denoland:main' into main

10 files changed, 57 insertions, 0 deletions

diff --git a/tests/specs/run/ts_import_from_js/005_more_imports.ts b/tests/specs/run/ts_import_from_js/005_more_imports.ts
new file mode 100644
index 000000000..c69556be1
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/005_more_imports.ts
@@ -0,0 +1,11 @@
+import { printHello3, returnsFoo2, returnsHi } from "./mod1.ts";
+
+printHello3();
+
+if (returnsHi() !== "Hi") {
+  throw Error("Unexpected");
+}
+
+if (returnsFoo2() !== "Foo") {
+  throw Error("Unexpected");
+}
diff --git a/tests/specs/run/ts_import_from_js/__test__.jsonc b/tests/specs/run/ts_import_from_js/__test__.jsonc
new file mode 100644
index 000000000..de11873cb
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/__test__.jsonc
@@ -0,0 +1,4 @@
+{
+  "args": "run --allow-import --quiet --reload ts_import_from_js/main.js",
+  "output": "ts_import_from_js/main.out"
+}
diff --git a/tests/specs/run/ts_import_from_js/mod1.ts b/tests/specs/run/ts_import_from_js/mod1.ts
new file mode 100644
index 000000000..5e58f432e
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/mod1.ts
@@ -0,0 +1,17 @@
+import { printHello2, returnsFoo } from "./subdir2/mod2.ts";
+
+export function returnsHi(): string {
+  return "Hi";
+}
+
+export function returnsFoo2(): string {
+  return returnsFoo();
+}
+
+export function printHello3() {
+  printHello2();
+}
+
+export function throwsError() {
+  throw Error("exception from mod1");
+}
diff --git a/tests/specs/run/ts_import_from_js/mod2.ts b/tests/specs/run/ts_import_from_js/mod2.ts
new file mode 100644
index 000000000..ce1adc0e8
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/mod2.ts
@@ -0,0 +1 @@
+export { printHello } from "./print_hello.ts";
diff --git a/tests/specs/run/ts_import_from_js/print_hello.ts b/tests/specs/run/ts_import_from_js/print_hello.ts
new file mode 100644
index 000000000..b9c0ad527
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/print_hello.ts
@@ -0,0 +1,3 @@
+export function printHello() {
+  console.log("Hello");
+}
diff --git a/tests/specs/run/ts_import_from_js/subdir2/dynamic_import.ts b/tests/specs/run/ts_import_from_js/subdir2/dynamic_import.ts
new file mode 100644
index 000000000..59beb64c3
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/subdir2/dynamic_import.ts
@@ -0,0 +1,4 @@
+(async () => {
+  const { printHello } = await import("../mod2.ts");
+  printHello();
+})();
diff --git a/tests/specs/run/ts_import_from_js/subdir2/mod2.ts b/tests/specs/run/ts_import_from_js/subdir2/mod2.ts
new file mode 100644
index 000000000..9071d0aeb
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/subdir2/mod2.ts
@@ -0,0 +1,9 @@
+import { printHello } from "../print_hello.ts";
+
+export function returnsFoo(): string {
+  return "Foo";
+}
+
+export function printHello2() {
+  printHello();
+}
diff --git a/tests/specs/run/ts_import_from_js/ts_import_from_js/deps.js b/tests/specs/run/ts_import_from_js/ts_import_from_js/deps.js
new file mode 100644
index 000000000..746b5cf6b
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/ts_import_from_js/deps.js
@@ -0,0 +1,2 @@
+import "../005_more_imports.ts";
+export { printHello } from "http://localhost:4545/subdir/mod2.ts";
diff --git a/tests/specs/run/ts_import_from_js/ts_import_from_js/main.js b/tests/specs/run/ts_import_from_js/ts_import_from_js/main.js
new file mode 100644
index 000000000..32d6c29a1
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/ts_import_from_js/main.js
@@ -0,0 +1,3 @@
+import { printHello } from "./deps.js";
+printHello();
+console.log("success");
diff --git a/tests/specs/run/ts_import_from_js/ts_import_from_js/main.out b/tests/specs/run/ts_import_from_js/ts_import_from_js/main.out
new file mode 100644
index 000000000..e1d7a869f
--- /dev/null
+++ b/tests/specs/run/ts_import_from_js/ts_import_from_js/main.out
@@ -0,0 +1,3 @@
+Hello
+Hello
+success