Fix some tests and update var names

denoland · dsherret · Jul 4, 2024 · Jun 17, 2024 · Jun 18, 2024 · Jun 18, 2024
commit 8dd40a97282b92e32b62101a5b21d9c8d723c629
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
@@ -9,6  9,7 @@ mod package_json;
 
 use deno_ast::SourceMapOption;
 use deno_config::workspace::CreateResolverOptions;
 use deno_config::workspace::PackageJsonDepResolution;
 use deno_config::workspace::Workspace;
 use deno_config::workspace::WorkspaceDiscoverOptions;
 use deno_config::workspace::WorkspaceDiscoverStart;
@@ -1108,7  1109,11 @@ impl CliOptions {
         .create_resolver(
           CreateResolverOptions {
             // todo(dsherret): this should be false for nodeModulesDir: true
-            pkg_json_dep_resolution: !self.use_byonm(),
             pkg_json_dep_resolution: if self.use_byonm() {
               PackageJsonDepResolution::Disabled
             } else {
               PackageJsonDepResolution::Enabled
             },
             specified_import_map: cli_arg_specified_import_map,
           },
           |specifier| {

diff --git a/cli/args/package_json.rs b/cli/args/package_json.rs
@@ -46,7  46,7 @@ impl PackageJsonInstallDepsProvider {
             {
               workspace_pkgs.push(InstallNpmWorkspacePkg {
                 alias,
-                pkg_dir: pkg.package_json.dir_path().to_path_buf(),
                 pkg_dir: pkg.pkg_json.dir_path().to_path_buf(),
               });
             } else {
               pkg_reqs.push(pkg_req)
@@ -58,7  58,7 @@ impl PackageJsonInstallDepsProvider {
             }) {
               workspace_pkgs.push(InstallNpmWorkspacePkg {
                 alias,
-                pkg_dir: pkg.package_json.dir_path().to_path_buf(),
                 pkg_dir: pkg.pkg_json.dir_path().to_path_buf(),
               });
             }
           }

diff --git a/cli/lsp/resolver.rs b/cli/lsp/resolver.rs
@@ -25,6  25,7 @@ use crate::util::progress_bar::ProgressBarStyle;
 use dashmap::DashMap;
 use deno_ast::MediaType;
 use deno_cache_dir::HttpCache;
 use deno_config::workspace::PackageJsonDepResolution;
 use deno_config::workspace::WorkspaceResolver;
 use deno_core::error::AnyError;
 use deno_core::url::Url;
@@ -501,6  502,13 @@ fn create_graph_resolver(
         .and_then(|d| d.package_json.clone())
         .into_iter()
         .collect(),
       if config_data.map(|d| d.byonm).unwrap_or(false) {
         PackageJsonDepResolution::Disabled
       } else {
         // todo(dsherret): this should also be disabled for when using
         // auto-install with a node_modules directory
         PackageJsonDepResolution::Enabled
       },
     )),
     maybe_jsx_import_source_config: config_file
       .and_then(|cf| cf.to_maybe_jsx_import_source_config().ok().flatten()),

diff --git a/cli/standalone/binary.rs b/cli/standalone/binary.rs
@@ -15,6  15,7 @@ use std::path::PathBuf;
 use std::process::Command;
 
 use deno_ast::ModuleSpecifier;
 use deno_config::workspace::PackageJsonDepResolution;
 use deno_config::workspace::Workspace;
 use deno_core::anyhow::bail;
 use deno_core::anyhow::Context;
@@ -76,6  77,7 @@ pub struct SerializedWorkspaceResolverImportMap {
 pub struct SerializedWorkspaceResolver {
   pub import_map: Option<SerializedWorkspaceResolverImportMap>,
   pub package_jsons: BTreeMap<String, serde_json::Value>,
   pub pkg_json_resolution: PackageJsonDepResolution,
 }
 
 #[derive(Deserialize, Serialize)]
@@ -615,6  617,7 @@ impl<'a> DenoCompileBinaryWriter<'a> {
             )
           })
           .collect(),
         pkg_json_resolution: workspace_resolver.pkg_json_dep_resolution(),
       },
       node_modules,
       disable_deprecated_api_warning: cli_options

diff --git a/cli/standalone/mod.rs b/cli/standalone/mod.rs
@@ -567,7  567,11 @@ pub async fn run(
         Arc::new(pkg_json)
       })
       .collect();
-    WorkspaceResolver::new_raw(import_map, pkg_jsons)
     WorkspaceResolver::new_raw(
       import_map,
       pkg_jsons,
       metadata.workspace_resolver.pkg_json_resolution,
     )
   };
   let cli_node_resolver = Arc::new(CliNodeResolver::new(
     Some(cjs_resolutions.clone()),

diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs
@@ -252,10  252,8 @@ impl PublishPreparer {
           let package = self
             .prepare_publish(&member, graph, diagnostics_collector)
             .await
-            .with_context(|| {
-              format!("Failed preparing '{}'.", member.package_name)
-            })?;
-          Ok::<_, AnyError>((member.package_name, package))
             .with_context(|| format!("Failed preparing '{}'.", member.name))?;
           Ok::<_, AnyError>((member.name, package))
         }
         .boxed()
       })
@@ -412,19  410,19 @@ impl PublishPreparer {
   "version": "{}",
   "exports": "{}"
 }}"#,
-        package.package_name,
         package.name,
         version,
         suggested_entrypoint.unwrap_or("<path_to_entrypoint>")
       );
 
       bail!(
       "You did not specify an entrypoint to \"{}\" package in {}. Add `exports` mapping in the configuration file, eg:\n{}",
-      package.package_name,
       package.name,
       deno_json.specifier,
       exports_content
     );
     }
-    let Some(name_no_at) = package.package_name.strip_prefix('@') else {
     let Some(name_no_at) = package.name.strip_prefix('@') else {
       bail!("Invalid package name, use '@<scope_name>/<package_name> format");
     };
     let Some((scope, name_no_scope)) = name_no_at.split_once('/') else {
@@ -473,11  471,7 @@ impl PublishPreparer {
     })
     .await??;
 
-    log::debug!(
-      "Tarball size ({}): {}",
-      package.package_name,
-      tarball.bytes.len()
-    );
     log::debug!("Tarball size ({}): {}", package.name, tarball.bytes.len());
 
     Ok(Rc::new(PreparedPublishPackage {
       scope: scope.to_string(),

diff --git a/cli/tools/registry/publish_order.rs b/cli/tools/registry/publish_order.rs
@@ -173,12  173,12 @@ fn build_pkg_deps(
             specifier.as_str().starts_with(dir_url.as_str())
           });
           if let Some(root) = found_root {
-            deps.insert(root.1.package_name.clone());
             deps.insert(root.1.name.clone());
           }
         }
       }
     }
-    members.insert(pkg_config.package_name.clone(), deps);
     members.insert(pkg_config.name.clone(), deps);
   }
   Ok(members)
 }

diff --git a/cli/tools/registry/unfurl.rs b/cli/tools/registry/unfurl.rs
@@ -389,6  389,7 @@ mod tests {
     let workspace_resolver = WorkspaceResolver::new_raw(
       Some(import_map),
       vec![Arc::new(package_json)],
       deno_config::workspace::PackageJsonDepResolution::Enabled,
     );
     let fs = Arc::new(RealFs);
     let sloppy_imports_resolver = SloppyImportsResolver::new(fs);

diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs
@@ -297,6  297,7 @@ fn build_resolver(
     workspace_resolver: Arc::new(WorkspaceResolver::new_raw(
       maybe_original_import_map,
       Vec::new(),
       deno_config::workspace::PackageJsonDepResolution::Enabled,
     )),
     maybe_jsx_import_source_config,
     maybe_vendor_dir: None,

diff --git a/tests/specs/install/future_install_global/__test__.jsonc b/tests/specs/install/future_install_global/__test__.jsonc
@@ -5,7  5,7 @@
   },
   "steps": [
     {
-      "args": "install --global --root ./bins --name deno-test-bin ./main.js",
       "args": "install --global --root ./bins --name deno-test-bin ./pkg/main.js",
       "output": "install.out"
     },
     {

diff --git a/...ecs/install/future_install_global/main.js → ...install/future_install_global/pkg/main.js b/...ecs/install/future_install_global/main.js → ...install/future_install_global/pkg/main.js
diff --git a/...nstall/future_install_global/package.json → ...ll/future_install_global/pkg/package.json b/...nstall/future_install_global/package.json → ...ll/future_install_global/pkg/package.json
diff --git a/tests/specs/install/no_future_install_global/__test__.jsonc b/tests/specs/install/no_future_install_global/__test__.jsonc
@@ -2,7  2,7 @@
   "tempDir": true,
   "steps": [
     {
-      "args": "install --root ./bins --name deno-test-bin ./main.js",
       "args": "install --root ./bins --name deno-test-bin ./pkg/main.js",
       "output": "install.out"
     },
     {

diff --git a/tests/specs/install/no_future_install_global/install.out b/tests/specs/install/no_future_install_global/install.out
@@ -1,5  1,6 @@
 ⚠️ `deno install` behavior will change in Deno 2. To preserve the current behavior use the `-g` or `--global` flag.
 Download http://localhost:4260/@denotest/esm-basic
 Download http://localhost:4260/@denotest/esm-basic/1.0.0.tgz
 [# there shouldn't be a line saying it initialized the node_modules folder here because this is a global install]
 ✅ Successfully installed deno-test-bin[WILDCARD]
 [WILDCARD]
diff --git a/.../install/no_future_install_global/main.js → ...tall/no_future_install_global/pkg/main.js b/.../install/no_future_install_global/main.js → ...tall/no_future_install_global/pkg/main.js
diff --git a/...all/no_future_install_global/package.json → ...no_future_install_global/pkg/package.json b/...all/no_future_install_global/package.json → ...no_future_install_global/pkg/package.json
diff --git a/tests/specs/run/workspaces/basic/main.out b/tests/specs/run/workspaces/basic/main.out
@@ -2,19  2,19 @@
   "imports": {
     "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/"
     "asdfasdfasdf/": "jsr:/asdfasdfasdf@^0.0.0/",
     "qwerqwer": "jsr:qwerqwer@^0.0.0",
     "qwerqwer/": "jsr:/qwerqwer@^0.0.0/"
   },
   "scopes": {
-    "./foo/": {
-      "~/": "./foo/",
-      "foo/": "./foo/bar/"
-    },
     "./bar/": {
       "@/": "./bar/",
       "secret_mod/": "./bar/some_mod/"
     },
     "./foo/": {
       "~/": "./foo/",
       "foo/": "./foo/bar/"
     }
   }
 }

diff --git a/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc b/tests/specs/run/workspaces/member_outside_root_dir/__test__.jsonc
@@ -1,5  1,5 @@
 {
-  "args": "run -A main.ts",
   "args": "run -A sub_dir/child/main.ts",
   "output": "main.out",
   "tempDir": true,
   "exitCode": 1

diff --git a/tests/specs/run/workspaces/member_outside_root_dir/main.out b/tests/specs/run/workspaces/member_outside_root_dir/main.out
@@ -1  1,3 @@
-error: Workspace member '../other_folder' is outside root configuration directory[WILDCARD]
 error: Workspace member must be nested in a directory under the workspace.
   Member: file:///[WILDLINE]/sub_dir/other_folder/
   Workspace: file:///[WILDLINE]/sub_dir/child/
diff --git a/...kspaces/member_outside_root_dir/deno.json → ..._outside_root_dir/sub_dir/child/deno.json b/...kspaces/member_outside_root_dir/deno.json → ..._outside_root_dir/sub_dir/child/deno.json
diff --git a/.../member_outside_root_dir/foo/bar/hello.ts → ...e_root_dir/sub_dir/child/foo/bar/hello.ts b/.../member_outside_root_dir/foo/bar/hello.ts → ...e_root_dir/sub_dir/child/foo/bar/hello.ts
diff --git a/...ces/member_outside_root_dir/foo/deno.json → ...side_root_dir/sub_dir/child/foo/deno.json b/...ces/member_outside_root_dir/foo/deno.json → ...side_root_dir/sub_dir/child/foo/deno.json
diff --git a/.../member_outside_root_dir/foo/fizz/buzz.ts → ...e_root_dir/sub_dir/child/foo/fizz/buzz.ts b/.../member_outside_root_dir/foo/fizz/buzz.ts → ...e_root_dir/sub_dir/child/foo/fizz/buzz.ts
diff --git a/...spaces/member_outside_root_dir/foo/mod.ts → ...outside_root_dir/sub_dir/child/foo/mod.ts b/...spaces/member_outside_root_dir/foo/mod.ts → ...outside_root_dir/sub_dir/child/foo/mod.ts
diff --git a/...orkspaces/member_outside_root_dir/main.ts → ...er_outside_root_dir/sub_dir/child/main.ts b/...orkspaces/member_outside_root_dir/main.ts → ...er_outside_root_dir/sub_dir/child/main.ts
diff --git a/tests/specs/run/workspaces/nested_member/__test__.jsonc b/tests/specs/run/workspaces/nested_member/__test__.jsonc
@@ -2,5  2,5 @@
   "args": "run -A main.ts",
   "output": "main.out",
   "tempDir": true,
-  "exitCode": 1
   "exitCode": 0
 }
diff --git a/tests/specs/run/workspaces/nested_member/bar/deno.json b/tests/specs/run/workspaces/nested_member/bar/deno.json
@@ -4,5  4,6 @@
   "imports": {
     "@/": "./",
     "secret_mod/": "./some_mod/"
-  }
   },
   "exports": "./mod.ts"
 }
diff --git a/tests/specs/run/workspaces/nested_member/foo/bar/deno.json b/tests/specs/run/workspaces/nested_member/foo/bar/deno.json
@@ -3,5  3,6 @@
   "version": "0.0.0",
   "imports": {
     "chalk": "npm:chalk"
-  }
   },
   "exports": "./hello.ts"
 }
diff --git a/tests/specs/run/workspaces/nested_member/foo/deno.json b/tests/specs/run/workspaces/nested_member/foo/deno.json
@@ -3,5  3,6 @@
   "version": "0.0.0",
   "imports": {
     "~/": "./"
-  }
   },
   "exports": "./mod.ts"
 }
diff --git a/tests/specs/run/workspaces/nested_member/main.out b/tests/specs/run/workspaces/nested_member/main.out
@@ -1  1,4 @@
-error: Workspace member 'foo/bar' is nested within other workspace member 'foo'
 Download http://localhost:4260/chalk
 Download http://localhost:4260/chalk/chalk-5.0.1.tgz
 buzz from foo
 [Function: chalk] createChalk { level: 0 }