set for all tasks, better test

cli/npm/mod.rs

@@ -190,6 +190,8 @@ impl NpmFetchResolver {
   }
 }
 
+pub const NPM_CONFIG_USER_AGENT_ENV_VAR: &str = "npm_config_user_agent";
+
 pub fn get_npm_config_user_agent() -> String {
   format!(
     "deno/{} npm/? deno/{} {} {}",

cli/task_runner.rs

@@ -155,6 +155,12 @@ fn prepare_env_vars(
       initial_cwd.to_string_lossy().to_string(),
     );
   }
+  if !env_vars.contains_key(crate::npm::NPM_CONFIG_USER_AGENT_ENV_VAR) {
+    env_vars.insert(
+      crate::npm::NPM_CONFIG_USER_AGENT_ENV_VAR.into(),
+      crate::npm::get_npm_config_user_agent(),
+    );
+  }
   if let Some(node_modules_dir) = node_modules_dir {
     prepend_to_path(
       &mut env_vars,
@@ -215,10 +221,6 @@ impl ShellCommand for NpmCommand {
       args.extend(context.args.iter().skip(1).cloned());
 
       let mut state = context.state;
-      state.apply_env_var(
-        "npm_config_user_agent",
-        &crate::npm::get_npm_config_user_agent(),
-      );
       state.apply_env_var(USE_PKG_JSON_HIDDEN_ENV_VAR_NAME, "1");
       return ExecutableCommand::new(
         "deno".to_string(),
@@ -250,12 +252,8 @@ pub struct NodeCommand;
 impl ShellCommand for NodeCommand {
   fn execute(
     &self,
-    mut context: ShellCommandContext,
+    context: ShellCommandContext,
   ) -> LocalBoxFuture<'static, ExecuteResult> {
-    context.state.apply_env_var(
-      "npm_config_user_agent",
-      &crate::npm::get_npm_config_user_agent(),
-    );
     // run with deno if it's a simple invocation, fall back to node
     // if there are extra flags
     let mut args = Vec::with_capacity(context.args.len());
@@ -296,13 +294,8 @@ pub struct NodeGypCommand;
 impl ShellCommand for NodeGypCommand {
   fn execute(
     &self,
-    mut context: ShellCommandContext,
+    context: ShellCommandContext,
   ) -> LocalBoxFuture<'static, ExecuteResult> {
-    context.state.apply_env_var(
-      "npm_config_user_agent",
-      &crate::npm::get_npm_config_user_agent(),
-    );
-
     // at the moment this shell command is just to give a warning if node-gyp is not found
     // in the future, we could try to run/install node-gyp for the user with deno
     if context.state.resolve_command_path("node-gyp").is_err() {
@@ -325,14 +318,10 @@ impl ShellCommand for NpxCommand {
   ) -> LocalBoxFuture<'static, ExecuteResult> {
     if let Some(first_arg) = context.args.first().cloned() {
       if let Some(command) = context.state.resolve_custom_command(&first_arg) {
-        let mut context = ShellCommandContext {
+        let context = ShellCommandContext {
           args: context.args.iter().skip(1).cloned().collect::<Vec<_>>(),
           ..context
         };
-        context.state.apply_env_var(
-          "npm_config_user_agent",
-          &crate::npm::get_npm_config_user_agent(),
-        );
         command.execute(context)
       } else {
         // can't find the command, so fallback to running the real npx command
@@ -363,7 +352,7 @@ struct NpmPackageBinCommand {
 impl ShellCommand for NpmPackageBinCommand {
   fn execute(
     &self,
-    mut context: ShellCommandContext,
+    context: ShellCommandContext,
   ) -> LocalBoxFuture<'static, ExecuteResult> {
     let mut args = vec![
       "run".to_string(),
@@ -407,10 +396,6 @@ impl ShellCommand for NodeModulesFileRunCommand {
       "deno".to_string(),
       std::env::current_exe().unwrap(),
     );
-    context.state.apply_env_var(
-      "npm_config_user_agent",
-      &crate::npm::get_npm_config_user_agent(),
-    );
     // set this environment variable so that the launched process knows the npm command name
     context
       .state

cli/tools/run/mod.rs

@@ -34,7 +34,7 @@ fn set_npm_user_agent() {
   static ONCE: std::sync::Once = std::sync::Once::new();
   ONCE.call_once(|| {
     std::env::set_var(
-      "npm_config_user_agent",
+      crate::npm::NPM_CONFIG_USER_AGENT_ENV_VAR,
       crate::npm::get_npm_config_user_agent(),
     );
   });

tests/registry/npm/@denotest/print-npm-user-agent/1.0.0/package.json

@@ -3,5 +3,8 @@
   "version": "1.0.0",
   "bin": {
     "print-npm-user-agent": "index.js"
+  },
+  "scripts": {
+    "postinstall": "echo postinstall && node index.js && exit 1"
   }
 }

tests/specs/npm/user_agent_env_var/__test__.jsonc

@@ -1,7 +1,7 @@
 {
   "tempDir": true,
   "tests": {
-    "run_npm_package": {
+    "set_for_npm_package": {
       "steps": [
         {
           "args": "install",
@@ -13,37 +13,32 @@
         }
       ]
     },
-    "npx": {
+    "unset_for_local_file": {
       "steps": [
         {
-          "args": "install",
-          "output": "[WILDCARD]"
-        },
-        {
-          "if": "unix",
-          "args": "task run-with-npx",
-          "output": "npx.out"
+          "args": "run -A main.ts",
+          "output": "Download [WILDCARD]\nnpm_config_user_agent: undefined\n"
         }
       ]
     },
-    "bin_command": {
+    "set_for_tasks": {
       "steps": [
-        { "args": "install", "output": "[WILDCARD]" },
+        {
+          "args": "install",
+          "output": "[WILDCARD]"
+        },
         {
           "args": "task run-via-bin",
-          "output": "Task run-via-bin print-npm-user-agent\nnpm_config_user_agent: deno/[WILDCARD] npm/? deno/[WILDCARD] [WILDCARD] [WILDCARD]\n"
+          "output": "bin_command.out"
         }
       ]
     },
-    "npm_run": {
+    "set_for_lifecycle_scripts": {
       "steps": [
         {
-          "args": "install",
-          "output": "[WILDCARD]"
-        },
-        {
-          "args": "task run-via-other-task",
-          "output": "npm_run.out"
+          "args": "install --allow-scripts",
+          "output": "postinstall.out",
+          "exitCode": 1
         }
       ]
     }

tests/specs/npm/user_agent_env_var/bin_command.out

@@ -1 +1,2 @@
+Task run-via-bin print-npm-user-agent
 npm_config_user_agent: deno/[WILDCARD] npm/? deno/[WILDCARD] [WILDCARD] [WILDCARD]

tests/specs/npm/user_agent_env_var/deno.jsonc

@@ -1,3 +1,3 @@
 {
   "nodeModulesDir": "auto"
-}
+}

tests/specs/npm/user_agent_env_var/main.ts

@@ -0,0 +1 @@
+console.log(`npm_config_user_agent: ${Deno.env.get("npm_config_user_agent")}`);

tests/specs/npm/user_agent_env_var/package.json

@@ -1,10 +1,8 @@
 {
   "scripts": {
-    "run-with-npx": "npx print-npm-user-agent",
-    "run-via-other-task": "npm run run-via-bin",
     "run-via-bin": "print-npm-user-agent"
   },
   "dependencies": {
     "@denotest/print-npm-user-agent": "1.0.0"
   }
-}
+}

tests/specs/npm/user_agent_env_var/postinstall.out

@@ -0,0 +1,10 @@
+Download http://localhost:4260/@denotest%2fprint-npm-user-agent
+Download http://localhost:4260/@denotest/print-npm-user-agent/1.0.0.tgz
+Initialize @denotest/[email protected]
+Initialize @denotest/[email protected]: running 'postinstall' script
+error: script 'postinstall' in '@denotest/[email protected]' failed with exit code 1
+stdout:
+postinstall
+npm_config_user_agent: deno/[WILDCARD] npm/? deno/2.0.3 macos aarch64
+
+error: failed to run scripts for packages: @denotest/[email protected]