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 #23343
denoland · Apr 23, 2024 · 35220f0 · 35220f0
1 parent b0d3b20
commit 35220f0
Show file tree

Hide file tree

Showing 45 changed files with 92 additions and 31 deletions.
diff --git a/cli/args/import_map.rs b/cli/args/import_map.rs
@@ -96,3 96,32 @@ fn print_import_map_diagnostics(diagnostics: &[ImportMapDiagnostic]) {
  );
  }
 }
 
 pub fn enhance_import_map_value_with_workspace_members(
  mut import_map_value: serde_json::Value,
  workspace_members: &[deno_config::WorkspaceMemberConfig],
 ) -> serde_json::Value {
  let mut imports =
  if let Some(imports) = import_map_value.get("imports").as_ref() {
  imports.as_object().unwrap().clone()
  } else {
  serde_json::Map::new()
  };
 
  for workspace_member in workspace_members {
  let name = &workspace_member.package_name;
  let version = &workspace_member.package_version;
  // Don't override existings, explicit imports
  if imports.contains_key(name) {
  continue;
  }
 
  imports.insert(
  name.to_string(),
  serde_json::Value::String(format!("jsr:{}@^{}", name, version)),
  );
  }
 
  import_map_value["imports"] = serde_json::Value::Object(imports);
  ::import_map::ext::expand_import_map_value(import_map_value)
 }
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
@@ -67,6 67,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use thiserror::Error;
 
 use crate::args::import_map::enhance_import_map_value_with_workspace_members;
 use crate::file_fetcher::FileFetcher;
 use crate::util::fs::canonicalize_path_maybe_not_exists;
 use crate::version;
@@ -975,6 976,10 @@ impl CliOptions {
  base_import_map_config,
  children_configs,
  );
  let import_map = enhance_import_map_value_with_workspace_members(
  import_map,
  &workspace_config.members,
  );
  log::debug!(
  "Workspace config generated this import map {}",
  serde_json::to_string_pretty(&import_map).unwrap()

diff --git a/tests/integration/run_tests.rs b/tests/integration/run_tests.rs
@@ -4918,35 4918,6 @@ itest!(explicit_resource_management {
  output: "run/explicit_resource_management/main.out",
 });
 
-itest!(workspaces_basic {
- args: "run -L debug -A main.ts",
- output: "run/workspaces/basic/main.out",
- cwd: Some("run/workspaces/basic/"),
- copy_temp_dir: Some("run/workspaces/basic/"),
- envs: env_vars_for_npm_tests(),
- http_server: true,
-});
-
-itest!(workspaces_member_outside_root_dir {
- args: "run -A main.ts",
- output: "run/workspaces/member_outside_root_dir/main.out",
- cwd: Some("run/workspaces/member_outside_root_dir/"),
- copy_temp_dir: Some("run/workspaces/member_outside_root_dir/"),
- envs: env_vars_for_npm_tests(),
- http_server: true,
- exit_code: 1,
-});
-
-itest!(workspaces_nested_member {
- args: "run -A main.ts",
- output: "run/workspaces/nested_member/main.out",
- cwd: Some("run/workspaces/nested_member/"),
- copy_temp_dir: Some("run/workspaces/nested_member/"),
- envs: env_vars_for_npm_tests(),
- http_server: true,
- exit_code: 1,
-});
-
 itest!(unsafe_proto {
  args: "run -A run/unsafe_proto/main.js",
  output: "run/unsafe_proto/main.out",

diff --git a/tests/specs/run/workspaces/basic/__test__.jsonc b/tests/specs/run/workspaces/basic/__test__.jsonc
@@ -0,0 1,5 @@
 {
  "args": "run -L debug -A main.ts",
  "output": "main.out",
  "tempDir": true
 }
diff --git a/...stdata/run/workspaces/basic/bar/deno.json → .../specs/run/workspaces/basic/bar/deno.json b/...stdata/run/workspaces/basic/bar/deno.json → .../specs/run/workspaces/basic/bar/deno.json
diff --git a/...ata/run/workspaces/basic/bar/fizz/buzz.ts → ...ecs/run/workspaces/basic/bar/fizz/buzz.ts b/...ata/run/workspaces/basic/bar/fizz/buzz.ts → ...ecs/run/workspaces/basic/bar/fizz/buzz.ts
diff --git a/.../testdata/run/workspaces/basic/bar/mod.ts → tests/specs/run/workspaces/basic/bar/mod.ts b/.../testdata/run/workspaces/basic/bar/mod.ts → tests/specs/run/workspaces/basic/bar/mod.ts
diff --git a/...un/workspaces/basic/bar/some_mod/hello.ts → ...un/workspaces/basic/bar/some_mod/hello.ts b/...un/workspaces/basic/bar/some_mod/hello.ts → ...un/workspaces/basic/bar/some_mod/hello.ts
diff --git a/...s/testdata/run/workspaces/basic/deno.json → tests/specs/run/workspaces/basic/deno.json b/...s/testdata/run/workspaces/basic/deno.json → tests/specs/run/workspaces/basic/deno.json
diff --git a/...ata/run/workspaces/basic/foo/bar/hello.ts → ...ecs/run/workspaces/basic/foo/bar/hello.ts b/...ata/run/workspaces/basic/foo/bar/hello.ts → ...ecs/run/workspaces/basic/foo/bar/hello.ts
diff --git a/...stdata/run/workspaces/basic/foo/deno.json → .../specs/run/workspaces/basic/foo/deno.json b/...stdata/run/workspaces/basic/foo/deno.json → .../specs/run/workspaces/basic/foo/deno.json
diff --git a/...ata/run/workspaces/basic/foo/fizz/buzz.ts → ...ecs/run/workspaces/basic/foo/fizz/buzz.ts b/...ata/run/workspaces/basic/foo/fizz/buzz.ts → ...ecs/run/workspaces/basic/foo/fizz/buzz.ts
diff --git a/.../testdata/run/workspaces/basic/foo/mod.ts → tests/specs/run/workspaces/basic/foo/mod.ts b/.../testdata/run/workspaces/basic/foo/mod.ts → tests/specs/run/workspaces/basic/foo/mod.ts
diff --git a/tests/testdata/run/workspaces/basic/main.out → tests/specs/run/workspaces/basic/main.out b/tests/testdata/run/workspaces/basic/main.out → tests/specs/run/workspaces/basic/main.out
@@ -1,7 1,11 @@
 [WILDCARD]Workspace config generated this import map {
  "imports": {
  "chalk": "npm:chalk",
- "chalk/": "npm:/chalk/"
  "chalk/": "npm:/chalk/",
  "qwerqwer": "jsr:qwerqwer@^0.0.0",
  "qwerqwer/": "jsr:/qwerqwer@^0.0.0/",
  "asdfasdfasdf": "jsr:asdfasdfasdf@^0.0.0",
  "asdfasdfasdf/": "jsr:/asdfasdfasdf@^0.0.0/"
  },
  "scopes": {
  "./foo/": {

diff --git a/tests/testdata/run/workspaces/basic/main.ts → tests/specs/run/workspaces/basic/main.ts b/tests/testdata/run/workspaces/basic/main.ts → tests/specs/run/workspaces/basic/main.ts
diff --git a/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc b/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc
@@ -0,0 1,6 @@
 {
  "args": "run -A main.ts",
  "output": "main.out",
  "tempDir": true,
  "exitCode": 1
 }
diff --git a/...kspaces/member_outside_root_dir/deno.json → ...kspaces/member_outside_root_dir/deno.json b/...kspaces/member_outside_root_dir/deno.json → ...kspaces/member_outside_root_dir/deno.json
diff --git a/.../member_outside_root_dir/foo/bar/hello.ts → .../member_outside_root_dir/foo/bar/hello.ts b/.../member_outside_root_dir/foo/bar/hello.ts → .../member_outside_root_dir/foo/bar/hello.ts
diff --git a/...ces/member_outside_root_dir/foo/deno.json → ...ces/member_outside_root_dir/foo/deno.json b/...ces/member_outside_root_dir/foo/deno.json → ...ces/member_outside_root_dir/foo/deno.json
diff --git a/.../member_outside_root_dir/foo/fizz/buzz.ts → .../member_outside_root_dir/foo/fizz/buzz.ts b/.../member_outside_root_dir/foo/fizz/buzz.ts → .../member_outside_root_dir/foo/fizz/buzz.ts
diff --git a/...spaces/member_outside_root_dir/foo/mod.ts → ...spaces/member_outside_root_dir/foo/mod.ts b/...spaces/member_outside_root_dir/foo/mod.ts → ...spaces/member_outside_root_dir/foo/mod.ts
diff --git a/...rkspaces/member_outside_root_dir/main.out → ...rkspaces/member_outside_root_dir/main.out b/...rkspaces/member_outside_root_dir/main.out → ...rkspaces/member_outside_root_dir/main.out
diff --git a/...orkspaces/member_outside_root_dir/main.ts → ...orkspaces/member_outside_root_dir/main.ts b/...orkspaces/member_outside_root_dir/main.ts → ...orkspaces/member_outside_root_dir/main.ts
diff --git a/tests/specs/run/workspaces/members_are_imports/__test__.jsonc b/tests/specs/run/workspaces/members_are_imports/__test__.jsonc
@@ -0,0 1,5 @@
 {
  "args": "run -A main.ts",
  "output": "main.out",
  "tempDir": true
 }
diff --git a/tests/specs/run/workspaces/members_are_imports/bar/deno.jsonc b/tests/specs/run/workspaces/members_are_imports/bar/deno.jsonc
@@ -0,0 1,7 @@
 {
  "name": "@deno-test/bar",
  "version": "0.0.1",
  "exports": {
  ".": "./mod.ts"
  }
 }
diff --git a/tests/specs/run/workspaces/members_are_imports/bar/mod.ts b/tests/specs/run/workspaces/members_are_imports/bar/mod.ts
@@ -0,0 1 @@
 export const value = 42;
diff --git a/tests/specs/run/workspaces/members_are_imports/deno.json b/tests/specs/run/workspaces/members_are_imports/deno.json
@@ -0,0 1,9 @@
 {
  "workspaces": [
  "foo",
  "bar"
  ],
  "tasks": {
  "dev": "deno run --watch main.ts"
  }
 }
diff --git a/tests/specs/run/workspaces/members_are_imports/foo/deno.jsonc b/tests/specs/run/workspaces/members_are_imports/foo/deno.jsonc
@@ -0,0 1,7 @@
 {
  "name": "@deno-test/foo",
  "version": "0.0.1",
  "exports": {
  ".": "./mod.ts"
  }
 }
diff --git a/tests/specs/run/workspaces/members_are_imports/foo/mod.ts b/tests/specs/run/workspaces/members_are_imports/foo/mod.ts
@@ -0,0 1 @@
 export const value = 42;
diff --git a/tests/specs/run/workspaces/members_are_imports/main.out b/tests/specs/run/workspaces/members_are_imports/main.out
@@ -0,0 1 @@
 [Module: null prototype] { value: 42 } [Module: null prototype] { value: 42 }
diff --git a/tests/specs/run/workspaces/members_are_imports/main.ts b/tests/specs/run/workspaces/members_are_imports/main.ts
@@ -0,0 1,4 @@
 import * as foo from "@deno-test/foo";
 import * as bar from "@deno-test/bar";
 
 console.log(foo, bar);
diff --git a/tests/specs/run/workspaces/nested_member/__test__.jsonc b/tests/specs/run/workspaces/nested_member/__test__.jsonc
@@ -0,0 1,6 @@
 {
  "args": "run -A main.ts",
  "output": "main.out",
  "tempDir": true,
  "exitCode": 1
 }
diff --git a/...un/workspaces/nested_member/bar/deno.json → ...un/workspaces/nested_member/bar/deno.json b/...un/workspaces/nested_member/bar/deno.json → ...un/workspaces/nested_member/bar/deno.json
diff --git a/...workspaces/nested_member/bar/fizz/buzz.ts → ...workspaces/nested_member/bar/fizz/buzz.ts b/...workspaces/nested_member/bar/fizz/buzz.ts → ...workspaces/nested_member/bar/fizz/buzz.ts
diff --git a/...a/run/workspaces/nested_member/bar/mod.ts → ...s/run/workspaces/nested_member/bar/mod.ts b/...a/run/workspaces/nested_member/bar/mod.ts → ...s/run/workspaces/nested_member/bar/mod.ts
diff --git a/...paces/nested_member/bar/some_mod/hello.ts → ...paces/nested_member/bar/some_mod/hello.ts b/...paces/nested_member/bar/some_mod/hello.ts → ...paces/nested_member/bar/some_mod/hello.ts
diff --git a/...ta/run/workspaces/nested_member/deno.json → ...cs/run/workspaces/nested_member/deno.json b/...ta/run/workspaces/nested_member/deno.json → ...cs/run/workspaces/nested_member/deno.json
diff --git a/...orkspaces/nested_member/foo/bar/deno.json → ...orkspaces/nested_member/foo/bar/deno.json b/...orkspaces/nested_member/foo/bar/deno.json → ...orkspaces/nested_member/foo/bar/deno.json
diff --git a/...workspaces/nested_member/foo/bar/hello.ts → ...workspaces/nested_member/foo/bar/hello.ts b/...workspaces/nested_member/foo/bar/hello.ts → ...workspaces/nested_member/foo/bar/hello.ts
diff --git a/...un/workspaces/nested_member/foo/deno.json → ...un/workspaces/nested_member/foo/deno.json b/...un/workspaces/nested_member/foo/deno.json → ...un/workspaces/nested_member/foo/deno.json
diff --git a/...workspaces/nested_member/foo/fizz/buzz.ts → ...workspaces/nested_member/foo/fizz/buzz.ts b/...workspaces/nested_member/foo/fizz/buzz.ts → ...workspaces/nested_member/foo/fizz/buzz.ts
diff --git a/...a/run/workspaces/nested_member/foo/mod.ts → ...s/run/workspaces/nested_member/foo/mod.ts b/...a/run/workspaces/nested_member/foo/mod.ts → ...s/run/workspaces/nested_member/foo/mod.ts
diff --git a/...ata/run/workspaces/nested_member/main.out → ...ecs/run/workspaces/nested_member/main.out b/...ata/run/workspaces/nested_member/main.out → ...ecs/run/workspaces/nested_member/main.out
diff --git a/...data/run/workspaces/nested_member/main.ts → ...pecs/run/workspaces/nested_member/main.ts b/...data/run/workspaces/nested_member/main.ts → ...pecs/run/workspaces/nested_member/main.ts
diff --git a/tools/lint.js b/tools/lint.js
@@ -213,7 213,7 @@ async function ensureNoNewITests() {
  "pm_tests.rs": 0,
  "publish_tests.rs": 28,
  "repl_tests.rs": 0,
- "run_tests.rs": 382,
  "run_tests.rs": 379,
  "shared_library_tests.rs": 0,
  "task_tests.rs": 30,
  "test_tests.rs": 80,