From 35220f0069931c6c4b9023c2d123f3b37f7e9c56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Tue, 23 Apr 2024 16:21:06 +0100
Subject: fix(workspace): provide workspace members as 'imports' in import map
 (#23492)

This commit changes the workspace support to provide all workspace
members to be available as imports based on their names and versions.

Closes https://github.com/denoland/deno/issues/23343
---
 tests/testdata/run/workspaces/basic/bar/deno.json  |  8 --------
 .../testdata/run/workspaces/basic/bar/fizz/buzz.ts |  1 -
 tests/testdata/run/workspaces/basic/bar/mod.ts     |  5 -----
 .../run/workspaces/basic/bar/some_mod/hello.ts     |  1 -
 tests/testdata/run/workspaces/basic/deno.json      |  9 ---------
 .../testdata/run/workspaces/basic/foo/bar/hello.ts |  1 -
 tests/testdata/run/workspaces/basic/foo/deno.json  |  8 --------
 .../testdata/run/workspaces/basic/foo/fizz/buzz.ts |  1 -
 tests/testdata/run/workspaces/basic/foo/mod.ts     |  5 -----
 tests/testdata/run/workspaces/basic/main.out       | 22 ----------------------
 tests/testdata/run/workspaces/basic/main.ts        |  5 -----
 11 files changed, 66 deletions(-)
 delete mode 100644 tests/testdata/run/workspaces/basic/bar/deno.json
 delete mode 100644 tests/testdata/run/workspaces/basic/bar/fizz/buzz.ts
 delete mode 100644 tests/testdata/run/workspaces/basic/bar/mod.ts
 delete mode 100644 tests/testdata/run/workspaces/basic/bar/some_mod/hello.ts
 delete mode 100644 tests/testdata/run/workspaces/basic/deno.json
 delete mode 100644 tests/testdata/run/workspaces/basic/foo/bar/hello.ts
 delete mode 100644 tests/testdata/run/workspaces/basic/foo/deno.json
 delete mode 100644 tests/testdata/run/workspaces/basic/foo/fizz/buzz.ts
 delete mode 100644 tests/testdata/run/workspaces/basic/foo/mod.ts
 delete mode 100644 tests/testdata/run/workspaces/basic/main.out
 delete mode 100644 tests/testdata/run/workspaces/basic/main.ts

(limited to 'tests/testdata/run/workspaces/basic')

diff --git a/tests/testdata/run/workspaces/basic/bar/deno.json b/tests/testdata/run/workspaces/basic/bar/deno.json
deleted file mode 100644
index ef3bfc37a..000000000
--- a/tests/testdata/run/workspaces/basic/bar/deno.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "asdfasdfasdf",
-  "version": "0.0.0",
-  "imports": {
-    "@/": "./",
-    "secret_mod/": "./some_mod/"
-  }
-}
diff --git a/tests/testdata/run/workspaces/basic/bar/fizz/buzz.ts b/tests/testdata/run/workspaces/basic/bar/fizz/buzz.ts
deleted file mode 100644
index f88d62fcc..000000000
--- a/tests/testdata/run/workspaces/basic/bar/fizz/buzz.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const buzz = "buzz from bar";
diff --git a/tests/testdata/run/workspaces/basic/bar/mod.ts b/tests/testdata/run/workspaces/basic/bar/mod.ts
deleted file mode 100644
index 6f898e389..000000000
--- a/tests/testdata/run/workspaces/basic/bar/mod.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { hello } from "secret_mod/hello.ts";
-import { buzz } from "@/fizz/buzz.ts";
-
-console.log(hello);
-console.log(buzz);
diff --git a/tests/testdata/run/workspaces/basic/bar/some_mod/hello.ts b/tests/testdata/run/workspaces/basic/bar/some_mod/hello.ts
deleted file mode 100644
index 1013de8d2..000000000
--- a/tests/testdata/run/workspaces/basic/bar/some_mod/hello.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const hello = "hello from bar";
diff --git a/tests/testdata/run/workspaces/basic/deno.json b/tests/testdata/run/workspaces/basic/deno.json
deleted file mode 100644
index b971c4f3d..000000000
--- a/tests/testdata/run/workspaces/basic/deno.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "workspaces": [
-    "foo",
-    "bar"
-  ],
-  "imports": {
-    "chalk": "npm:chalk"
-  }
-}
diff --git a/tests/testdata/run/workspaces/basic/foo/bar/hello.ts b/tests/testdata/run/workspaces/basic/foo/bar/hello.ts
deleted file mode 100644
index c8a7e57c4..000000000
--- a/tests/testdata/run/workspaces/basic/foo/bar/hello.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const hello = "hello from foo";
diff --git a/tests/testdata/run/workspaces/basic/foo/deno.json b/tests/testdata/run/workspaces/basic/foo/deno.json
deleted file mode 100644
index 46d84f06f..000000000
--- a/tests/testdata/run/workspaces/basic/foo/deno.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "qwerqwer",
-  "version": "0.0.0",
-  "imports": {
-    "~/": "./",
-    "foo/": "./bar/"
-  }
-}
diff --git a/tests/testdata/run/workspaces/basic/foo/fizz/buzz.ts b/tests/testdata/run/workspaces/basic/foo/fizz/buzz.ts
deleted file mode 100644
index 4e03777d1..000000000
--- a/tests/testdata/run/workspaces/basic/foo/fizz/buzz.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const buzz = "buzz from foo";
diff --git a/tests/testdata/run/workspaces/basic/foo/mod.ts b/tests/testdata/run/workspaces/basic/foo/mod.ts
deleted file mode 100644
index d7b16dcc0..000000000
--- a/tests/testdata/run/workspaces/basic/foo/mod.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { hello } from "foo/hello.ts";
-import { buzz } from "~/fizz/buzz.ts";
-
-console.log(hello);
-console.log(buzz);
diff --git a/tests/testdata/run/workspaces/basic/main.out b/tests/testdata/run/workspaces/basic/main.out
deleted file mode 100644
index a955ac54c..000000000
--- a/tests/testdata/run/workspaces/basic/main.out
+++ /dev/null
@@ -1,22 +0,0 @@
-[WILDCARD]Workspace config generated this import map {
-  "imports": {
-    "chalk": "npm:chalk",
-    "chalk/": "npm:/chalk/"
-  },
-  "scopes": {
-    "./foo/": {
-      "~/": "./foo/",
-      "foo/": "./foo/bar/"
-    },
-    "./bar/": {
-      "@/": "./bar/",
-      "secret_mod/": "./bar/some_mod/"
-    }
-  }
-}
-[WILDCARD]
-hello from foo
-buzz from foo
-hello from bar
-buzz from bar
-[Function: chalk][WILDCARD]
\ No newline at end of file
diff --git a/tests/testdata/run/workspaces/basic/main.ts b/tests/testdata/run/workspaces/basic/main.ts
deleted file mode 100644
index 380c97619..000000000
--- a/tests/testdata/run/workspaces/basic/main.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import chalk from "chalk";
-import "./foo/mod.ts";
-import "./bar/mod.ts";
-
-console.log(chalk);
-- 
cgit v1.2.3