feat(bun/run): Impl. npm_package_config

src/cli/run_command.zig

@@ -10,6 +10,7 @@ const default_allocator = bun.default_allocator;
 const C = bun.C;
 const std = @import("std");
 
+const PackageJSON = @import("../resolver/package_json.zig").PackageJSON;
 const lex = bun.js_lexer;
 const logger = @import("root").bun.logger;
 
@@ -230,6 +231,7 @@ pub const RunCommand = struct {
         env: *DotEnv.Loader,
         passthrough: []const string,
         silent: bool,
+        package_json: ?*PackageJSON,
     ) !bool {
         const shell_bin = findShell(env.map.get("PATH") orelse "", cwd) orelse return error.MissingShell;
 
@@ -241,6 +243,19 @@ pub const RunCommand = struct {
 
         try replacePackageManagerRun(&copy_script, script);
 
+        if (package_json) |pkg_json| {
+            var i: usize = 0;
+            const prefix = "$npm_package_config_";
+            while (std.mem.indexOfPos(u8, copy_script.items, i, prefix)) |start| {
+                const end = std.mem.indexOfAnyPos(u8, copy_script.items, start + prefix.len, &std.ascii.whitespace) orelse copy_script.items.len;
+                const key = copy_script.items[start + prefix.len .. end];
+                i = end;
+                const value = pkg_json.npm_cfg_map.get(key) orelse continue;
+                i = start + value.len;
+                try copy_script.replaceRange(start, prefix.len + key.len, value);
+            }
+        }
+
         var combined_script: []u8 = copy_script.items;
 
         log("Script: \"{s}\"", .{combined_script});
@@ -1027,6 +1042,7 @@ pub const RunCommand = struct {
                                     this_bundler.env,
                                     passthrough,
                                     ctx.debug.silent,
+                                    root_dir_info.enclosing_package_json,
                                 )) {
                                     return false;
                                 }
@@ -1040,6 +1056,7 @@ pub const RunCommand = struct {
                                 this_bundler.env,
                                 passthrough,
                                 ctx.debug.silent,
+                                root_dir_info.enclosing_package_json,
                             )) return false;
 
                             temp_script_buffer[0.."post".len].* = "post".*;
@@ -1053,6 +1070,7 @@ pub const RunCommand = struct {
                                     this_bundler.env,
                                     passthrough,
                                     ctx.debug.silent,
+                                    root_dir_info.enclosing_package_json
                                 )) {
                                     return false;
                                 }

src/install/lockfile.zig

@@ -135,7 +135,7 @@ pub const Scripts = struct {
     pub fn run(this: *Scripts, allocator: Allocator, env: *DotEnv.Loader, silent: bool, comptime hook: []const u8) !void {
         for (@field(this, hook).items) |entry| {
             if (comptime Environment.allow_assert) std.debug.assert(Fs.FileSystem.instance_loaded);
-            _ = try RunCommand.runPackageScript(allocator, entry.script, hook, entry.cwd, env, &.{}, silent);
+            _ = try RunCommand.runPackageScript(allocator, entry.script, hook, entry.cwd, env, &.{}, silent, null);
         }
     }
 

src/node_fallbacks.zig

@@ -71,6 +71,7 @@ const assert_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("assert@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/assert/package.json", ""),
 };
 const buffer_package_json = PackageJSON{
@@ -80,6 +81,7 @@ const buffer_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("buffer@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/buffer/package.json", ""),
 };
 const console_package_json = PackageJSON{
@@ -89,6 +91,7 @@ const console_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("console@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/console/package.json", ""),
 };
 const constants_package_json = PackageJSON{
@@ -98,6 +101,7 @@ const constants_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("constants@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/constants/package.json", ""),
 };
 const crypto_package_json = PackageJSON{
@@ -107,6 +111,7 @@ const crypto_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("crypto@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/crypto/package.json", ""),
 };
 const domain_package_json = PackageJSON{
@@ -116,6 +121,7 @@ const domain_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("domain@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/domain/package.json", ""),
 };
 const events_package_json = PackageJSON{
@@ -125,6 +131,7 @@ const events_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("events@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/events/package.json", ""),
 };
 const http_package_json = PackageJSON{
@@ -134,6 +141,7 @@ const http_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("http@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/http/package.json", ""),
 };
 const https_package_json = PackageJSON{
@@ -143,6 +151,7 @@ const https_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("https@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/https/package.json", ""),
 };
 const net_package_json = PackageJSON{
@@ -152,6 +161,7 @@ const net_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("net@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/net/package.json", ""),
 };
 const os_package_json = PackageJSON{
@@ -161,6 +171,7 @@ const os_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("os@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/os/package.json", ""),
 };
 const path_package_json = PackageJSON{
@@ -170,6 +181,7 @@ const path_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("path@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/path/package.json", ""),
 };
 const process_package_json = PackageJSON{
@@ -179,6 +191,7 @@ const process_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("process@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/process/package.json", ""),
 };
 const punycode_package_json = PackageJSON{
@@ -188,6 +201,7 @@ const punycode_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("punycode@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/punycode/package.json", ""),
 };
 const querystring_package_json = PackageJSON{
@@ -197,6 +211,7 @@ const querystring_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("querystring@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/querystring/package.json", ""),
 };
 const stream_package_json = PackageJSON{
@@ -206,6 +221,7 @@ const stream_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("stream@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/stream/package.json", ""),
 };
 const string_decoder_package_json = PackageJSON{
@@ -219,6 +235,7 @@ const string_decoder_package_json = PackageJSON{
 
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/string_decoder/package.json", ""),
 };
 
@@ -229,6 +246,7 @@ const sys_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("sys@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/sys/package.json", ""),
 };
 const timers_package_json = PackageJSON{
@@ -238,6 +256,7 @@ const timers_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("timers@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/timers/package.json", ""),
 };
 const tty_package_json = PackageJSON{
@@ -247,6 +266,7 @@ const tty_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("tty@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/tty/package.json", ""),
 };
 const url_package_json = PackageJSON{
@@ -256,6 +276,7 @@ const url_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("url@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/url/package.json", ""),
 };
 const util_package_json = PackageJSON{
@@ -265,6 +286,7 @@ const util_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("util@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/util/package.json", ""),
 };
 const zlib_package_json = PackageJSON{
@@ -274,6 +296,7 @@ const zlib_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("zlib@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/zlib/package.json", ""),
 };
 
@@ -284,6 +307,7 @@ const node_fetch_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("node-fetch@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/node-fetch/package.json", ""),
 };
 const isomorphic_fetch_package_json = PackageJSON{
@@ -293,6 +317,7 @@ const isomorphic_fetch_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("isomorphic-fetch@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/isomorphic-fetch/package.json", ""),
 };
 const supports_color_package_json = PackageJSON{
@@ -302,6 +327,7 @@ const supports_color_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("supports-color@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/supports-color/package.json", ""),
 };
 
@@ -312,6 +338,7 @@ const vercel_fetch_package_json = PackageJSON{
     .hash = @truncate(u32, bun.hash("@vercel/fetch@0.0.0-polyfill")),
     .main_fields = undefined,
     .browser_map = undefined,
+    .npm_cfg_map = undefined,
     .source = logger.Source.initPathString("/bun-vfs/node_modules/@vercel/fetch/package.json", ""),
 };
 

src/resolver/package_json.zig

@@ -23,6 +23,7 @@ const resolve_path = @import("./resolve_path.zig");
 // Assume they're not going to have hundreds of main fields or browser map
 // so use an array-backed hash table instead of bucketed
 const MainFieldMap = bun.StringMap;
+const NpmCfgMap = bun.StringMap;
 pub const BrowserMap = bun.StringMap;
 pub const MacroImportReplacementMap = bun.StringArrayHashMap(string);
 pub const MacroMap = bun.StringArrayHashMapUnmanaged(MacroImportReplacementMap);
@@ -144,7 +145,7 @@ pub const PackageJSON = struct {
     //   should match and the query "./ext" should ALSO match.
     //
     browser_map: BrowserMap,
-
+    npm_cfg_map: NpmCfgMap,
     exports: ?ExportsMap = null,
     imports: ?ExportsMap = null,
 
@@ -644,6 +645,7 @@ pub const PackageJSON = struct {
             .module_type = .unknown,
             .browser_map = BrowserMap.init(allocator, false),
             .main_fields = MainFieldMap.init(allocator, false),
+            .npm_cfg_map = NpmCfgMap.init(allocator, false),
         };
 
         // Note: we tried rewriting this to be fewer loops over all the properties (asProperty loops over each)
@@ -667,6 +669,22 @@ pub const PackageJSON = struct {
             }
         }
 
+        if (json.asProperty("config")) |npm_pkg_cfg| {
+            switch (npm_pkg_cfg.expr.data) {
+                .e_object => |obj| {
+                    for (obj.properties.slice()) |*prop| {
+                        const key = prop.key.?.asString(allocator) orelse continue;
+                        const value = prop.value.?.asString(allocator) orelse continue;
+
+                        if (!(key.len > 0 and value.len > 0)) continue;
+
+                        package_json.npm_cfg_map.put(key, value) catch unreachable;
+                    }
+                },
+                else => r.log.addWarning(&json_source, npm_pkg_cfg.loc, "The \"config\" field must be an object") catch unreachable,
+            }
+        }
+
         // If we're coming from `bun run`
         // We do not need to parse all this stuff.
         if (comptime !include_scripts) {

test/cli/run/run-cjs.test.ts

@@ -1,6 +1,6 @@
 import { expect, test } from "bun:test";
 import { mkdirSync, realpathSync } from "fs";
-import { bunEnv, bunExe } from "harness";
+import { bunEnv, bunExe, tempDirWithFiles, bunRunAsScript } from "harness";
 import { tmpdir } from "os";
 import { join } from "path";
 
@@ -38,3 +38,37 @@ export default Foo
   });
   expect(stdout.toString("utf8")).toEqual("");
 });
+
+test("npm_package_config", () => {
+   const dir = tempDirWithFiles("npmpkgcfg", {
+      "package.json": JSON.stringify({
+        "name": "bun_npm_package_config",
+        "config": {
+          "a": "echo Hello, Bun!"
+        },
+        "scripts": {
+          "c": "$npm_package_config_a",
+        }
+      })
+  });
+
+  const { stdout } = bunRunAsScript(dir, "c");
+  expect(stdout.toString()).toBe("Hello, Bun!");
+
+  // test multiple config values
+  const dir2 = tempDirWithFiles("npmpkgcfg2", {
+    "package.json": JSON.stringify({
+      "name": "bun_npm_package_config",
+      "config": {
+        "a": "Bun!",
+        "b": "Hello,"
+      },
+      "scripts": {
+        "c": "echo $npm_package_config_b $npm_package_config_a",
+      }
+    })
+  });
+
+  const { stdout: stdout2 } = bunRunAsScript(dir2, "c");
+  expect(stdout2.toString()).toBe("Hello, Bun!");
+});