refactor: isolate root.C and root.JavaScriptCore

build.zig

@@ -628,6 +628,12 @@ const WindowsShim = struct {
             .link_libc = false,
         });
 
+        const options = b.addOptions();
+        options.addOption(bool, "is_standalone", true);
+
+        exe.root_module.addOptions("windows_shim", options);
+        dbg.root_module.addOptions("windows_shim", options);
+
         return .{ .exe = exe, .dbg = dbg };
     }
 };

root.zig

@@ -7,7 +7,4 @@ pub const completions = struct {
     pub const bash = @embedFile("./completions/bun.bash");
     pub const zsh = @embedFile("./completions/bun.zsh");
     pub const fish = @embedFile("./completions/bun.fish");
-};
-
-pub const JavaScriptCore = @import("./src/jsc.zig");
-pub const C = @import("./src/c.zig");
+};

src/bun.js/node/node_os.zig

@@ -186,7 +186,7 @@ fn cpusImplLinux(globalThis: *JSC.JSGlobalObject) !JSC.JSValue {
 
 extern fn bun_sysconf__SC_CLK_TCK() isize;
 fn cpusImplDarwin(globalThis: *JSC.JSGlobalObject) !JSC.JSValue {
-    const local_bindings = @import("../../darwin_c.zig");
+    const local_bindings = @import("../../c/darwin.zig");
     const c = std.c;
 
     // Fetch the CPU info structure

src/bun.js/webcore/S3Stat.zig

@@ -1,5 +1,5 @@
 const bun = @import("../../bun.zig");
-const JSC = @import("../../jsc.zig");
+const JSC = bun.JSC;
 
 pub const S3Stat = struct {
     const log = bun.Output.scoped(.S3Stat, false);

src/bun.zig

@@ -102,7 +102,7 @@ pub const JSOOM = OOM || JSError;
 
 pub const detectCI = @import("./ci_info.zig").detectCI;
 
-pub const C = @import("root").C;
+pub const C = @import("./c.zig");
 pub const sha = @import("./sha.zig");
 pub const FeatureFlags = @import("feature_flags.zig");
 pub const meta = @import("./meta.zig");
@@ -789,7 +789,7 @@ pub const invalid_fd: FileDescriptor = FDImpl.invalid.encode();
 
 pub const simdutf = @import("./bun.js/bindings/bun-simdutf.zig");
 
-pub const JSC = @import("root").JavaScriptCore;
+pub const JSC = @import("./jsc.zig");
 pub const AsyncIO = @import("async_io");
 
 pub const logger = @import("./logger.zig");

src/c.zig

@@ -5,9 +5,9 @@ const Environment = @import("./env.zig");
 pub const translated = @import("translated-c-headers");
 
 const PlatformSpecific = switch (Environment.os) {
-    .mac => @import("./darwin_c.zig"),
-    .linux => @import("./linux_c.zig"),
-    .windows => @import("./windows_c.zig"),
+    .mac => @import("c/darwin.zig"),
+    .linux => @import("c/linux.zig"),
+    .windows => @import("c/windows.zig"),
     else => struct {},
 };
 pub usingnamespace PlatformSpecific;
@@ -25,8 +25,8 @@ const mode_t = bun.Mode;
 const libc_stat = bun.Stat;
 
 const zeroes = mem.zeroes;
-pub const darwin = @import("./darwin_c.zig");
-pub const linux = @import("./linux_c.zig");
+pub const darwin = @import("c/darwin.zig");
+pub const linux = @import("c/linux.zig");
 pub extern "c" fn chmod([*c]const u8, mode_t) c_int;
 pub extern "c" fn fchmod(std.c.fd_t, mode_t) c_int;
 pub extern "c" fn fchmodat(c_int, [*c]const u8, mode_t, c_int) c_int;

src/windows_c.zig → src/c/windows.zig

@@ -1067,7 +1067,7 @@ pub const UV_EUNATCH = -uv.UV_EUNATCH;
 pub const off_t = i64;
 pub fn preallocate_file(_: posix.fd_t, _: off_t, _: off_t) !void {}
 
-const uv = @import("./deps/libuv.zig");
+const uv = @import("../deps/libuv.zig");
 
 pub const E = enum(u16) {
     SUCCESS = 0,

src/glob/GlobWalker.zig

@@ -35,7 +35,7 @@ const Arena = std.heap.ArenaAllocator;
 const ArrayList = std.ArrayListUnmanaged;
 const ArrayListManaged = std.ArrayList;
 const BunString = bun.String;
-const C = @import("../c.zig");
+const C = bun.C;
 const CodepointIterator = @import("../string_immutable.zig").PackedCodepointIterator;
 const Codepoint = CodepointIterator.Cursor.CodePointType;
 const Dirent = @import("../bun.js/node/types.zig").Dirent;

src/install/bin.zig

@@ -7,7 +7,7 @@ const Global = bun.Global;
 const std = @import("std");
 const strings = bun.strings;
 const Environment = @import("../env.zig");
-const C = @import("../c.zig");
+const C = bun.C;
 const Fs = @import("../fs.zig");
 const stringZ = bun.stringZ;
 const Resolution = @import("./resolution.zig").Resolution;

src/install/windows-shim/bun_shim_impl.zig

@@ -46,7 +46,7 @@ const w = std.os.windows;
 const assert = std.debug.assert;
 const fmt16 = std.unicode.fmtUtf16le;
 
-const is_standalone = !@hasDecl(@import("root"), "JavaScriptCore");
+const is_standalone = !@hasDecl(@import("windows_shim"), "is_standalone");
 const bun = if (!is_standalone) @import("root").bun else @compileError("cannot use 'bun' in standalone build of bun_shim_impl");
 const bunDebugMessage = bun.Output.scoped(.bun_shim_impl, true);
 const callmod_inline = if (is_standalone) std.builtin.CallModifier.always_inline else bun.callmod_inline;