diff --git a/build.zig b/build.zig index 6b18ae9ed2..5a3eb7868a 100644 --- a/build.zig +++ b/build.zig @@ -629,5 +629,3 @@ pub fn configureObjectStep(b: *std.build.Builder, obj: *CompileStep, obj_step: * obj.link_function_sections = true; } } - -// ! \ No newline at end of file diff --git a/misctools/fetch.zig b/misctools/fetch.zig index 5e8701eb9c..b027a65f81 100644 --- a/misctools/fetch.zig +++ b/misctools/fetch.zig @@ -14,13 +14,13 @@ pub usingnamespace @import("root").bun; const clap = bun.clap; const URL = @import("../src/url.zig").URL; -const Headers = @import("root").bun.http.Headers; +const Headers = bun.http.Headers; const Method = @import("../src/http/method.zig").Method; const ColonListType = @import("../src/cli/colon_list_type.zig").ColonListType; const HeadersTuple = ColonListType(string, noop_resolver); const path_handler = @import("../src/resolver/resolve_path.zig"); -const HTTPThread = @import("root").bun.http.HTTPThread; -const HTTP = @import("root").bun.http; +const HTTPThread = bun.http.HTTPThread; +const HTTP = bun.http; fn noop_resolver(in: string) !string { return in; } diff --git a/misctools/http_bench.zig b/misctools/http_bench.zig index 27546881c4..1df8256323 100644 --- a/misctools/http_bench.zig +++ b/misctools/http_bench.zig @@ -177,7 +177,7 @@ pub const Arguments = struct { } }; -const HTTP = @import("root").bun.http; +const HTTP = bun.http; const NetworkThread = HTTP.NetworkThread; var stdout_: std.fs.File = undefined; diff --git a/misctools/machbench.zig b/misctools/machbench.zig index e4a929e814..0c2419fb11 100644 --- a/misctools/machbench.zig +++ b/misctools/machbench.zig @@ -13,13 +13,13 @@ const C = bun.C; const clap = @import("../src/deps/zig-clap/clap.zig"); const URL = @import("../src/url.zig").URL; -const Headers = @import("root").bun.http.Headers; +const Headers = bun.http.Headers; const Method = @import("../src/http/method.zig").Method; const ColonListType = @import("../src/cli/colon_list_type.zig").ColonListType; const HeadersTuple = ColonListType(string, noop_resolver); const path_handler = @import("../src/resolver/resolve_path.zig"); -const NetworkThread = @import("root").bun.http.NetworkThread; -const HTTP = @import("root").bun.http; +const NetworkThread = bun.http.NetworkThread; +const HTTP = bun.http; fn noop_resolver(in: string) !string { return in; } diff --git a/src/__global.zig b/src/__global.zig index c4c4bcadbc..4bad953bba 100644 --- a/src/__global.zig +++ b/src/__global.zig @@ -2,9 +2,9 @@ const std = @import("std"); const Environment = @import("./env.zig"); const Output = @import("output.zig"); -const use_mimalloc = @import("root").bun.use_mimalloc; +const use_mimalloc = bun.use_mimalloc; const StringTypes = @import("./string_types.zig"); -const Mimalloc = @import("root").bun.Mimalloc; +const Mimalloc = bun.Mimalloc; const bun = @import("root").bun; const version_string = Environment.version_string; @@ -61,7 +61,7 @@ else pub inline fn getStartTime() i128 { if (Environment.isTest) return 0; - return @import("root").bun.start_time; + return bun.start_time; } pub fn setThreadName(name: StringTypes.stringZ) void { @@ -194,7 +194,7 @@ pub fn crash() noreturn { } const Global = @This(); -const string = @import("root").bun.string; +const string = bun.string; pub const BunInfo = struct { bun_version: string, diff --git a/src/allocators.zig b/src/allocators.zig index 5af6c1014c..06caa08ac0 100644 --- a/src/allocators.zig +++ b/src/allocators.zig @@ -80,7 +80,7 @@ fn OverflowGroup(comptime Block: type) type { // ...right? const max = 4095; const UsedSize = std.math.IntFittingRange(0, max + 1); - const default_allocator = @import("root").bun.default_allocator; + const default_allocator = bun.default_allocator; used: UsedSize = 0, allocated: UsedSize = 0, ptrs: [max]*Block = undefined, diff --git a/src/analytics/analytics_thread.zig b/src/analytics/analytics_thread.zig index c4ecd60897..95f0d19718 100644 --- a/src/analytics/analytics_thread.zig +++ b/src/analytics/analytics_thread.zig @@ -12,13 +12,13 @@ const C = bun.C; const sync = @import("../sync.zig"); const std = @import("std"); -const HTTP = @import("root").bun.http; +const HTTP = bun.http; const URL = @import("../url.zig").URL; const Fs = @import("../fs.zig"); const Analytics = @import("./analytics_schema.zig").analytics; const Writer = @import("./analytics_schema.zig").Writer; -const Headers = @import("root").bun.http.Headers; +const Headers = bun.http.Headers; const Futex = @import("../futex.zig"); const Semver = @import("../install/semver.zig"); diff --git a/src/bench/string-handling.zig b/src/bench/string-handling.zig index 23f558eb8a..8d778e3564 100644 --- a/src/bench/string-handling.zig +++ b/src/bench/string-handling.zig @@ -1,4 +1,4 @@ -const strings = @import("root").bun.strings; +const strings = bun.strings; const std = @import("std"); pub fn main() anyerror!void { diff --git a/src/bun.js/api/BunObject.zig b/src/bun.js/api/BunObject.zig index 5bf82aeecb..954fde6907 100644 --- a/src/bun.js/api/BunObject.zig +++ b/src/bun.js/api/BunObject.zig @@ -155,7 +155,7 @@ pub const BunObject = struct { }; const Bun = @This(); -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const bun = @import("root").bun; const uv = bun.windows.libuv; const Environment = bun.Environment; @@ -163,8 +163,8 @@ const Environment = bun.Environment; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; +const Output = bun.Output; +const MutableString = bun.MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; const IdentityContext = @import("../../identity_context.zig").IdentityContext; @@ -173,7 +173,7 @@ const Resolver = @import("../../resolver/resolver.zig"); const ast = @import("../../import_record.zig"); const MacroEntryPoint = bun.bundler.MacroEntryPoint; -const logger = @import("root").bun.logger; +const logger = bun.logger; const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = bun.Bundler; @@ -184,7 +184,7 @@ const js_ast = bun.JSAst; const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../../analytics/analytics_thread.zig"); -const ZigString = @import("root").bun.JSC.ZigString; +const ZigString = bun.JSC.ZigString; const Runtime = @import("../../runtime.zig"); const Router = @import("./filesystem_router.zig"); const ImportRecord = ast.ImportRecord; @@ -192,37 +192,37 @@ const DotEnv = @import("../../env_loader.zig"); const ParseResult = bun.bundler.ParseResult; const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../../resolver/package_json.zig").MacroMap; -const WebCore = @import("root").bun.JSC.WebCore; +const WebCore = bun.JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; -const js = @import("root").bun.JSC.C; -const JSC = @import("root").bun.JSC; +const js = bun.JSC.C; +const JSC = bun.JSC; const JSError = @import("../base.zig").JSError; const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer; const getAllocator = @import("../base.zig").getAllocator; -const JSValue = @import("root").bun.JSC.JSValue; +const JSValue = bun.JSC.JSValue; -const JSGlobalObject = @import("root").bun.JSC.JSGlobalObject; -const ExceptionValueRef = @import("root").bun.JSC.ExceptionValueRef; -const JSPrivateDataPtr = @import("root").bun.JSC.JSPrivateDataPtr; -const ConsoleObject = @import("root").bun.JSC.ConsoleObject; -const Node = @import("root").bun.JSC.Node; -const ZigException = @import("root").bun.JSC.ZigException; -const ZigStackTrace = @import("root").bun.JSC.ZigStackTrace; -const ErrorableResolvedSource = @import("root").bun.JSC.ErrorableResolvedSource; -const ResolvedSource = @import("root").bun.JSC.ResolvedSource; -const JSPromise = @import("root").bun.JSC.JSPromise; -const JSInternalPromise = @import("root").bun.JSC.JSInternalPromise; -const JSModuleLoader = @import("root").bun.JSC.JSModuleLoader; -const JSPromiseRejectionOperation = @import("root").bun.JSC.JSPromiseRejectionOperation; -const Exception = @import("root").bun.JSC.Exception; -const ErrorableZigString = @import("root").bun.JSC.ErrorableZigString; -const ZigGlobalObject = @import("root").bun.JSC.ZigGlobalObject; -const VM = @import("root").bun.JSC.VM; -const JSFunction = @import("root").bun.JSC.JSFunction; +const JSGlobalObject = bun.JSC.JSGlobalObject; +const ExceptionValueRef = bun.JSC.ExceptionValueRef; +const JSPrivateDataPtr = bun.JSC.JSPrivateDataPtr; +const ConsoleObject = bun.JSC.ConsoleObject; +const Node = bun.JSC.Node; +const ZigException = bun.JSC.ZigException; +const ZigStackTrace = bun.JSC.ZigStackTrace; +const ErrorableResolvedSource = bun.JSC.ErrorableResolvedSource; +const ResolvedSource = bun.JSC.ResolvedSource; +const JSPromise = bun.JSC.JSPromise; +const JSInternalPromise = bun.JSC.JSInternalPromise; +const JSModuleLoader = bun.JSC.JSModuleLoader; +const JSPromiseRejectionOperation = bun.JSC.JSPromiseRejectionOperation; +const Exception = bun.JSC.Exception; +const ErrorableZigString = bun.JSC.ErrorableZigString; +const ZigGlobalObject = bun.JSC.ZigGlobalObject; +const VM = bun.JSC.VM; +const JSFunction = bun.JSC.JSFunction; const Config = @import("../config.zig"); const URL = @import("../../url.zig").URL; const Transpiler = bun.JSC.API.JSTranspiler; @@ -3410,7 +3410,7 @@ const TOMLObject = struct { globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame, ) callconv(.C) JSC.JSValue { - var arena = @import("root").bun.ArenaAllocator.init(globalThis.allocator()); + var arena = bun.ArenaAllocator.init(globalThis.allocator()); const allocator = arena.allocator(); defer arena.deinit(); var log = logger.Log.init(default_allocator); @@ -3481,7 +3481,7 @@ pub const Timer = struct { return VirtualMachine.get().timer.last_id; } - const uws = @import("root").bun.uws; + const uws = bun.uws; // TODO: reference count to avoid multiple Strong references to the same // object in setInterval diff --git a/src/bun.js/api/JSTranspiler.zig b/src/bun.js/api/JSTranspiler.zig index e5c1d53874..60e8cf4125 100644 --- a/src/bun.js/api/JSTranspiler.zig +++ b/src/bun.js/api/JSTranspiler.zig @@ -45,7 +45,7 @@ const Expr = JSAst.Expr; pub usingnamespace JSC.Codegen.JSTranspiler; bundler: Bundler.Bundler, -arena: @import("root").bun.ArenaAllocator, +arena: bun.ArenaAllocator, transpiler_options: TranspilerOptions, scan_pass_result: ScanPassResult, buffer_writer: ?JSPrinter.BufferWriter = null, @@ -744,7 +744,7 @@ pub fn constructor( globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame, ) callconv(.C) ?*Transpiler { - var temp = @import("root").bun.ArenaAllocator.init(getAllocator(globalThis)); + var temp = bun.ArenaAllocator.init(getAllocator(globalThis)); const arguments = callframe.arguments(3); var args = JSC.Node.ArgumentsSlice.init( globalThis.bunVM(), diff --git a/src/bun.js/api/bun/dns_resolver.zig b/src/bun.js/api/bun/dns_resolver.zig index aa5fd018d5..125571df52 100644 --- a/src/bun.js/api/bun/dns_resolver.zig +++ b/src/bun.js/api/bun/dns_resolver.zig @@ -1,16 +1,16 @@ const Bun = @This(); -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const bun = @import("root").bun; const Environment = bun.Environment; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; +const Output = bun.Output; +const MutableString = bun.MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const c_ares = bun.c_ares; @@ -330,7 +330,7 @@ pub fn addrInfoToJSArray( globalThis: *JSC.JSGlobalObject, ) JSC.JSValue { var stack = std.heap.stackFallback(2048, parent_allocator); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); const array = JSC.JSValue.createEmptyArray( globalThis, addrInfoCount(addr_info), @@ -642,7 +642,7 @@ pub const GetAddrInfo = struct { .addrinfo => |addrinfo| addrInfoToJSArray(globalThis.allocator(), addrinfo orelse return null, globalThis), .list => |list| brk: { var stack = std.heap.stackFallback(2048, globalThis.allocator()); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); const array = JSC.JSValue.createEmptyArray(globalThis, @as(u32, @truncate(list.items.len))); var i: u32 = 0; const items: []const Result = list.items; diff --git a/src/bun.js/api/bun/socket.zig b/src/bun.js/api/bun/socket.zig index b6320c44f1..f28f07cf6a 100644 --- a/src/bun.js/api/bun/socket.zig +++ b/src/bun.js/api/bun/socket.zig @@ -1,19 +1,19 @@ -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const bun = @import("root").bun; const Environment = bun.Environment; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; +const Output = bun.Output; +const MutableString = bun.MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const Which = @import("../../../which.zig"); -const uws = @import("root").bun.uws; +const uws = bun.uws; const ZigString = JSC.ZigString; const BoringSSL = bun.BoringSSL; const X509 = @import("./x509.zig"); diff --git a/src/bun.js/api/bun/spawn.zig b/src/bun.js/api/bun/spawn.zig index caba172bf7..15ee0a9f2a 100644 --- a/src/bun.js/api/bun/spawn.zig +++ b/src/bun.js/api/bun/spawn.zig @@ -1,4 +1,4 @@ -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const bun = @import("root").bun; const string = bun.string; const std = @import("std"); diff --git a/src/bun.js/api/bun/spawn/stdio.zig b/src/bun.js/api/bun/spawn/stdio.zig index de3d25f085..edcc07fc4e 100644 --- a/src/bun.js/api/bun/spawn/stdio.zig +++ b/src/bun.js/api/bun/spawn/stdio.zig @@ -1,14 +1,14 @@ const Allocator = std.mem.Allocator; const uws = bun.uws; const std = @import("std"); -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const bun = @import("root").bun; const Environment = bun.Environment; const Async = bun.Async; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; -const Output = @import("root").bun.Output; +const Output = bun.Output; const os = std.os; const uv = bun.windows.libuv; pub const Stdio = union(enum) { diff --git a/src/bun.js/api/bun/subprocess.zig b/src/bun.js/api/bun/subprocess.zig index 8198edbf0d..df57bce7d3 100644 --- a/src/bun.js/api/bun/subprocess.zig +++ b/src/bun.js/api/bun/subprocess.zig @@ -1,15 +1,15 @@ -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const bun = @import("root").bun; const Environment = bun.Environment; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; +const Output = bun.Output; +const MutableString = bun.MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const Which = @import("../../../which.zig"); @@ -1555,7 +1555,7 @@ pub const Subprocess = struct { secondaryArgsValue: ?JSValue, comptime is_sync: bool, ) JSValue { - var arena = @import("root").bun.ArenaAllocator.init(bun.default_allocator); + var arena = bun.ArenaAllocator.init(bun.default_allocator); defer arena.deinit(); var allocator = arena.allocator(); diff --git a/src/bun.js/api/bun/x509.zig b/src/bun.js/api/bun/x509.zig index b1ff707890..48d8bb8791 100644 --- a/src/bun.js/api/bun/x509.zig +++ b/src/bun.js/api/bun/x509.zig @@ -2,7 +2,7 @@ const BoringSSL = bun.BoringSSL; const bun = @import("root").bun; const ZigString = JSC.ZigString; const std = @import("std"); -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; diff --git a/src/bun.js/api/ffi.zig b/src/bun.js/api/ffi.zig index aa7d3efc3a..a910238d7c 100644 --- a/src/bun.js/api/ffi.zig +++ b/src/bun.js/api/ffi.zig @@ -7,8 +7,8 @@ const Environment = bun.Environment; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; +const Output = bun.Output; +const MutableString = bun.MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; const IdentityContext = @import("../../identity_context.zig").IdentityContext; @@ -17,7 +17,7 @@ const Resolver = @import("../../resolver/resolver.zig"); const ast = @import("../../import_record.zig"); const MacroEntryPoint = bun.bundler.MacroEntryPoint; -const logger = @import("root").bun.logger; +const logger = bun.logger; const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = bun.Bundler; @@ -28,45 +28,45 @@ const js_ast = bun.JSAst; const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../../analytics/analytics_thread.zig"); -const ZigString = @import("root").bun.JSC.ZigString; +const ZigString = bun.JSC.ZigString; const Runtime = @import("../../runtime.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../../env_loader.zig"); const ParseResult = bun.bundler.ParseResult; const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../../resolver/package_json.zig").MacroMap; -const WebCore = @import("root").bun.JSC.WebCore; +const WebCore = bun.JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; -const js = @import("root").bun.JSC.C; -const JSC = @import("root").bun.JSC; +const js = bun.JSC.C; +const JSC = bun.JSC; const JSError = @import("../base.zig").JSError; const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer; const getAllocator = @import("../base.zig").getAllocator; -const JSValue = @import("root").bun.JSC.JSValue; +const JSValue = bun.JSC.JSValue; -const JSGlobalObject = @import("root").bun.JSC.JSGlobalObject; -const ExceptionValueRef = @import("root").bun.JSC.ExceptionValueRef; -const JSPrivateDataPtr = @import("root").bun.JSC.JSPrivateDataPtr; -const ConsoleObject = @import("root").bun.JSC.ConsoleObject; -const Node = @import("root").bun.JSC.Node; -const ZigException = @import("root").bun.JSC.ZigException; -const ZigStackTrace = @import("root").bun.JSC.ZigStackTrace; -const ErrorableResolvedSource = @import("root").bun.JSC.ErrorableResolvedSource; -const ResolvedSource = @import("root").bun.JSC.ResolvedSource; -const JSPromise = @import("root").bun.JSC.JSPromise; -const JSInternalPromise = @import("root").bun.JSC.JSInternalPromise; -const JSModuleLoader = @import("root").bun.JSC.JSModuleLoader; -const JSPromiseRejectionOperation = @import("root").bun.JSC.JSPromiseRejectionOperation; -const Exception = @import("root").bun.JSC.Exception; -const ErrorableZigString = @import("root").bun.JSC.ErrorableZigString; -const ZigGlobalObject = @import("root").bun.JSC.ZigGlobalObject; -const VM = @import("root").bun.JSC.VM; -const JSFunction = @import("root").bun.JSC.JSFunction; +const JSGlobalObject = bun.JSC.JSGlobalObject; +const ExceptionValueRef = bun.JSC.ExceptionValueRef; +const JSPrivateDataPtr = bun.JSC.JSPrivateDataPtr; +const ConsoleObject = bun.JSC.ConsoleObject; +const Node = bun.JSC.Node; +const ZigException = bun.JSC.ZigException; +const ZigStackTrace = bun.JSC.ZigStackTrace; +const ErrorableResolvedSource = bun.JSC.ErrorableResolvedSource; +const ResolvedSource = bun.JSC.ResolvedSource; +const JSPromise = bun.JSC.JSPromise; +const JSInternalPromise = bun.JSC.JSInternalPromise; +const JSModuleLoader = bun.JSC.JSModuleLoader; +const JSPromiseRejectionOperation = bun.JSC.JSPromiseRejectionOperation; +const Exception = bun.JSC.Exception; +const ErrorableZigString = bun.JSC.ErrorableZigString; +const ZigGlobalObject = bun.JSC.ZigGlobalObject; +const VM = bun.JSC.VM; +const JSFunction = bun.JSC.JSFunction; const Config = @import("../config.zig"); const URL = @import("../../url.zig").URL; const VirtualMachine = JSC.VirtualMachine; diff --git a/src/bun.js/api/filesystem_router.zig b/src/bun.js/api/filesystem_router.zig index d2827ffb6e..d1b6986322 100644 --- a/src/bun.js/api/filesystem_router.zig +++ b/src/bun.js/api/filesystem_router.zig @@ -5,7 +5,7 @@ const QueryStringMap = @import("../../url.zig").QueryStringMap; const CombinedScanner = @import("../../url.zig").CombinedScanner; const bun = @import("root").bun; const string = bun.string; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const js = JSC.C; const WebCore = JSC.WebCore; const Bundler = bun.bundler; @@ -19,14 +19,14 @@ const JSObject = JSC.JSObject; const JSError = Base.JSError; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; -const strings = @import("root").bun.strings; +const strings = bun.strings; const To = Base.To; const Request = WebCore.Request; const URLPath = @import("../../http/url_path.zig"); const URL = @import("../../url.zig").URL; -const Log = @import("root").bun.logger; +const Log = bun.logger; const Resolver = @import("../../resolver/resolver.zig").Resolver; const Router = @import("../../router.zig"); @@ -43,7 +43,7 @@ pub const FileSystemRouter = struct { origin: ?*JSC.RefString = null, base_dir: ?*JSC.RefString = null, router: Router, - arena: *@import("root").bun.ArenaAllocator = undefined, + arena: *bun.ArenaAllocator = undefined, allocator: std.mem.Allocator = undefined, asset_prefix: ?*JSC.RefString = null, @@ -100,8 +100,8 @@ pub const FileSystemRouter = struct { globalThis.throwInvalidArguments("Expected dir to be a string", .{}); return null; } - var arena = globalThis.allocator().create(@import("root").bun.ArenaAllocator) catch unreachable; - arena.* = @import("root").bun.ArenaAllocator.init(globalThis.allocator()); + var arena = globalThis.allocator().create(bun.ArenaAllocator) catch unreachable; + arena.* = bun.ArenaAllocator.init(globalThis.allocator()); const allocator = arena.allocator(); var extensions = std.ArrayList(string).init(allocator); if (argument.get(globalThis, "fileExtensions")) |file_extensions| { @@ -214,8 +214,8 @@ pub const FileSystemRouter = struct { pub fn reload(this: *FileSystemRouter, globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) callconv(.C) JSValue { const this_value = callframe.this(); - var arena = globalThis.allocator().create(@import("root").bun.ArenaAllocator) catch unreachable; - arena.* = @import("root").bun.ArenaAllocator.init(globalThis.allocator()); + var arena = globalThis.allocator().create(bun.ArenaAllocator) catch unreachable; + arena.* = bun.ArenaAllocator.init(globalThis.allocator()); var allocator = arena.allocator(); var vm = globalThis.bunVM(); diff --git a/src/bun.js/api/html_rewriter.zig b/src/bun.js/api/html_rewriter.zig index b0cb87ecfa..47a26afc6b 100644 --- a/src/bun.js/api/html_rewriter.zig +++ b/src/bun.js/api/html_rewriter.zig @@ -1,7 +1,7 @@ const std = @import("std"); const bun = @import("root").bun; const string = bun.string; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const WebCore = @import("../webcore/response.zig"); const ZigString = JSC.ZigString; const Base = @import("../base.zig"); @@ -9,7 +9,7 @@ const getAllocator = Base.getAllocator; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const Response = WebCore.Response; -const LOLHTML = @import("root").bun.LOLHTML; +const LOLHTML = bun.LOLHTML; const SelectorMap = std.ArrayListUnmanaged(*LOLHTML.HTMLSelector); pub const LOLHTMLContext = struct { diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig index 65ff45264e..724b91703c 100644 --- a/src/bun.js/api/server.zig +++ b/src/bun.js/api/server.zig @@ -1,13 +1,13 @@ const Bun = @This(); -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const bun = @import("root").bun; const Environment = bun.Environment; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; +const Output = bun.Output; +const MutableString = bun.MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; const IdentityContext = @import("../../identity_context.zig").IdentityContext; @@ -17,7 +17,7 @@ const ast = @import("../../import_record.zig"); const Sys = @import("../../sys.zig"); const MacroEntryPoint = bun.bundler.MacroEntryPoint; -const logger = @import("root").bun.logger; +const logger = bun.logger; const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = bun.Bundler; @@ -28,55 +28,55 @@ const js_ast = bun.JSAst; const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../../analytics/analytics_thread.zig"); -const ZigString = @import("root").bun.JSC.ZigString; +const ZigString = bun.JSC.ZigString; const Runtime = @import("../../runtime.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../../env_loader.zig"); const ParseResult = bun.bundler.ParseResult; const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../../resolver/package_json.zig").MacroMap; -const WebCore = @import("root").bun.JSC.WebCore; +const WebCore = bun.JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; -const HTTP = @import("root").bun.http; +const HTTP = bun.http; const FetchEvent = WebCore.FetchEvent; -const js = @import("root").bun.JSC.C; -const JSC = @import("root").bun.JSC; +const js = bun.JSC.C; +const JSC = bun.JSC; const JSError = @import("../base.zig").JSError; const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer; const getAllocator = @import("../base.zig").getAllocator; -const JSValue = @import("root").bun.JSC.JSValue; +const JSValue = bun.JSC.JSValue; -const JSGlobalObject = @import("root").bun.JSC.JSGlobalObject; -const ExceptionValueRef = @import("root").bun.JSC.ExceptionValueRef; -const JSPrivateDataPtr = @import("root").bun.JSC.JSPrivateDataPtr; -const ConsoleObject = @import("root").bun.JSC.ConsoleObject; -const Node = @import("root").bun.JSC.Node; -const ZigException = @import("root").bun.JSC.ZigException; -const ZigStackTrace = @import("root").bun.JSC.ZigStackTrace; -const ErrorableResolvedSource = @import("root").bun.JSC.ErrorableResolvedSource; -const ResolvedSource = @import("root").bun.JSC.ResolvedSource; -const JSPromise = @import("root").bun.JSC.JSPromise; -const JSInternalPromise = @import("root").bun.JSC.JSInternalPromise; -const JSModuleLoader = @import("root").bun.JSC.JSModuleLoader; -const JSPromiseRejectionOperation = @import("root").bun.JSC.JSPromiseRejectionOperation; -const Exception = @import("root").bun.JSC.Exception; -const ErrorableZigString = @import("root").bun.JSC.ErrorableZigString; -const ZigGlobalObject = @import("root").bun.JSC.ZigGlobalObject; -const VM = @import("root").bun.JSC.VM; -const JSFunction = @import("root").bun.JSC.JSFunction; +const JSGlobalObject = bun.JSC.JSGlobalObject; +const ExceptionValueRef = bun.JSC.ExceptionValueRef; +const JSPrivateDataPtr = bun.JSC.JSPrivateDataPtr; +const ConsoleObject = bun.JSC.ConsoleObject; +const Node = bun.JSC.Node; +const ZigException = bun.JSC.ZigException; +const ZigStackTrace = bun.JSC.ZigStackTrace; +const ErrorableResolvedSource = bun.JSC.ErrorableResolvedSource; +const ResolvedSource = bun.JSC.ResolvedSource; +const JSPromise = bun.JSC.JSPromise; +const JSInternalPromise = bun.JSC.JSInternalPromise; +const JSModuleLoader = bun.JSC.JSModuleLoader; +const JSPromiseRejectionOperation = bun.JSC.JSPromiseRejectionOperation; +const Exception = bun.JSC.Exception; +const ErrorableZigString = bun.JSC.ErrorableZigString; +const ZigGlobalObject = bun.JSC.ZigGlobalObject; +const VM = bun.JSC.VM; +const JSFunction = bun.JSC.JSFunction; const Config = @import("../config.zig"); const URL = @import("../../url.zig").URL; const VirtualMachine = JSC.VirtualMachine; const IOTask = JSC.IOTask; const is_bindgen = JSC.is_bindgen; -const uws = @import("root").bun.uws; +const uws = bun.uws; const Fallback = Runtime.Fallback; const MimeType = HTTP.MimeType; const Blob = JSC.WebCore.Blob; -const BoringSSL = @import("root").bun.BoringSSL; +const BoringSSL = bun.BoringSSL; const Arena = @import("../../mimalloc_arena.zig").Arena; const SendfileContext = struct { fd: bun.FileDescriptor, @@ -319,7 +319,7 @@ pub const ServerConfig = struct { pub fn inJS(global: *JSC.JSGlobalObject, obj: JSC.JSValue, exception: JSC.C.ExceptionRef) ?SSLConfig { var result = zero; - var arena: @import("root").bun.ArenaAllocator = @import("root").bun.ArenaAllocator.init(bun.default_allocator); + var arena: bun.ArenaAllocator = bun.ArenaAllocator.init(bun.default_allocator); defer arena.deinit(); if (!obj.isObject()) { diff --git a/src/bun.js/base.zig b/src/bun.js/base.zig index 0aa698a347..18b98c253d 100644 --- a/src/bun.js/base.zig +++ b/src/bun.js/base.zig @@ -1,4 +1,4 @@ -pub const js = @import("root").bun.JSC.C; +pub const js = bun.JSC.C; const std = @import("std"); const bun = @import("root").bun; const string = bun.string; @@ -11,7 +11,7 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const JavaScript = @import("./javascript.zig"); -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const WebCore = @import("./webcore.zig"); const Test = @import("./test/jest.zig"); const Fetch = WebCore.Fetch; @@ -19,7 +19,7 @@ const Response = WebCore.Response; const Request = WebCore.Request; const Router = @import("./api/filesystem_router.zig"); const IdentityContext = @import("../identity_context.zig").IdentityContext; -const uws = @import("root").bun.uws; +const uws = bun.uws; const Body = WebCore.Body; const TaggedPointerTypes = @import("../tagged_pointer.zig"); const TaggedPointerUnion = TaggedPointerTypes.TaggedPointerUnion; diff --git a/src/bun.js/bindings/bindings-generator.zig b/src/bun.js/bindings/bindings-generator.zig index f2c084ba55..a215a97926 100644 --- a/src/bun.js/bindings/bindings-generator.zig +++ b/src/bun.js/bindings/bindings-generator.zig @@ -15,14 +15,14 @@ const Allocator = std.mem.Allocator; pub const bindgen = true; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const Classes = JSC.GlobalClasses; pub fn main() anyerror!void { var allocator = std.heap.c_allocator; const src: std.builtin.SourceLocation = @src(); - const src_path = comptime @import("root").bun.Environment.base_path ++ std.fs.path.dirname(src.file).?; + const src_path = comptime bun.Environment.base_path ++ std.fs.path.dirname(src.file).?; { const paths = [_][]const u8{ src_path, "headers.h" }; const paths2 = [_][]const u8{ src_path, "headers-cpp.h" }; diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig index 0215b7ab6f..55348dc834 100644 --- a/src/bun.js/bindings/bindings.zig +++ b/src/bun.js/bindings/bindings.zig @@ -2,7 +2,7 @@ const std = @import("std"); const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; -const C_API = @import("root").bun.JSC.C; +const C_API = bun.JSC.C; const StringPointer = @import("../../api/schema.zig").Api.StringPointer; const Exports = @import("./exports.zig"); const strings = bun.strings; @@ -12,7 +12,7 @@ const ZigException = Exports.ZigException; const ZigStackTrace = Exports.ZigStackTrace; const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; const ArrayBuffer = @import("../base.zig").ArrayBuffer; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const Shimmer = JSC.Shimmer; const ConsoleObject = JSC.ConsoleObject; const FFI = @import("./FFI.zig"); diff --git a/src/bun.js/bindings/bun-simdutf.zig b/src/bun.js/bindings/bun-simdutf.zig index a8b5b6653a..0ff7a07d07 100644 --- a/src/bun.js/bindings/bun-simdutf.zig +++ b/src/bun.js/bindings/bun-simdutf.zig @@ -1,4 +1,5 @@ -const JSC = @import("root").bun.JSC; +const bun = @import("root").bun; +const JSC = bun.JSC; pub const SIMDUTFResult = extern struct { status: Status, diff --git a/src/bun.js/bindings/codegen.zig b/src/bun.js/bindings/codegen.zig index eaa3f4e644..bf67bb491c 100644 --- a/src/bun.js/bindings/codegen.zig +++ b/src/bun.js/bindings/codegen.zig @@ -1,5 +1,6 @@ -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const std = @import("std"); +const bun = @import("root").bun; pub const CallbackGetterFn = fn (JSC.JSValue) callconv(.C) JSC.JSValue; pub const CallbackSetterFn = fn (JSC.JSValue, JSC.JSValue) callconv(.C) void; diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig index 99ee9ce599..a70c1173f4 100644 --- a/src/bun.js/bindings/exports.zig +++ b/src/bun.js/bindings/exports.zig @@ -1,4 +1,4 @@ -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const Fs = @import("../../fs.zig"); const CAPI = JSC.C; const JS = @import("../javascript.zig"); @@ -8,7 +8,7 @@ const Api = @import("../../api/schema.zig").Api; const bun = @import("root").bun; const std = @import("std"); const Shimmer = @import("./shimmer.zig").Shimmer; -const strings = @import("root").bun.strings; +const strings = bun.strings; const default_allocator = bun.default_allocator; const NewGlobalObject = JSC.NewGlobalObject; const JSGlobalObject = JSC.JSGlobalObject; diff --git a/src/bun.js/bindings/generated_classes_list.zig b/src/bun.js/bindings/generated_classes_list.zig index 0a7b52c153..2c28e25c1b 100644 --- a/src/bun.js/bindings/generated_classes_list.zig +++ b/src/bun.js/bindings/generated_classes_list.zig @@ -1,4 +1,5 @@ -const JSC = @import("root").bun.JSC; +const bun = @import("root").bun; +const JSC = bun.JSC; pub const Classes = struct { pub const Blob = JSC.WebCore.Blob; diff --git a/src/bun.js/bindings/headers-replacements.zig b/src/bun.js/bindings/headers-replacements.zig index 39730a52f1..2c9173e774 100644 --- a/src/bun.js/bindings/headers-replacements.zig +++ b/src/bun.js/bindings/headers-replacements.zig @@ -1,4 +1,4 @@ -const bindings = @import("root").bun.JSC; +const bindings = bun.JSC; pub const struct_JSC__CallFrame = bindings.CallFrame; pub const struct_JSC__StringPrototype = bindings.StringPrototype; pub const struct_JSC__SetIteratorPrototype = bindings.SetIteratorPrototype; @@ -68,4 +68,4 @@ pub const WebSocketHTTPClient = bindings.WebSocketHTTPClient; pub const WebSocketHTTPSClient = bindings.WebSocketHTTPSClient; pub const WebSocketClient = bindings.WebSocketClient; pub const WebSocketClientTLS = bindings.WebSocketClientTLS; -pub const BunString = @import("root").bun.String; +pub const BunString = bun.String; diff --git a/src/bun.js/bindings/headers.zig b/src/bun.js/bindings/headers.zig index 810d0d076c..91015dab3d 100644 --- a/src/bun.js/bindings/headers.zig +++ b/src/bun.js/bindings/headers.zig @@ -1,6 +1,5 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -const bindings = @import("root").bun.JSC; +const bun = @import("root").bun; +const bindings = bun.JSC; pub const struct_JSC__CallFrame = bindings.CallFrame; pub const struct_JSC__StringPrototype = bindings.StringPrototype; pub const struct_JSC__SetIteratorPrototype = bindings.SetIteratorPrototype; @@ -71,7 +70,7 @@ pub const WebSocketHTTPClient = bindings.WebSocketHTTPClient; pub const WebSocketHTTPSClient = bindings.WebSocketHTTPSClient; pub const WebSocketClient = bindings.WebSocketClient; pub const WebSocketClientTLS = bindings.WebSocketClientTLS; -pub const BunString = @import("root").bun.String; +pub const BunString = bun.String; pub const JSC__JSString = bJSC__JSString; pub const JSC__JSPromise = bJSC__JSPromise; pub const JSC__VM = bJSC__VM; diff --git a/src/bun.js/config.zig b/src/bun.js/config.zig index 079c0b8f64..1018a6226d 100644 --- a/src/bun.js/config.zig +++ b/src/bun.js/config.zig @@ -13,7 +13,7 @@ const std = @import("std"); const Fs = @import("../fs.zig"); const resolver = @import("../resolver/resolver.zig"); const ast = @import("../import_record.zig"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const Api = @import("../api/schema.zig").Api; const options = @import("../options.zig"); const Bundler = bun.bundler.ServeBundler; diff --git a/src/bun.js/event_loop.zig b/src/bun.js/event_loop.zig index 0f230fe5cd..24fd49265e 100644 --- a/src/bun.js/event_loop.zig +++ b/src/bun.js/event_loop.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSGlobalObject = JSC.JSGlobalObject; const VirtualMachine = JSC.VirtualMachine; const Allocator = std.mem.Allocator; @@ -25,7 +25,7 @@ const Waker = bun.Async.Waker; pub const WorkPool = @import("../work_pool.zig").WorkPool; pub const WorkPoolTask = @import("../work_pool.zig").Task; -const uws = @import("root").bun.uws; +const uws = bun.uws; const Async = bun.Async; pub fn ConcurrentPromiseTask(comptime Context: type) type { diff --git a/src/bun.js/ipc.zig b/src/bun.js/ipc.zig index bc8cd134cb..7a4590ef77 100644 --- a/src/bun.js/ipc.zig +++ b/src/bun.js/ipc.zig @@ -4,11 +4,11 @@ const Environment = bun.Environment; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; +const Output = bun.Output; +const MutableString = bun.MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig index 9a9c28a38e..25ce1c407b 100644 --- a/src/bun.js/javascript.zig +++ b/src/bun.js/javascript.zig @@ -22,7 +22,7 @@ const Resolver = @import("../resolver/resolver.zig"); const ast = @import("../import_record.zig"); const MacroEntryPoint = bun.bundler.MacroEntryPoint; const ParseResult = bun.bundler.ParseResult; -const logger = @import("root").bun.logger; +const logger = bun.logger; const Api = @import("../api/schema.zig").Api; const options = @import("../options.zig"); const Bundler = bun.Bundler; @@ -34,47 +34,47 @@ const js_ast = bun.JSAst; const NodeFallbackModules = @import("../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../analytics/analytics_thread.zig"); -const ZigString = @import("root").bun.JSC.ZigString; +const ZigString = bun.JSC.ZigString; const Runtime = @import("../runtime.zig"); const Router = @import("./api/filesystem_router.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../env_loader.zig"); const PackageJSON = @import("../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../resolver/package_json.zig").MacroMap; -const WebCore = @import("root").bun.JSC.WebCore; +const WebCore = bun.JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const String = bun.String; const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; -const js = @import("root").bun.JSC.C; -const JSC = @import("root").bun.JSC; +const js = bun.JSC.C; +const JSC = bun.JSC; const JSError = @import("./base.zig").JSError; const d = @import("./base.zig").d; const MarkedArrayBuffer = @import("./base.zig").MarkedArrayBuffer; const getAllocator = @import("./base.zig").getAllocator; -const JSValue = @import("root").bun.JSC.JSValue; +const JSValue = bun.JSC.JSValue; const NewClass = @import("./base.zig").NewClass; -const JSGlobalObject = @import("root").bun.JSC.JSGlobalObject; -const ExceptionValueRef = @import("root").bun.JSC.ExceptionValueRef; -const JSPrivateDataPtr = @import("root").bun.JSC.JSPrivateDataPtr; -const ConsoleObject = @import("root").bun.JSC.ConsoleObject; -const Node = @import("root").bun.JSC.Node; -const ZigException = @import("root").bun.JSC.ZigException; -const ZigStackTrace = @import("root").bun.JSC.ZigStackTrace; -const ErrorableResolvedSource = @import("root").bun.JSC.ErrorableResolvedSource; -const ResolvedSource = @import("root").bun.JSC.ResolvedSource; -const JSPromise = @import("root").bun.JSC.JSPromise; -const JSInternalPromise = @import("root").bun.JSC.JSInternalPromise; -const JSModuleLoader = @import("root").bun.JSC.JSModuleLoader; -const JSPromiseRejectionOperation = @import("root").bun.JSC.JSPromiseRejectionOperation; -const Exception = @import("root").bun.JSC.Exception; -const ErrorableZigString = @import("root").bun.JSC.ErrorableZigString; -const ZigGlobalObject = @import("root").bun.JSC.ZigGlobalObject; -const VM = @import("root").bun.JSC.VM; -const JSFunction = @import("root").bun.JSC.JSFunction; +const JSGlobalObject = bun.JSC.JSGlobalObject; +const ExceptionValueRef = bun.JSC.ExceptionValueRef; +const JSPrivateDataPtr = bun.JSC.JSPrivateDataPtr; +const ConsoleObject = bun.JSC.ConsoleObject; +const Node = bun.JSC.Node; +const ZigException = bun.JSC.ZigException; +const ZigStackTrace = bun.JSC.ZigStackTrace; +const ErrorableResolvedSource = bun.JSC.ErrorableResolvedSource; +const ResolvedSource = bun.JSC.ResolvedSource; +const JSPromise = bun.JSC.JSPromise; +const JSInternalPromise = bun.JSC.JSInternalPromise; +const JSModuleLoader = bun.JSC.JSModuleLoader; +const JSPromiseRejectionOperation = bun.JSC.JSPromiseRejectionOperation; +const Exception = bun.JSC.Exception; +const ErrorableZigString = bun.JSC.ErrorableZigString; +const ZigGlobalObject = bun.JSC.ZigGlobalObject; +const VM = bun.JSC.VM; +const JSFunction = bun.JSC.JSFunction; const Config = @import("./config.zig"); const URL = @import("../url.zig").URL; const Bun = JSC.API.Bun; @@ -263,7 +263,7 @@ pub const SavedSourceMap = struct { return SourceMap.Mapping.find(parsed_mappings.mappings, line, column); } }; -const uws = @import("root").bun.uws; +const uws = bun.uws; pub export fn Bun__getDefaultGlobal() *JSGlobalObject { return JSC.VirtualMachine.get().global; diff --git a/src/bun.js/javascript_core_c_api.zig b/src/bun.js/javascript_core_c_api.zig index 87e06a3149..00a7be2ded 100644 --- a/src/bun.js/javascript_core_c_api.zig +++ b/src/bun.js/javascript_core_c_api.zig @@ -12,7 +12,7 @@ const generic = opaque { return @as(cpp.JSValue, @enumFromInt(@as(cpp.JSValue.Type, @bitCast(@intFromPtr(this))))); } - pub inline fn bunVM(this: *@This()) *@import("root").bun.JSC.VirtualMachine { + pub inline fn bunVM(this: *@This()) *bun.JSC.VirtualMachine { return this.ptr().bunVM(); } }; @@ -180,13 +180,13 @@ pub extern fn JSValueToNumber(ctx: JSContextRef, value: JSValueRef, exception: E pub extern fn JSValueToStringCopy(ctx: JSContextRef, value: JSValueRef, exception: ExceptionRef) JSStringRef; pub extern fn JSValueToObject(ctx: JSContextRef, value: JSValueRef, exception: ExceptionRef) JSObjectRef; -const log_protection = @import("root").bun.Environment.allow_assert and false; +const log_protection = bun.Environment.allow_assert and false; pub inline fn JSValueUnprotect(ctx: JSContextRef, value: JSValueRef) void { const Wrapped = struct { pub extern fn JSValueUnprotect(ctx: JSContextRef, value: JSValueRef) void; }; if (comptime log_protection) { - const Output = @import("root").bun.Output; + const Output = bun.Output; Output.debug("[unprotect] {d}\n", .{@intFromPtr(value)}); } // wrapper exists to make it easier to set a breakpoint @@ -198,7 +198,7 @@ pub inline fn JSValueProtect(ctx: JSContextRef, value: JSValueRef) void { pub extern fn JSValueProtect(ctx: JSContextRef, value: JSValueRef) void; }; if (comptime log_protection) { - const Output = @import("root").bun.Output; + const Output = bun.Output; Output.debug("[protect] {d}\n", .{@intFromPtr(value)}); } // wrapper exists to make it easier to set a breakpoint diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig index 98970fa02d..4552d46f27 100644 --- a/src/bun.js/module_loader.zig +++ b/src/bun.js/module_loader.zig @@ -21,7 +21,7 @@ const Resolver = @import("../resolver/resolver.zig"); const ast = @import("../import_record.zig"); const MacroEntryPoint = bun.bundler.MacroEntryPoint; const ParseResult = bun.bundler.ParseResult; -const logger = @import("root").bun.logger; +const logger = bun.logger; const Api = @import("../api/schema.zig").Api; const options = @import("../options.zig"); const Bundler = bun.Bundler; @@ -33,46 +33,46 @@ const js_ast = bun.JSAst; const NodeFallbackModules = @import("../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../analytics/analytics_thread.zig"); -const ZigString = @import("root").bun.JSC.ZigString; +const ZigString = bun.JSC.ZigString; const Runtime = @import("../runtime.zig"); const Router = @import("./api/filesystem_router.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../env_loader.zig"); const PackageJSON = @import("../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../resolver/package_json.zig").MacroMap; -const WebCore = @import("root").bun.JSC.WebCore; +const WebCore = bun.JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; -const js = @import("root").bun.JSC.C; -const JSC = @import("root").bun.JSC; +const js = bun.JSC.C; +const JSC = bun.JSC; const JSError = @import("./base.zig").JSError; const d = @import("./base.zig").d; const MarkedArrayBuffer = @import("./base.zig").MarkedArrayBuffer; const getAllocator = @import("./base.zig").getAllocator; -const JSValue = @import("root").bun.JSC.JSValue; +const JSValue = bun.JSC.JSValue; const NewClass = @import("./base.zig").NewClass; -const JSGlobalObject = @import("root").bun.JSC.JSGlobalObject; -const ExceptionValueRef = @import("root").bun.JSC.ExceptionValueRef; -const JSPrivateDataPtr = @import("root").bun.JSC.JSPrivateDataPtr; -const ConsoleObject = @import("root").bun.JSC.ConsoleObject; -const Node = @import("root").bun.JSC.Node; -const ZigException = @import("root").bun.JSC.ZigException; -const ZigStackTrace = @import("root").bun.JSC.ZigStackTrace; -const ErrorableResolvedSource = @import("root").bun.JSC.ErrorableResolvedSource; -const ResolvedSource = @import("root").bun.JSC.ResolvedSource; -const JSPromise = @import("root").bun.JSC.JSPromise; -const JSInternalPromise = @import("root").bun.JSC.JSInternalPromise; -const JSModuleLoader = @import("root").bun.JSC.JSModuleLoader; -const JSPromiseRejectionOperation = @import("root").bun.JSC.JSPromiseRejectionOperation; -const Exception = @import("root").bun.JSC.Exception; -const ErrorableZigString = @import("root").bun.JSC.ErrorableZigString; -const ZigGlobalObject = @import("root").bun.JSC.ZigGlobalObject; -const VM = @import("root").bun.JSC.VM; -const JSFunction = @import("root").bun.JSC.JSFunction; +const JSGlobalObject = bun.JSC.JSGlobalObject; +const ExceptionValueRef = bun.JSC.ExceptionValueRef; +const JSPrivateDataPtr = bun.JSC.JSPrivateDataPtr; +const ConsoleObject = bun.JSC.ConsoleObject; +const Node = bun.JSC.Node; +const ZigException = bun.JSC.ZigException; +const ZigStackTrace = bun.JSC.ZigStackTrace; +const ErrorableResolvedSource = bun.JSC.ErrorableResolvedSource; +const ResolvedSource = bun.JSC.ResolvedSource; +const JSPromise = bun.JSC.JSPromise; +const JSInternalPromise = bun.JSC.JSInternalPromise; +const JSModuleLoader = bun.JSC.JSModuleLoader; +const JSPromiseRejectionOperation = bun.JSC.JSPromiseRejectionOperation; +const Exception = bun.JSC.Exception; +const ErrorableZigString = bun.JSC.ErrorableZigString; +const ZigGlobalObject = bun.JSC.ZigGlobalObject; +const VM = bun.JSC.VM; +const JSFunction = bun.JSC.JSFunction; const Config = @import("./config.zig"); const URL = @import("../url.zig").URL; const Bun = JSC.API.Bun; diff --git a/src/bun.js/node/dir_iterator.zig b/src/bun.js/node/dir_iterator.zig index 74a4bf92ea..9a5bfe4c84 100644 --- a/src/bun.js/node/dir_iterator.zig +++ b/src/bun.js/node/dir_iterator.zig @@ -10,13 +10,13 @@ const std = @import("std"); const os = std.os; const Dir = std.fs.Dir; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const PathString = JSC.PathString; const bun = @import("root").bun; const IteratorError = error{ AccessDenied, SystemResources } || os.UnexpectedError; const mem = std.mem; -const strings = @import("root").bun.strings; +const strings = bun.strings; const Maybe = JSC.Maybe; const File = std.fs.File; diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig index e5f7aa8ba6..6d72269796 100644 --- a/src/bun.js/node/node_fs.zig +++ b/src/bun.js/node/node_fs.zig @@ -6,7 +6,7 @@ const bun = @import("root").bun; const strings = bun.strings; const windows = bun.windows; const string = bun.string; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const PathString = JSC.PathString; const Environment = bun.Environment; const C = bun.C; diff --git a/src/bun.js/node/node_fs_binding.zig b/src/bun.js/node/node_fs_binding.zig index 5b6b399219..a5613f0d0a 100644 --- a/src/bun.js/node/node_fs_binding.zig +++ b/src/bun.js/node/node_fs_binding.zig @@ -6,7 +6,7 @@ const ArgumentsSlice = JSC.Node.ArgumentsSlice; const system = std.os.system; const Maybe = JSC.Maybe; const Encoding = JSC.Node.Encoding; -const FeatureFlags = @import("root").bun.FeatureFlags; +const FeatureFlags = bun.FeatureFlags; const Args = JSC.Node.NodeFS.Arguments; const d = JSC.d; diff --git a/src/bun.js/node/node_fs_stat_watcher.zig b/src/bun.js/node/node_fs_stat_watcher.zig index 8514dcc071..d546143e88 100644 --- a/src/bun.js/node/node_fs_stat_watcher.zig +++ b/src/bun.js/node/node_fs_stat_watcher.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const bun = @import("root").bun; const Fs = @import("../../fs.zig"); const Path = @import("../../resolver/resolve_path.zig"); diff --git a/src/bun.js/node/node_fs_watcher.zig b/src/bun.js/node/node_fs_watcher.zig index 0ca350a3db..b3a13a8915 100644 --- a/src/bun.js/node/node_fs_watcher.zig +++ b/src/bun.js/node/node_fs_watcher.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const bun = @import("root").bun; const Fs = @import("../../fs.zig"); const Path = @import("../../resolver/resolve_path.zig"); diff --git a/src/bun.js/node/node_os.zig b/src/bun.js/node/node_os.zig index 95c5992c4d..d48f99c9d7 100644 --- a/src/bun.js/node/node_os.zig +++ b/src/bun.js/node/node_os.zig @@ -4,7 +4,7 @@ const bun = @import("root").bun; const C = bun.C; const string = bun.string; const strings = bun.strings; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const Environment = bun.Environment; const Global = bun.Global; const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; diff --git a/src/bun.js/node/os/constants.zig b/src/bun.js/node/os/constants.zig index 9cf754e032..858f3f2f01 100644 --- a/src/bun.js/node/os/constants.zig +++ b/src/bun.js/node/os/constants.zig @@ -2,7 +2,7 @@ const std = @import("std"); const bun = @import("root").bun; const string = bun.string; const Environment = bun.Environment; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const ConstantType = enum { ERRNO, ERRNO_WIN, SIG, DLOPEN, OTHER }; diff --git a/src/bun.js/node/util/parse_args_utils.zig b/src/bun.js/node/util/parse_args_utils.zig index 1555ba4752..e94d91bb3b 100644 --- a/src/bun.js/node/util/parse_args_utils.zig +++ b/src/bun.js/node/util/parse_args_utils.zig @@ -1,7 +1,8 @@ const std = @import("std"); +const bun = @import("root").bun; const testing = std.testing; -const String = if (@import("builtin").is_test) TestString else @import("root").bun.String; -const JSValue = if (@import("builtin").is_test) usize else @import("root").bun.JSC.JSValue; +const String = if (@import("builtin").is_test) TestString else bun.String; +const JSValue = if (@import("builtin").is_test) usize else bun.JSC.JSValue; pub const OptionValueType = enum { boolean, string }; diff --git a/src/bun.js/node/util/validators.zig b/src/bun.js/node/util/validators.zig index 93de1f8f4d..6ea243b67c 100644 --- a/src/bun.js/node/util/validators.zig +++ b/src/bun.js/node/util/validators.zig @@ -1,7 +1,7 @@ const std = @import("std"); const bun = @import("root").bun; const string = bun.string; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const ZigString = JSC.ZigString; diff --git a/src/bun.js/rare_data.zig b/src/bun.js/rare_data.zig index 8b2920a4b6..1f6b6f8ede 100644 --- a/src/bun.js/rare_data.zig +++ b/src/bun.js/rare_data.zig @@ -1,12 +1,12 @@ const EditorContext = @import("../open.zig").EditorContext; const Blob = JSC.WebCore.Blob; -const default_allocator = @import("root").bun.default_allocator; -const Output = @import("root").bun.Output; +const default_allocator = bun.default_allocator; +const Output = bun.Output; const RareData = @This(); const Syscall = bun.sys; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const std = @import("std"); -const BoringSSL = @import("root").bun.BoringSSL; +const BoringSSL = bun.BoringSSL; const bun = @import("root").bun; const FDImpl = bun.FDImpl; const Environment = bun.Environment; @@ -15,7 +15,7 @@ const UUID = @import("./uuid.zig"); const Async = bun.Async; const StatWatcherScheduler = @import("./node/node_fs_stat_watcher.zig").StatWatcherScheduler; const IPC = @import("./ipc.zig"); -const uws = @import("root").bun.uws; +const uws = bun.uws; boring_ssl_engine: ?*BoringSSL.ENGINE = null, editor_context: EditorContext = EditorContext{}, diff --git a/src/bun.js/script_execution_context.zig b/src/bun.js/script_execution_context.zig index 50f531689d..3753952363 100644 --- a/src/bun.js/script_execution_context.zig +++ b/src/bun.js/script_execution_context.zig @@ -1,4 +1,4 @@ -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; pub const ScriptExecutionContext = extern struct { main_file_path: JSC.ZigString, diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig index 95bad40e40..8aad1acdbd 100644 --- a/src/bun.js/test/jest.zig +++ b/src/bun.js/test/jest.zig @@ -5,7 +5,7 @@ const js_ast = bun.JSAst; const Api = @import("../../api/schema.zig").Api; const MimeType = bun.http.MimeType; const ZigURL = @import("../../url.zig").URL; -const HTTPClient = @import("root").bun.http; +const HTTPClient = bun.http; const Environment = bun.Environment; const Snapshots = @import("./snapshot.zig").Snapshots; @@ -15,20 +15,20 @@ const Expect = expect.Expect; const DiffFormatter = @import("./diff_format.zig").DiffFormatter; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const js = JSC.C; -const logger = @import("root").bun.logger; +const logger = bun.logger; const Method = @import("../../http/method.zig").Method; const ObjectPool = @import("../../pool.zig").ObjectPool; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; -const strings = @import("root").bun.strings; -const string = @import("root").bun.string; -const default_allocator = @import("root").bun.default_allocator; -const FeatureFlags = @import("root").bun.FeatureFlags; +const Output = bun.Output; +const MutableString = bun.MutableString; +const strings = bun.strings; +const string = bun.string; +const default_allocator = bun.default_allocator; +const FeatureFlags = bun.FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; const getAllocator = @import("../base.zig").getAllocator; diff --git a/src/bun.js/webcore.zig b/src/bun.js/webcore.zig index 7e170988fc..0bfc83753d 100644 --- a/src/bun.js/webcore.zig +++ b/src/bun.js/webcore.zig @@ -5,7 +5,7 @@ pub usingnamespace @import("./webcore/blob.zig"); pub usingnamespace @import("./webcore/request.zig"); pub usingnamespace @import("./webcore/body.zig"); -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const std = @import("std"); const bun = @import("root").bun; const string = bun.string; @@ -342,7 +342,7 @@ pub const Prompt = struct { pub const Crypto = struct { garbage: i32 = 0, - const BoringSSL = @import("root").bun.BoringSSL; + const BoringSSL = bun.BoringSSL; pub const doScryptSync = JSC.wrapInstanceMethod(Crypto, "scryptSync", false); diff --git a/src/bun.js/webcore/blob.zig b/src/bun.js/webcore/blob.zig index 26123df5bd..3537cd9f99 100644 --- a/src/bun.js/webcore/blob.zig +++ b/src/bun.js/webcore/blob.zig @@ -3,20 +3,20 @@ const Api = @import("../../api/schema.zig").Api; const bun = @import("root").bun; const MimeType = http.MimeType; const ZigURL = @import("../../url.zig").URL; -const http = @import("root").bun.http; -const JSC = @import("root").bun.JSC; +const http = bun.http; +const JSC = bun.JSC; const js = JSC.C; const io = bun.io; const Method = @import("../../http/method.zig").Method; const FetchHeaders = JSC.FetchHeaders; const ObjectPool = @import("../../pool.zig").ObjectPool; const SystemError = JSC.SystemError; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; -const strings = @import("root").bun.strings; -const string = @import("root").bun.string; -const default_allocator = @import("root").bun.default_allocator; -const FeatureFlags = @import("root").bun.FeatureFlags; +const Output = bun.Output; +const MutableString = bun.MutableString; +const strings = bun.strings; +const string = bun.string; +const default_allocator = bun.default_allocator; +const FeatureFlags = bun.FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; @@ -34,9 +34,9 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; const JSPrinter = bun.js_printer; -const picohttp = @import("root").bun.picohttp; +const picohttp = bun.picohttp; const StringJoiner = @import("../../string_joiner.zig"); -const uws = @import("root").bun.uws; +const uws = bun.uws; const invalid_fd = bun.invalid_fd; const Response = JSC.WebCore.Response; @@ -518,7 +518,7 @@ pub const Blob = struct { allocator: std.mem.Allocator, form_data: *JSC.DOMFormData, ) Blob { - var arena = @import("root").bun.ArenaAllocator.init(allocator); + var arena = bun.ArenaAllocator.init(allocator); defer arena.deinit(); var stack_allocator = std.heap.stackFallback(1024, arena.allocator()); const stack_mem_all = stack_allocator.get(); diff --git a/src/bun.js/webcore/body.zig b/src/bun.js/webcore/body.zig index a6b28afc0c..3ece0a37ed 100644 --- a/src/bun.js/webcore/body.zig +++ b/src/bun.js/webcore/body.zig @@ -3,20 +3,20 @@ const Api = @import("../../api/schema.zig").Api; const bun = @import("root").bun; const MimeType = bun.http.MimeType; const ZigURL = @import("../../url.zig").URL; -const HTTPClient = @import("root").bun.http; -const JSC = @import("root").bun.JSC; +const HTTPClient = bun.http; +const JSC = bun.JSC; const js = JSC.C; const Method = @import("../../http/method.zig").Method; const FetchHeaders = JSC.FetchHeaders; const ObjectPool = @import("../../pool.zig").ObjectPool; const SystemError = JSC.SystemError; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; -const strings = @import("root").bun.strings; -const string = @import("root").bun.string; -const default_allocator = @import("root").bun.default_allocator; -const FeatureFlags = @import("root").bun.FeatureFlags; +const Output = bun.Output; +const MutableString = bun.MutableString; +const strings = bun.strings; +const string = bun.string; +const default_allocator = bun.default_allocator; +const FeatureFlags = bun.FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; @@ -36,9 +36,9 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; const JSPrinter = bun.js_printer; -const picohttp = @import("root").bun.picohttp; +const picohttp = bun.picohttp; const StringJoiner = @import("../../string_joiner.zig"); -const uws = @import("root").bun.uws; +const uws = bun.uws; const Blob = JSC.WebCore.Blob; // const InlineBlob = JSC.WebCore.InlineBlob; diff --git a/src/bun.js/webcore/encoding.zig b/src/bun.js/webcore/encoding.zig index c47454687c..690be5a855 100644 --- a/src/bun.js/webcore/encoding.zig +++ b/src/bun.js/webcore/encoding.zig @@ -2,21 +2,21 @@ const std = @import("std"); const Api = @import("../../api/schema.zig").Api; const MimeType = bun.http.MimeType; const ZigURL = @import("../../url.zig").URL; -const HTTPClient = @import("root").bun.http; +const HTTPClient = bun.http; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const js = JSC.C; const Method = @import("../../http/method.zig").Method; const ObjectPool = @import("../../pool.zig").ObjectPool; const bun = @import("root").bun; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; -const strings = @import("root").bun.strings; -const string = @import("root").bun.string; -const default_allocator = @import("root").bun.default_allocator; -const FeatureFlags = @import("root").bun.FeatureFlags; +const Output = bun.Output; +const MutableString = bun.MutableString; +const strings = bun.strings; +const string = bun.string; +const default_allocator = bun.default_allocator; +const FeatureFlags = bun.FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; @@ -35,7 +35,7 @@ const JSGlobalObject = JSC.JSGlobalObject; const VirtualMachine = JSC.VirtualMachine; const Task = @import("../javascript.zig").Task; -const picohttp = @import("root").bun.picohttp; +const picohttp = bun.picohttp; pub const TextEncoder = struct { filler: u32 = 0, diff --git a/src/bun.js/webcore/request.zig b/src/bun.js/webcore/request.zig index 2099bd354c..2817348045 100644 --- a/src/bun.js/webcore/request.zig +++ b/src/bun.js/webcore/request.zig @@ -3,8 +3,8 @@ const Api = @import("../../api/schema.zig").Api; const bun = @import("root").bun; const MimeType = bun.http.MimeType; const ZigURL = @import("../../url.zig").URL; -const HTTPClient = @import("root").bun.http; -const JSC = @import("root").bun.JSC; +const HTTPClient = bun.http; +const JSC = bun.JSC; const js = JSC.C; const Method = @import("../../http/method.zig").Method; @@ -12,12 +12,12 @@ const FetchHeaders = JSC.FetchHeaders; const AbortSignal = JSC.WebCore.AbortSignal; const ObjectPool = @import("../../pool.zig").ObjectPool; const SystemError = JSC.SystemError; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; -const strings = @import("root").bun.strings; -const string = @import("root").bun.string; -const default_allocator = @import("root").bun.default_allocator; -const FeatureFlags = @import("root").bun.FeatureFlags; +const Output = bun.Output; +const MutableString = bun.MutableString; +const strings = bun.strings; +const string = bun.string; +const default_allocator = bun.default_allocator; +const FeatureFlags = bun.FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; @@ -37,9 +37,9 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; const JSPrinter = bun.js_printer; -const picohttp = @import("root").bun.picohttp; +const picohttp = bun.picohttp; const StringJoiner = @import("../../string_joiner.zig"); -const uws = @import("root").bun.uws; +const uws = bun.uws; const InlineBlob = JSC.WebCore.InlineBlob; const AnyBlob = JSC.WebCore.AnyBlob; diff --git a/src/bun.js/webcore/response.zig b/src/bun.js/webcore/response.zig index d301b82c53..3531f11d3f 100644 --- a/src/bun.js/webcore/response.zig +++ b/src/bun.js/webcore/response.zig @@ -3,21 +3,21 @@ const Api = @import("../../api/schema.zig").Api; const bun = @import("root").bun; const MimeType = bun.http.MimeType; const ZigURL = @import("../../url.zig").URL; -const http = @import("root").bun.http; +const http = bun.http; const FetchRedirect = http.FetchRedirect; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const js = JSC.C; const Method = @import("../../http/method.zig").Method; const FetchHeaders = JSC.FetchHeaders; const ObjectPool = @import("../../pool.zig").ObjectPool; const SystemError = JSC.SystemError; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; -const strings = @import("root").bun.strings; -const string = @import("root").bun.string; -const default_allocator = @import("root").bun.default_allocator; -const FeatureFlags = @import("root").bun.FeatureFlags; +const Output = bun.Output; +const MutableString = bun.MutableString; +const strings = bun.strings; +const string = bun.string; +const default_allocator = bun.default_allocator; +const FeatureFlags = bun.FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; @@ -38,9 +38,9 @@ const DataURL = @import("../../resolver/data_url.zig").DataURL; const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; const JSPrinter = bun.js_printer; -const picohttp = @import("root").bun.picohttp; +const picohttp = bun.picohttp; const StringJoiner = @import("../../string_joiner.zig"); -const uws = @import("root").bun.uws; +const uws = bun.uws; const Mutex = @import("../../lock.zig").Lock; const InlineBlob = JSC.WebCore.InlineBlob; diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig index 7703efa216..01df75471c 100644 --- a/src/bun.js/webcore/streams.zig +++ b/src/bun.js/webcore/streams.zig @@ -4,19 +4,19 @@ const bun = @import("root").bun; const MimeType = HTTPClient.MimeType; const ZigURL = @import("../../url.zig").URL; const HTTPClient = bun.http; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const js = JSC.C; const Method = @import("../../http/method.zig").Method; const FetchHeaders = JSC.FetchHeaders; const ObjectPool = @import("../../pool.zig").ObjectPool; const SystemError = JSC.SystemError; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; -const strings = @import("root").bun.strings; -const string = @import("root").bun.string; -const default_allocator = @import("root").bun.default_allocator; -const FeatureFlags = @import("root").bun.FeatureFlags; +const Output = bun.Output; +const MutableString = bun.MutableString; +const strings = bun.strings; +const string = bun.string; +const default_allocator = bun.default_allocator; +const FeatureFlags = bun.FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; const Async = bun.Async; @@ -36,9 +36,9 @@ const E = bun.C.E; const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; const JSPrinter = bun.js_printer; -const picohttp = @import("root").bun.picohttp; +const picohttp = bun.picohttp; const StringJoiner = @import("../../string_joiner.zig"); -const uws = @import("root").bun.uws; +const uws = bun.uws; const Blob = JSC.WebCore.Blob; const Response = JSC.WebCore.Response; const Request = JSC.WebCore.Request; diff --git a/src/bun_js.zig b/src/bun_js.zig index ec76be444d..73ce474679 100644 --- a/src/bun_js.zig +++ b/src/bun_js.zig @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const options = @import("options.zig"); const js_parser = bun.js_parser; const json_parser = bun.JSON; @@ -27,8 +27,8 @@ const Command = @import("cli.zig").Command; const bundler = bun.bundler; const DotEnv = @import("env_loader.zig"); const which = @import("which.zig").which; -const JSC = @import("root").bun.JSC; -const AsyncHTTP = @import("root").bun.http.AsyncHTTP; +const JSC = bun.JSC; +const AsyncHTTP = bun.http.AsyncHTTP; const Arena = @import("./mimalloc_arena.zig").Arena; const OpaqueWrap = JSC.OpaqueWrap; diff --git a/src/bundler.zig b/src/bundler.zig index 77f8a0e91f..138b5777cf 100644 --- a/src/bundler.zig +++ b/src/bundler.zig @@ -12,7 +12,7 @@ const FeatureFlags = bun.FeatureFlags; const C = bun.C; const std = @import("std"); const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const options = @import("options.zig"); const js_parser = bun.js_parser; const json_parser = bun.JSON; @@ -50,7 +50,7 @@ const Report = @import("./report.zig"); const Linker = linker.Linker; const Resolver = _resolver.Resolver; const TOML = @import("./toml/toml_parser.zig").TOML; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const PackageManager = @import("./install/install.zig").PackageManager; pub fn MacroJSValueType_() type { diff --git a/src/bundler/bundle_v2.zig b/src/bundler/bundle_v2.zig index cbfc0e9aea..9967311bfa 100644 --- a/src/bundler/bundle_v2.zig +++ b/src/bundler/bundle_v2.zig @@ -217,7 +217,7 @@ pub const ThreadPool = struct { deinit_task: ThreadPoolLib.Task = .{ .callback = deinitCallback }, - temporary_arena: @import("root").bun.ArenaAllocator = undefined, + temporary_arena: bun.ArenaAllocator = undefined, stmt_list: LinkerContext.StmtList = undefined, pub fn deinitCallback(task: *ThreadPoolLib.Task) void { @@ -301,7 +301,7 @@ pub const ThreadPool = struct { this.data.bundler.linker.resolver = &this.data.bundler.resolver; this.data.bundler.macro_context = js_ast.Macro.MacroContext.init(&this.data.bundler); this.data.macro_context = this.data.bundler.macro_context.?; - this.temporary_arena = @import("root").bun.ArenaAllocator.init(this.allocator); + this.temporary_arena = bun.ArenaAllocator.init(this.allocator); this.stmt_list = LinkerContext.StmtList.init(this.allocator); const CacheSet = @import("../cache.zig"); @@ -4070,7 +4070,7 @@ const LinkerContext = struct { var stack_fallback = std.heap.stackFallback(4096, this.allocator); const stack_all = stack_fallback.get(); - var arena = @import("root").bun.ArenaAllocator.init(stack_all); + var arena = bun.ArenaAllocator.init(stack_all); defer arena.deinit(); var temp_allocator = arena.allocator(); @@ -6684,7 +6684,7 @@ const LinkerContext = struct { defer chunk.renamer.deinit(bun.default_allocator); - var arena = @import("root").bun.ArenaAllocator.init(worker.allocator); + var arena = bun.ArenaAllocator.init(worker.allocator); defer arena.deinit(); // Also generate the cross-chunk binding code diff --git a/src/bundler/entry_points.zig b/src/bundler/entry_points.zig index 16dcdd3257..654a7926fb 100644 --- a/src/bundler/entry_points.zig +++ b/src/bundler/entry_points.zig @@ -1,4 +1,4 @@ -const logger = @import("root").bun.logger; +const logger = bun.logger; const std = @import("std"); const bun = @import("root").bun; const string = bun.string; diff --git a/src/bunfig.zig b/src/bunfig.zig index c55361b33e..755b33eef0 100644 --- a/src/bunfig.zig +++ b/src/bunfig.zig @@ -11,7 +11,7 @@ const default_allocator = bun.default_allocator; const URL = @import("./url.zig").URL; const C = bun.C; const options = @import("./options.zig"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const js_ast = bun.JSAst; const js_lexer = bun.js_lexer; const Defines = @import("./defines.zig"); diff --git a/src/cache.zig b/src/cache.zig index 08b94e3f77..43273e9bb5 100644 --- a/src/cache.zig +++ b/src/cache.zig @@ -12,7 +12,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const js_ast = bun.JSAst; -const logger = @import("root").bun.logger; +const logger = bun.logger; const js_parser = bun.js_parser; const json_parser = bun.JSON; const options = @import("./options.zig"); diff --git a/src/cli.zig b/src/cli.zig index c62ea916d6..2d30e64852 100644 --- a/src/cli.zig +++ b/src/cli.zig @@ -12,7 +12,7 @@ const C = bun.C; const root = @import("root"); const std = @import("std"); const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const options = @import("options.zig"); const js_parser = bun.js_parser; const json_parser = bun.JSON; @@ -27,7 +27,7 @@ const sync = @import("./sync.zig"); const Api = @import("api/schema.zig").Api; const resolve_path = @import("./resolver/resolve_path.zig"); const configureTransformOptionsForBun = @import("./bun.js/config.zig").configureTransformOptionsForBun; -const clap = @import("root").bun.clap; +const clap = bun.clap; const BunJS = @import("./bun_js.zig"); const Install = @import("./install/install.zig"); const bundler = bun.bundler; diff --git a/src/cli/build_command.zig b/src/cli/build_command.zig index f8af12d66b..751f8df13f 100644 --- a/src/cli/build_command.zig +++ b/src/cli/build_command.zig @@ -12,7 +12,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const options = @import("../options.zig"); const js_parser = bun.js_parser; diff --git a/src/cli/create_command.zig b/src/cli/create_command.zig index 40d0cada3a..07ad503419 100644 --- a/src/cli/create_command.zig +++ b/src/cli/create_command.zig @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const options = @import("../options.zig"); const js_parser = bun.js_parser; @@ -28,7 +28,7 @@ const bundler = bun.bundler; const fs = @import("../fs.zig"); const URL = @import("../url.zig").URL; -const HTTP = @import("root").bun.http; +const HTTP = bun.http; const ParseJSON = @import("../json_parser.zig").ParseJSONUTF8; const Archive = @import("../libarchive/libarchive.zig").Archive; @@ -37,9 +37,9 @@ const JSPrinter = bun.js_printer; const DotEnv = @import("../env_loader.zig"); const NPMClient = @import("../which_npm_client.zig").NPMClient; const which = @import("../which.zig").which; -const clap = @import("root").bun.clap; +const clap = bun.clap; const Lock = @import("../lock.zig").Lock; -const Headers = @import("root").bun.http.Headers; +const Headers = bun.http.Headers; const CopyFile = @import("../copy_file.zig"); var bun_path_buf: [bun.MAX_PATH_BYTES]u8 = undefined; const Futex = @import("../futex.zig"); @@ -1693,7 +1693,7 @@ const Commands = .{ &[_]string{""}, &[_]string{""}, }; -const picohttp = @import("root").bun.picohttp; +const picohttp = bun.picohttp; pub const DownloadedExample = struct { tarball_bytes: MutableString, diff --git a/src/cli/init_command.zig b/src/cli/init_command.zig index 43be7a6404..c878e28e78 100644 --- a/src/cli/init_command.zig +++ b/src/cli/init_command.zig @@ -19,7 +19,7 @@ const linker = @import("../linker.zig"); const options = @import("../options.zig"); const initializeStore = @import("./create_command.zig").initializeStore; const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const JSPrinter = bun.js_printer; fn exists(path: anytype) bool { diff --git a/src/cli/install_completions_command.zig b/src/cli/install_completions_command.zig index 3611ad32a2..6d5a923d92 100644 --- a/src/cli/install_completions_command.zig +++ b/src/cli/install_completions_command.zig @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const options = @import("../options.zig"); const js_parser = bun.js_parser; @@ -35,9 +35,9 @@ const JSPrinter = bun.js_printer; const DotEnv = @import("../env_loader.zig"); const NPMClient = @import("../which_npm_client.zig").NPMClient; const which = @import("../which.zig").which; -const clap = @import("root").bun.clap; +const clap = bun.clap; const Lock = @import("../lock.zig").Lock; -const Headers = @import("root").bun.http.Headers; +const Headers = bun.http.Headers; const CopyFile = @import("../copy_file.zig"); const ShellCompletions = @import("./shell_completions.zig"); diff --git a/src/cli/test_command.zig b/src/cli/test_command.zig index 9021d66482..034bf47d45 100644 --- a/src/cli/test_command.zig +++ b/src/cli/test_command.zig @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const FileSystem = @import("../fs.zig").FileSystem; const PathName = @import("../fs.zig").PathName; @@ -35,15 +35,15 @@ var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined; var path_buf2: [bun.MAX_PATH_BYTES]u8 = undefined; const PathString = bun.PathString; const is_bindgen = std.meta.globalOption("bindgen", bool) orelse false; -const HTTPThread = @import("root").bun.http.HTTPThread; +const HTTPThread = bun.http.HTTPThread; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const jest = JSC.Jest; const TestRunner = JSC.Jest.TestRunner; const Snapshots = JSC.Snapshot.Snapshots; const Test = TestRunner.Test; -const uws = @import("root").bun.uws; +const uws = bun.uws; fn fmtStatusTextLine(comptime status: @Type(.EnumLiteral), comptime emoji_or_color: bool) []const u8 { comptime { diff --git a/src/cli/upgrade_command.zig b/src/cli/upgrade_command.zig index f1f0b838c4..0dfaa30848 100644 --- a/src/cli/upgrade_command.zig +++ b/src/cli/upgrade_command.zig @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const options = @import("../options.zig"); const js_parser = bun.js_parser; @@ -28,16 +28,16 @@ const bundler = bun.bundler; const fs = @import("../fs.zig"); const URL = @import("../url.zig").URL; -const HTTP = @import("root").bun.http; +const HTTP = bun.http; const ParseJSON = @import("../json_parser.zig").ParseJSONUTF8; const Archive = @import("../libarchive/libarchive.zig").Archive; const Zlib = @import("../zlib.zig"); const JSPrinter = bun.js_printer; const DotEnv = @import("../env_loader.zig"); const which = @import("../which.zig").which; -const clap = @import("root").bun.clap; +const clap = bun.clap; const Lock = @import("../lock.zig").Lock; -const Headers = @import("root").bun.http.Headers; +const Headers = bun.http.Headers; const CopyFile = @import("../copy_file.zig"); pub var initialized_store = false; diff --git a/src/comptime_string_map.zig b/src/comptime_string_map.zig index f747a72152..037569143e 100644 --- a/src/comptime_string_map.zig +++ b/src/comptime_string_map.zig @@ -1,5 +1,6 @@ -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const std = @import("std"); +const bun = @import("root").bun; const mem = std.mem; const strings = @import("./string_immutable.zig"); @@ -165,26 +166,26 @@ pub fn ComptimeStringMapWithKeyType(comptime KeyType: type, comptime V: type, co /// Caller must ensure that the input is a string. pub fn fromJS(globalThis: *JSC.JSGlobalObject, input: JSC.JSValue) ?V { - if (comptime @import("root").bun.Environment.allow_assert) { + if (comptime bun.Environment.allow_assert) { if (!input.isString()) { @panic("ComptimeStringMap.fromJS: input is not a string"); } } - const str = @import("root").bun.String.tryFromJS(input, globalThis) orelse return null; + const str = bun.String.tryFromJS(input, globalThis) orelse return null; defer str.deref(); - return getWithEql(str, @import("root").bun.String.eqlComptime); + return getWithEql(str, bun.String.eqlComptime); } /// Caller must ensure that the input is a string. pub fn fromJSCaseInsensitive(globalThis: *JSC.JSGlobalObject, input: JSC.JSValue) ?V { - if (comptime @import("root").bun.Environment.allow_assert) { + if (comptime bun.Environment.allow_assert) { if (!input.isString()) { @panic("ComptimeStringMap.fromJS: input is not a string"); } } - const str = @import("root").bun.String.tryFromJS(input, globalThis) orelse return null; + const str = bun.String.tryFromJS(input, globalThis) orelse return null; defer str.deref(); return str.inMapCaseInsensitive(@This()); } diff --git a/src/copy_file.zig b/src/copy_file.zig index 80c6d519d9..6acf4946ff 100644 --- a/src/copy_file.zig +++ b/src/copy_file.zig @@ -148,7 +148,7 @@ pub fn copyFile(in: InputType, out: InputType) CopyFileError!void { var state: CopyFileState = .{}; return copyFileWithState(in, out, &state); } -const Platform = @import("root").bun.analytics.GenerateHeader.GeneratePlatform; +const Platform = bun.analytics.GenerateHeader.GeneratePlatform; var can_use_copy_file_range = std.atomic.Value(i32).init(0); pub inline fn disableCopyFileRangeSyscall() void { diff --git a/src/crash_reporter.zig b/src/crash_reporter.zig index f31ed81b65..735ec74bdb 100644 --- a/src/crash_reporter.zig +++ b/src/crash_reporter.zig @@ -1,4 +1,5 @@ const std = @import("std"); +const bun = @import("root").bun; fn setup_sigactions(act: ?*const os.Sigaction) !void { try os.sigaction(os.SIG.ABRT, act, null); @@ -28,13 +29,12 @@ noinline fn sigaction_handler(sig: i32, info: *const std.os.siginfo_t, _: ?*cons } noinline fn sigpipe_handler(_: i32, _: *const std.os.siginfo_t, _: ?*const anyopaque) callconv(.C) void { - const bun = @import("root").bun; bun.Output.debug("SIGPIPE received\n", .{}); } pub fn reloadHandlers() !void { - if (comptime @import("root").bun.Environment.isWindows) { - return @import("root").bun.todo(@src(), {}); + if (comptime bun.Environment.isWindows) { + return bun.todo(@src(), {}); } try os.sigaction(os.SIG.PIPE, null, null); try setup_sigactions(null); @@ -46,7 +46,7 @@ pub fn reloadHandlers() !void { }; try setup_sigactions(&act); - @import("root").bun.spawn.WaiterThread.reloadHandlers(); + bun.spawn.WaiterThread.reloadHandlers(); bun_ignore_sigpipe(); } const os = std.os; @@ -59,7 +59,7 @@ pub fn start() !void { try setup_sigactions(&act); bun_ignore_sigpipe(); - @import("root").bun.spawn.WaiterThread.reloadHandlers(); + bun.spawn.WaiterThread.reloadHandlers(); } extern fn bun_ignore_sigpipe() void; diff --git a/src/css_scanner.zig b/src/css_scanner.zig index ebf849947b..d0424aef48 100644 --- a/src/css_scanner.zig +++ b/src/css_scanner.zig @@ -15,7 +15,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const options = @import("./options.zig"); const import_record = @import("import_record.zig"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const Options = options; const resolver = @import("./resolver/resolver.zig"); const _linker = @import("./linker.zig"); diff --git a/src/defines.zig b/src/defines.zig index 204361be77..4c1071f548 100644 --- a/src/defines.zig +++ b/src/defines.zig @@ -1,6 +1,6 @@ const std = @import("std"); const js_ast = bun.JSAst; -const logger = @import("root").bun.logger; +const logger = bun.logger; const js_lexer = bun.js_lexer; const json_parser = bun.JSON; const fs = @import("fs.zig"); diff --git a/src/deps/boringssl.translated.zig b/src/deps/boringssl.translated.zig index 4bb62e5aea..069676b378 100644 --- a/src/deps/boringssl.translated.zig +++ b/src/deps/boringssl.translated.zig @@ -1,6 +1,7 @@ const std = @import("std"); +const bun = @import("root").bun; const C = @import("std").zig.c_builtins; -const pthread_rwlock_t = if (@import("root").bun.Environment.isPosix) @import("../sync.zig").RwLock.pthread_rwlock_t else *anyopaque; +const pthread_rwlock_t = if (bun.Environment.isPosix) @import("../sync.zig").RwLock.pthread_rwlock_t else *anyopaque; const time_t = C.time_t; const va_list = C.va_list; const struct_timeval = C.struct_timeval; @@ -19068,8 +19069,8 @@ pub const SSL = opaque { }; } - const Output = @import("root").bun.Output; - const Environment = @import("root").bun.Environment; + const Output = bun.Output; + const Environment = bun.Environment; pub fn read(this: *SSL, buf: []u8) Error!usize { const rc = SSL_read(this, buf.ptr, @as(c_int, @intCast(buf.len))); diff --git a/src/deps/c_ares.zig b/src/deps/c_ares.zig index 6798193e75..3a10195ea4 100644 --- a/src/deps/c_ares.zig +++ b/src/deps/c_ares.zig @@ -373,7 +373,7 @@ pub const AddrInfo = extern struct { globalThis: *JSC.JSGlobalObject, ) JSC.JSValue { var stack = std.heap.stackFallback(2048, parent_allocator); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); var node = addr_info.node.?; const array = JSC.JSValue.createEmptyArray( globalThis, @@ -736,7 +736,7 @@ pub const struct_ares_caa_reply = extern struct { pub fn toJSResponse(this: *struct_ares_caa_reply, parent_allocator: std.mem.Allocator, globalThis: *JSC.JSGlobalObject, comptime _: []const u8) JSC.JSValue { var stack = std.heap.stackFallback(2048, parent_allocator); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); defer arena.deinit(); const allocator = arena.allocator(); @@ -814,7 +814,7 @@ pub const struct_ares_srv_reply = extern struct { pub fn toJSResponse(this: *struct_ares_srv_reply, parent_allocator: std.mem.Allocator, globalThis: *JSC.JSGlobalObject, comptime _: []const u8) JSC.JSValue { var stack = std.heap.stackFallback(2048, parent_allocator); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); defer arena.deinit(); const allocator = arena.allocator(); @@ -897,7 +897,7 @@ pub const struct_ares_mx_reply = extern struct { pub fn toJSResponse(this: *struct_ares_mx_reply, parent_allocator: std.mem.Allocator, globalThis: *JSC.JSGlobalObject, comptime _: []const u8) JSC.JSValue { var stack = std.heap.stackFallback(2048, parent_allocator); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); defer arena.deinit(); const allocator = arena.allocator(); @@ -971,7 +971,7 @@ pub const struct_ares_txt_reply = extern struct { pub fn toJSResponse(this: *struct_ares_txt_reply, parent_allocator: std.mem.Allocator, globalThis: *JSC.JSGlobalObject, comptime _: []const u8) JSC.JSValue { var stack = std.heap.stackFallback(2048, parent_allocator); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); defer arena.deinit(); const allocator = arena.allocator(); @@ -1051,7 +1051,7 @@ pub const struct_ares_naptr_reply = extern struct { pub fn toJSResponse(this: *struct_ares_naptr_reply, parent_allocator: std.mem.Allocator, globalThis: *JSC.JSGlobalObject, comptime _: []const u8) JSC.JSValue { var stack = std.heap.stackFallback(2048, parent_allocator); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); defer arena.deinit(); const allocator = arena.allocator(); @@ -1143,7 +1143,7 @@ pub const struct_ares_soa_reply = extern struct { pub fn toJSResponse(this: *struct_ares_soa_reply, parent_allocator: std.mem.Allocator, globalThis: *JSC.JSGlobalObject, comptime _: []const u8) JSC.JSValue { var stack = std.heap.stackFallback(2048, parent_allocator); - var arena = @import("root").bun.ArenaAllocator.init(stack.get()); + var arena = bun.ArenaAllocator.init(stack.get()); defer arena.deinit(); const allocator = arena.allocator(); diff --git a/src/deps/lol-html.zig b/src/deps/lol-html.zig index 8ad1a727f2..d5e747c773 100644 --- a/src/deps/lol-html.zig +++ b/src/deps/lol-html.zig @@ -7,7 +7,7 @@ pub const MemorySettings = extern struct { }; inline fn auto_disable() void { - if (comptime @import("root").bun.FeatureFlags.disable_lolhtml) + if (comptime bun.FeatureFlags.disable_lolhtml) unreachable; } diff --git a/src/deps/picohttp.zig b/src/deps/picohttp.zig index 4155678c12..2153abf23f 100644 --- a/src/deps/picohttp.zig +++ b/src/deps/picohttp.zig @@ -1,10 +1,11 @@ const std = @import("std"); +const bun = @import("root").bun; const c = @import("picohttpparser.zig"); -const ExactSizeMatcher = @import("root").bun.ExactSizeMatcher; +const ExactSizeMatcher = bun.ExactSizeMatcher; const Match = ExactSizeMatcher(2); -const Output = @import("root").bun.Output; -const Environment = @import("root").bun.Environment; -const StringBuilder = @import("root").bun.StringBuilder; +const Output = bun.Output; +const Environment = bun.Environment; +const StringBuilder = bun.StringBuilder; const fmt = std.fmt; diff --git a/src/deps/uws.zig b/src/deps/uws.zig index fc2cbfd465..f38d9ee11e 100644 --- a/src/deps/uws.zig +++ b/src/deps/uws.zig @@ -13,7 +13,7 @@ pub const Socket = opaque {}; const debug = bun.Output.scoped(.uws, false); const uws = @This(); -const BoringSSL = @import("root").bun.BoringSSL; +const BoringSSL = bun.BoringSSL; fn NativeSocketHandleType(comptime ssl: bool) type { if (ssl) { return BoringSSL.SSL; diff --git a/src/env_loader.zig b/src/env_loader.zig index 31ae661f4a..ac3d704921 100644 --- a/src/env_loader.zig +++ b/src/env_loader.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; diff --git a/src/feature_flags.zig b/src/feature_flags.zig index b996e5df38..9a847aad00 100644 --- a/src/feature_flags.zig +++ b/src/feature_flags.zig @@ -1,4 +1,6 @@ const env = @import("env.zig"); +const bun = @import("root").bun; + pub const strong_etags_for_built_files = true; pub const keep_alive = false; @@ -95,7 +97,7 @@ pub const hardcode_localhost_to_127_0_0_1 = false; /// so we just disable it pub const support_jsxs_in_jsx_transform = false; -pub const use_simdutf = @import("root").bun.Environment.isNative and !@import("root").bun.JSC.is_bindgen; +pub const use_simdutf = bun.Environment.isNative and !bun.JSC.is_bindgen; pub const inline_properties_in_transpiler = true; @@ -103,7 +105,7 @@ pub const same_target_becomes_destructuring = true; pub const react_server_components = true; -pub const help_catch_memory_issues = @import("root").bun.Environment.allow_assert; +pub const help_catch_memory_issues = bun.Environment.allow_assert; /// This performs similar transforms as https://github.com/rollup/plugins/tree/master/packages/commonjs /// diff --git a/src/http/header_builder.zig b/src/http/header_builder.zig index 882ea7e0f1..94744fc326 100644 --- a/src/http/header_builder.zig +++ b/src/http/header_builder.zig @@ -1,10 +1,11 @@ const HeaderBuilder = @This(); const StringBuilder = @import("../string_builder.zig"); const Headers = @import("./headers.zig"); -const string = @import("root").bun.string; +const string = bun.string; const HTTPClient = @import("../http.zig"); const Api = @import("../api/schema.zig").Api; const std = @import("std"); +const bun = @import("root").bun; content: StringBuilder = StringBuilder{}, header_count: u64 = 0, diff --git a/src/http/websocket_http_client.zig b/src/http/websocket_http_client.zig index 3ad9cfdeb5..3e6ecddb03 100644 --- a/src/http/websocket_http_client.zig +++ b/src/http/websocket_http_client.zig @@ -13,9 +13,9 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const BoringSSL = bun.BoringSSL; -const uws = @import("root").bun.uws; -const JSC = @import("root").bun.JSC; -const PicoHTTP = @import("root").bun.picohttp; +const uws = bun.uws; +const JSC = bun.JSC; +const PicoHTTP = bun.picohttp; const ObjectPool = @import("../pool.zig").ObjectPool; const WebsocketHeader = @import("./websocket.zig").WebsocketHeader; const WebsocketDataFrame = @import("./websocket.zig").WebsocketDataFrame; diff --git a/src/http/zlib.zig b/src/http/zlib.zig index c69a7b48f7..3357720e61 100644 --- a/src/http/zlib.zig +++ b/src/http/zlib.zig @@ -1,6 +1,6 @@ const Lock = @import("../lock.zig").Lock; const std = @import("std"); -const MutableString = @import("root").bun.MutableString; +const MutableString = bun.MutableString; const getAllocator = @import("../http.zig").getAllocator; const ZlibPool = @This(); const Zlib = @import("../zlib.zig"); diff --git a/src/import_record.zig b/src/import_record.zig index c21019b693..560d0f6a16 100644 --- a/src/import_record.zig +++ b/src/import_record.zig @@ -1,6 +1,6 @@ -const fs = @import("root").bun.fs; +const fs = bun.fs; const bun = @import("root").bun; -const logger = @import("root").bun.logger; +const logger = bun.logger; const std = @import("std"); const Ref = @import("ast/base.zig").Ref; const Index = @import("ast/base.zig").Index; diff --git a/src/install/bin.zig b/src/install/bin.zig index 0e53e20b30..47433c8324 100644 --- a/src/install/bin.zig +++ b/src/install/bin.zig @@ -5,12 +5,12 @@ const String = Semver.String; const Output = bun.Output; const Global = bun.Global; const std = @import("std"); -const strings = @import("root").bun.strings; +const strings = bun.strings; const Environment = @import("../env.zig"); const Path = @import("../resolver/resolve_path.zig"); const C = @import("../c.zig"); const Fs = @import("../fs.zig"); -const stringZ = @import("root").bun.stringZ; +const stringZ = bun.stringZ; const Resolution = @import("./resolution.zig").Resolution; const bun = @import("root").bun; const string = bun.string; diff --git a/src/install/install.zig b/src/install/install.zig index 1d8ebcfaf2..a5a957b670 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -3358,7 +3358,7 @@ pub const PackageManager = struct { return null; } - var arena = @import("root").bun.ArenaAllocator.init(this.allocator); + var arena = bun.ArenaAllocator.init(this.allocator); defer arena.deinit(); const arena_alloc = arena.allocator(); var stack_fallback = std.heap.stackFallback(4096, arena_alloc); diff --git a/src/install/npm.zig b/src/install/npm.zig index da6a0c732a..9114755380 100644 --- a/src/install/npm.zig +++ b/src/install/npm.zig @@ -12,15 +12,15 @@ const ExternalStringMap = @import("./install.zig").ExternalStringMap; const ExternalStringList = @import("./install.zig").ExternalStringList; const ExternalSlice = @import("./install.zig").ExternalSlice; const initializeStore = @import("./install.zig").initializeMiniStore; -const logger = @import("root").bun.logger; -const Output = @import("root").bun.Output; +const logger = bun.logger; +const Output = bun.Output; const Integrity = @import("./integrity.zig").Integrity; const Bin = @import("./bin.zig").Bin; -const Environment = @import("root").bun.Environment; +const Environment = bun.Environment; const Aligner = @import("./install.zig").Aligner; -const HTTPClient = @import("root").bun.http; +const HTTPClient = bun.http; const json_parser = bun.JSON; -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const IdentityContext = @import("../identity_context.zig").IdentityContext; const ArrayIdentityContext = @import("../identity_context.zig").ArrayIdentityContext; const SlicedString = Semver.SlicedString; @@ -216,7 +216,7 @@ pub const Registry = struct { not_found: void, }; - const Pico = @import("root").bun.picohttp; + const Pico = bun.picohttp; pub fn getPackageMetadata( allocator: std.mem.Allocator, response: Pico.Response, @@ -892,7 +892,7 @@ pub const PackageManifest = struct { const source = logger.Source.initPathString(expected_name, json_buffer); initializeStore(); defer bun.JSAst.Stmt.Data.Store.memory_allocator.?.pop(); - var arena = @import("root").bun.ArenaAllocator.init(allocator); + var arena = bun.ArenaAllocator.init(allocator); defer arena.deinit(); const json = json_parser.ParseJSONUTF8( &source, diff --git a/src/install/resolvers/folder_resolver.zig b/src/install/resolvers/folder_resolver.zig index c7f89c8d12..a0cb160d0c 100644 --- a/src/install/resolvers/folder_resolver.zig +++ b/src/install/resolvers/folder_resolver.zig @@ -5,14 +5,14 @@ const initializeStore = @import("../install.zig").initializeStore; const json_parser = bun.JSON; const PackageManager = @import("../install.zig").PackageManager; const Npm = @import("../npm.zig"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const FileSystem = @import("../../fs.zig").FileSystem; const JSAst = bun.JSAst; const string = bun.string; const stringZ = bun.stringZ; const Features = @import("../install.zig").Features; const IdentityContext = @import("../../identity_context.zig").IdentityContext; -const strings = @import("root").bun.strings; +const strings = bun.strings; const Resolution = @import("../resolution.zig").Resolution; const String = @import("../semver.zig").String; const Semver = @import("../semver.zig"); diff --git a/src/io/io_linux.zig b/src/io/io_linux.zig index 795b88c2bf..d786b7fbc0 100644 --- a/src/io/io_linux.zig +++ b/src/io/io_linux.zig @@ -1,6 +1,6 @@ const std = @import("std"); const assert = std.debug.assert; -const Platform = @import("root").bun.analytics.GenerateHeader.GeneratePlatform; +const Platform = bun.analytics.GenerateHeader.GeneratePlatform; const os = struct { pub usingnamespace std.os; pub const EPERM = 1; diff --git a/src/io/pipes.zig b/src/io/pipes.zig index 71f0191896..f6fb46053a 100644 --- a/src/io/pipes.zig +++ b/src/io/pipes.zig @@ -1,4 +1,4 @@ -const Async = @import("root").bun.Async; +const Async = bun.Async; const bun = @import("root").bun; const Environment = bun.Environment; diff --git a/src/js_ast.zig b/src/js_ast.zig index e710f7c02e..763964933c 100644 --- a/src/js_ast.zig +++ b/src/js_ast.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const JSXRuntime = @import("options.zig").JSX.Runtime; const Runtime = @import("runtime.zig").Runtime; const bun = @import("root").bun; @@ -18,7 +18,7 @@ const RefHashCtx = @import("ast/base.zig").RefHashCtx; const ObjectPool = @import("./pool.zig").ObjectPool; const ImportRecord = @import("import_record.zig").ImportRecord; const allocators = @import("allocators.zig"); -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const RefCtx = @import("./ast/base.zig").RefCtx; const JSONParser = bun.JSON; const is_bindgen = std.meta.globalOption("bindgen", bool) orelse false; @@ -6805,7 +6805,7 @@ pub fn printmem(comptime format: string, args: anytype) void { } pub const Macro = struct { - const JavaScript = @import("root").bun.JSC; + const JavaScript = bun.JSC; const JSCBase = @import("./bun.js/base.zig"); const Resolver = @import("./resolver/resolver.zig").Resolver; const isPackagePath = @import("./resolver/resolver.zig").isPackagePath; diff --git a/src/js_lexer.zig b/src/js_lexer.zig index 69dafc97cb..2b193a5f96 100644 --- a/src/js_lexer.zig +++ b/src/js_lexer.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const tables = @import("js_lexer_tables.zig"); const build_options = @import("build_options"); const js_ast = bun.JSAst; diff --git a/src/js_lexer_tables.zig b/src/js_lexer_tables.zig index 60a705c301..8f8fe04206 100644 --- a/src/js_lexer_tables.zig +++ b/src/js_lexer_tables.zig @@ -1,9 +1,10 @@ const std = @import("std"); +const bun = @import("root").bun; const expectString = std.testing.expectEqualStrings; const expect = std.testing.expect; -const logger = @import("root").bun.logger; +const logger = bun.logger; const unicode = std.unicode; -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const string = @import("string_types.zig").string; const CodePoint = @import("string_types.zig").CodePoint; const ComptimeStringMap = @import("./comptime_string_map.zig").ComptimeStringMap; diff --git a/src/js_parser.zig b/src/js_parser.zig index 1449d04ff8..9baf965273 100644 --- a/src/js_parser.zig +++ b/src/js_parser.zig @@ -3,7 +3,7 @@ /// ** you must also increment the `expected_version` in RuntimeTranspilerCache.zig ** /// ** IMPORTANT ** pub const std = @import("std"); -pub const logger = @import("root").bun.logger; +pub const logger = bun.logger; pub const js_lexer = bun.js_lexer; pub const importRecord = @import("./import_record.zig"); pub const js_ast = bun.JSAst; @@ -43,7 +43,7 @@ pub const StmtNodeList = js_ast.StmtNodeList; pub const BindingNodeList = js_ast.BindingNodeList; const DeclaredSymbol = js_ast.DeclaredSymbol; const ComptimeStringMap = @import("./comptime_string_map.zig").ComptimeStringMap; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const Index = @import("./ast/base.zig").Index; fn _disabledAssert(_: bool) void { diff --git a/src/js_printer.zig b/src/js_printer.zig index beddb1c388..663abe811e 100644 --- a/src/js_printer.zig +++ b/src/js_printer.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const js_lexer = bun.js_lexer; const importRecord = @import("import_record.zig"); const js_ast = bun.JSAst; diff --git a/src/json_parser.zig b/src/json_parser.zig index 4ce9a12aaf..a077132af2 100644 --- a/src/json_parser.zig +++ b/src/json_parser.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const js_lexer = bun.js_lexer; const importRecord = @import("import_record.zig"); const js_ast = bun.JSAst; diff --git a/src/libarchive/libarchive.zig b/src/libarchive/libarchive.zig index a941038c94..c6ddb0c738 100644 --- a/src/libarchive/libarchive.zig +++ b/src/libarchive/libarchive.zig @@ -14,7 +14,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); const struct_archive = lib.struct_archive; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; pub const Seek = enum(c_int) { set = std.os.SEEK_SET, current = std.os.SEEK_CUR, diff --git a/src/linker.zig b/src/linker.zig index d84b578820..4b07c71de7 100644 --- a/src/linker.zig +++ b/src/linker.zig @@ -15,7 +15,7 @@ const Ref = @import("./ast/base.zig").Ref; const std = @import("std"); const lex = bun.js_lexer; -const logger = @import("root").bun.logger; +const logger = bun.logger; const Options = @import("options.zig"); const js_parser = bun.js_parser; const json_parser = bun.JSON; @@ -39,7 +39,7 @@ const ResolverType = Resolver.Resolver; const ESModule = @import("./resolver/package_json.zig").ESModule; const Runtime = @import("./runtime.zig").Runtime; const URL = @import("url.zig").URL; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const PluginRunner = bun.bundler.PluginRunner; pub const CSSResolveError = error{ResolveMessage}; diff --git a/src/logger.zig b/src/logger.zig index 604ebfa83f..be31238bc8 100644 --- a/src/logger.zig +++ b/src/logger.zig @@ -1,6 +1,6 @@ const std = @import("std"); const Api = @import("./api/schema.zig").Api; -const js = @import("root").bun.JSC; +const js = bun.JSC; const ImportKind = @import("./import_record.zig").ImportKind; const bun = @import("root").bun; const string = bun.string; @@ -12,7 +12,7 @@ const MutableString = bun.MutableString; const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const fs = @import("fs.zig"); const unicode = std.unicode; const Ref = @import("./ast/base.zig").Ref; diff --git a/src/main_wasm.zig b/src/main_wasm.zig index 6d3ba24665..adf57dee43 100644 --- a/src/main_wasm.zig +++ b/src/main_wasm.zig @@ -3,7 +3,7 @@ const JSParser = bun.js_parser; const JSPrinter = bun.js_printer; const JSAst = bun.JSAst; const Api = @import("./api/schema.zig").Api; -const Logger = @import("root").bun.logger; +const Logger = bun.logger; const global = @import("root").bun; const default_allocator = global.default_allocator; const std = @import("std"); @@ -502,7 +502,7 @@ export fn getTests(opts_array: u64) u64 { } export fn transform(opts_array: u64) u64 { - // var arena = @import("root").bun.ArenaAllocator.init(default_allocator); + // var arena = bun.ArenaAllocator.init(default_allocator); var arena = Arena.init() catch unreachable; var allocator = arena.allocator(); defer arena.deinit(); @@ -572,7 +572,7 @@ export fn transform(opts_array: u64) u64 { } export fn scan(opts_array: u64) u64 { - // var arena = @import("root").bun.ArenaAllocator.init(default_allocator); + // var arena = bun.ArenaAllocator.init(default_allocator); var arena = Arena.init() catch unreachable; var allocator = arena.allocator(); defer arena.deinit(); diff --git a/src/meta.zig b/src/meta.zig index 37281e85b2..cf49553771 100644 --- a/src/meta.zig +++ b/src/meta.zig @@ -1,4 +1,5 @@ const std = @import("std"); +const bun = @import("root").bun; pub usingnamespace std.meta; @@ -36,7 +37,7 @@ pub fn enumFieldNames(comptime Type: type) []const []const u8 { for (names) |name| { // zig seems to include "_" or an empty string in the list of enum field names // it makes sense, but humans don't want that - if (@import("root").bun.strings.eqlAnyComptime(name, &.{ "_none", "", "_" })) { + if (bun.strings.eqlAnyComptime(name, &.{ "_none", "", "_" })) { continue; } names[i] = name; diff --git a/src/napi/napi.zig b/src/napi/napi.zig index 658d4489a2..0fcf760d6b 100644 --- a/src/napi/napi.zig +++ b/src/napi/napi.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const JSC = @import("root").bun.JSC; -const strings = @import("root").bun.strings; +const JSC = bun.JSC; +const strings = bun.strings; const bun = @import("root").bun; const Lock = @import("../lock.zig").Lock; const JSValue = JSC.JSValue; diff --git a/src/node_fallbacks.zig b/src/node_fallbacks.zig index 00af758850..b3f95ac836 100644 --- a/src/node_fallbacks.zig +++ b/src/node_fallbacks.zig @@ -1,7 +1,7 @@ const std = @import("std"); const string = @import("./string_types.zig").string; const PackageJSON = @import("./resolver/package_json.zig").PackageJSON; -const logger = @import("root").bun.logger; +const logger = bun.logger; const Fs = @import("./fs.zig"); const bun = @import("root").bun; const ComptimeStringMap = @import("./comptime_string_map.zig").ComptimeStringMap; diff --git a/src/options.zig b/src/options.zig index 0097ae9d74..e0415a5c03 100644 --- a/src/options.zig +++ b/src/options.zig @@ -1,7 +1,7 @@ /// This file is mostly the API schema but with all the options normalized. /// Normalization is necessary because most fields in the API schema are optional const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const Fs = @import("fs.zig"); const resolver = @import("./resolver/resolver.zig"); @@ -23,7 +23,7 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const StoredFileDescriptorType = bun.StoredFileDescriptorType; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const Runtime = @import("./runtime.zig").Runtime; const Analytics = @import("./analytics/analytics_thread.zig"); const MacroRemap = @import("./resolver/package_json.zig").MacroMap; diff --git a/src/output.zig b/src/output.zig index d89abdc200..0949df1ac8 100644 --- a/src/output.zig +++ b/src/output.zig @@ -2,13 +2,13 @@ const Output = @This(); const bun = @import("root").bun; const std = @import("std"); const Environment = @import("./env.zig"); -const string = @import("root").bun.string; +const string = bun.string; const root = @import("root"); -const strings = @import("root").bun.strings; -const StringTypes = @import("root").bun.StringTypes; -const Global = @import("root").bun.Global; -const ComptimeStringMap = @import("root").bun.ComptimeStringMap; -const use_mimalloc = @import("root").bun.use_mimalloc; +const strings = bun.strings; +const StringTypes = bun.StringTypes; +const Global = bun.Global; +const ComptimeStringMap = bun.ComptimeStringMap; +const use_mimalloc = bun.use_mimalloc; const writeStream = std.json.writeStream; const WriteStream = std.json.WriteStream; @@ -663,7 +663,7 @@ pub const color_map = ComptimeStringMap(string, .{ }); const RESET: string = "\x1b[0m"; pub fn prettyFmt(comptime fmt: string, comptime is_enabled: bool) string { - if (comptime @import("root").bun.fast_debug_build_mode) + if (comptime bun.fast_debug_build_mode) return fmt; comptime var new_fmt: [fmt.len * 4]u8 = undefined; @@ -752,7 +752,7 @@ pub noinline fn prettyWithPrinter(comptime fmt: string, args: anytype, comptime } pub noinline fn prettyWithPrinterFn(comptime fmt: string, args: anytype, comptime printFn: anytype, ctx: anytype) void { - if (comptime @import("root").bun.fast_debug_build_mode) + if (comptime bun.fast_debug_build_mode) return printFn(ctx, comptime prettyFmt(fmt, false), args); if (enable_ansi_colors) { @@ -810,7 +810,7 @@ pub noinline fn printError(comptime fmt: string, args: anytype) void { } pub const DebugTimer = struct { - timer: @import("root").bun.DebugOnly(std.time.Timer) = undefined, + timer: bun.DebugOnly(std.time.Timer) = undefined, pub fn start() DebugTimer { if (comptime Environment.isDebug) { diff --git a/src/panic_handler.zig b/src/panic_handler.zig index ce80d92ebf..e5d0167fe9 100644 --- a/src/panic_handler.zig +++ b/src/panic_handler.zig @@ -11,7 +11,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const CLI = @import("./cli.zig").Cli; const Features = @import("./analytics/analytics_thread.zig").Features; -const HTTP = @import("root").bun.http.AsyncHTTP; +const HTTP = bun.http.AsyncHTTP; const Report = @import("./report.zig"); pub fn NewPanicHandler(comptime panic_func: fn ([]const u8, ?*std.builtin.StackTrace, ?usize) noreturn) type { diff --git a/src/renamer.zig b/src/renamer.zig index f3461a6a7f..ea3196a802 100644 --- a/src/renamer.zig +++ b/src/renamer.zig @@ -12,7 +12,7 @@ const C = bun.C; const std = @import("std"); const Ref = @import("./ast/base.zig").Ref; const RefCtx = @import("./ast/base.zig").RefCtx; -const logger = @import("root").bun.logger; +const logger = bun.logger; const JSLexer = @import("./js_lexer.zig"); pub const NoOpRenamer = struct { @@ -470,7 +470,7 @@ pub const NumberRenamer = struct { allocator: std.mem.Allocator, temp_allocator: std.mem.Allocator, number_scope_pool: bun.HiveArray(NumberScope, 128).Fallback, - arena: @import("root").bun.ArenaAllocator, + arena: bun.ArenaAllocator, root: NumberScope = .{}, name_stack_fallback: std.heap.StackFallbackAllocator(512) = undefined, name_temp_allocator: std.mem.Allocator = undefined, @@ -538,7 +538,7 @@ pub const NumberRenamer = struct { .temp_allocator = temp_allocator, .names = try allocator.alloc(bun.BabyList(string), symbols.symbols_for_source.len), .number_scope_pool = undefined, - .arena = @import("root").bun.ArenaAllocator.init(temp_allocator), + .arena = bun.ArenaAllocator.init(temp_allocator), }; renamer.name_stack_fallback = .{ .buffer = undefined, diff --git a/src/report.zig b/src/report.zig index 70e80702da..84d729653c 100644 --- a/src/report.zig +++ b/src/report.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; @@ -13,7 +13,7 @@ const C = bun.C; const CLI = @import("./cli.zig").Cli; const Features = @import("./analytics/analytics_thread.zig").Features; const Platform = @import("./analytics/analytics_thread.zig").GenerateHeader.GeneratePlatform; -const HTTP = @import("root").bun.http.AsyncHTTP; +const HTTP = bun.http.AsyncHTTP; const CrashReporter = @import("./crash_reporter.zig"); const Report = @This(); @@ -308,7 +308,7 @@ pub noinline fn handleCrash(signal: i32, addr: usize) void { } if (!Environment.isWindows) { - if (comptime !@import("root").bun.JSC.is_bindgen) { + if (comptime !bun.JSC.is_bindgen) { std.mem.doNotOptimizeAway(&Bun__crashReportWrite); Bun__crashReportDumpStackTrace(&crash_report_writer); } diff --git a/src/resolver/package_json.zig b/src/resolver/package_json.zig index 10546363aa..ac13ca954e 100644 --- a/src/resolver/package_json.zig +++ b/src/resolver/package_json.zig @@ -13,7 +13,7 @@ const Api = @import("../api/schema.zig").Api; const std = @import("std"); const options = @import("../options.zig"); const cache = @import("../cache.zig"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const js_ast = bun.JSAst; const fs = @import("../fs.zig"); diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig index 25758cf1af..d14542b152 100644 --- a/src/resolver/resolver.zig +++ b/src/resolver/resolver.zig @@ -12,7 +12,7 @@ const default_allocator = bun.default_allocator; const StoredFileDescriptorType = bun.StoredFileDescriptorType; const C = bun.C; const ast = @import("../import_record.zig"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const options = @import("../options.zig"); const Fs = @import("../fs.zig"); const std = @import("std"); diff --git a/src/resolver/tsconfig_json.zig b/src/resolver/tsconfig_json.zig index d63b3bf5d5..a7f4fe9db9 100644 --- a/src/resolver/tsconfig_json.zig +++ b/src/resolver/tsconfig_json.zig @@ -10,7 +10,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); const options = @import("../options.zig"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const cache = @import("../cache.zig"); const js_ast = bun.JSAst; const js_lexer = bun.js_lexer; diff --git a/src/router.zig b/src/router.zig index de6494591a..2a11f738d5 100644 --- a/src/router.zig +++ b/src/router.zig @@ -967,7 +967,7 @@ const expect = std.testing.expect; const expectEqual = std.testing.expectEqual; const expectEqualStrings = std.testing.expectEqualStrings; const expectStr = std.testing.expectEqualStrings; -const Logger = @import("root").bun.logger; +const Logger = bun.logger; pub const Test = struct { pub fn makeRoutes(comptime testName: string, data: anytype) !Routes { diff --git a/src/sha.zig b/src/sha.zig index c8a1a095ea..9c6e3854a7 100644 --- a/src/sha.zig +++ b/src/sha.zig @@ -1,7 +1,6 @@ -const BoringSSL = @import("root").bun.BoringSSL; +const BoringSSL = bun.BoringSSL; const std = @import("std"); - -pub const bun = if (@import("build_options").project.len == 0) @import("./bun.zig") else @import("root").bun; +pub const bun = @import("root").bun; fn NewHasher(comptime digest_size: comptime_int, comptime ContextType: type, comptime Full: anytype, comptime Init: anytype, comptime Update: anytype, comptime Final: anytype) type { return struct { diff --git a/src/shell/subproc.zig b/src/shell/subproc.zig index a3b9e3f547..cdec642d97 100644 --- a/src/shell/subproc.zig +++ b/src/shell/subproc.zig @@ -1,15 +1,15 @@ -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const bun = @import("root").bun; const Environment = bun.Environment; -const NetworkThread = @import("root").bun.http.NetworkThread; +const NetworkThread = bun.http.NetworkThread; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("root").bun.Output; -const MutableString = @import("root").bun.MutableString; +const Output = bun.Output; +const MutableString = bun.MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const Which = @import("../which.zig"); @@ -755,7 +755,7 @@ pub const ShellSubprocess = struct { spawn_args_: SpawnArgs, out: **@This(), ) bun.shell.Result(void) { - var arena = @import("root").bun.ArenaAllocator.init(bun.default_allocator); + var arena = bun.ArenaAllocator.init(bun.default_allocator); defer arena.deinit(); var spawn_args = spawn_args_; diff --git a/src/shell/util.zig b/src/shell/util.zig index 1b448c818c..a474fafcf7 100644 --- a/src/shell/util.zig +++ b/src/shell/util.zig @@ -2,15 +2,15 @@ const IPC = @import("../bun.js/ipc.zig"); const Allocator = std.mem.Allocator; const uws = bun.uws; const std = @import("std"); -const default_allocator = @import("root").bun.default_allocator; +const default_allocator = bun.default_allocator; const bun = @import("root").bun; const Environment = bun.Environment; const Async = bun.Async; -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const Which = @import("../which.zig"); -const Output = @import("root").bun.Output; +const Output = bun.Output; const PosixSpawn = @import("../bun.js/api/bun/spawn.zig").PosixSpawn; const os = std.os; diff --git a/src/sourcemap/sourcemap.zig b/src/sourcemap/sourcemap.zig index d366e8af90..10e25ad2d6 100644 --- a/src/sourcemap/sourcemap.zig +++ b/src/sourcemap/sourcemap.zig @@ -8,7 +8,7 @@ const bun = @import("root").bun; const string = bun.string; const JSAst = bun.JSAst; const BabyList = JSAst.BabyList; -const Logger = @import("root").bun.logger; +const Logger = bun.logger; const strings = bun.strings; const MutableString = bun.MutableString; const Joiner = @import("../string_joiner.zig"); diff --git a/src/string_immutable.zig b/src/string_immutable.zig index 1dda0e6de3..8769058d50 100644 --- a/src/string_immutable.zig +++ b/src/string_immutable.zig @@ -2441,7 +2441,7 @@ pub fn elementLengthLatin1IntoUTF8(comptime Type: type, latin1_: Type) usize { return input_len + total_non_ascii_count; } -const JSC = @import("root").bun.JSC; +const JSC = bun.JSC; pub fn copyLatin1IntoUTF16(comptime Buffer: type, buf_: Buffer, comptime Type: type, latin1_: Type) EncodeIntoResult { var buf = buf_; diff --git a/src/string_types.zig b/src/string_types.zig index 456c7f186e..1858cae1e4 100644 --- a/src/string_types.zig +++ b/src/string_types.zig @@ -16,7 +16,7 @@ pub const PathString = packed struct { ptr: PointerIntType = 0, len: PathInt = 0, - const JSC = @import("root").bun.JSC; + const JSC = bun.JSC; pub fn estimatedSize(this: *const PathString) usize { return @as(usize, this.len); diff --git a/src/thread_pool.zig b/src/thread_pool.zig index 369adacd69..0bfa281f04 100644 --- a/src/thread_pool.zig +++ b/src/thread_pool.zig @@ -670,7 +670,7 @@ fn join(self: *ThreadPool) void { thread.join_event.notify(); } -const Output = @import("root").bun.Output; +const Output = bun.Output; pub const Thread = struct { next: ?*Thread = null, diff --git a/src/toml/toml_lexer.zig b/src/toml/toml_lexer.zig index a8010f8644..b9d93991a5 100644 --- a/src/toml/toml_lexer.zig +++ b/src/toml/toml_lexer.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const js_ast = bun.JSAst; const bun = @import("root").bun; diff --git a/src/toml/toml_parser.zig b/src/toml/toml_parser.zig index c1baa68ee0..c31c70dcff 100644 --- a/src/toml/toml_parser.zig +++ b/src/toml/toml_parser.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("root").bun.logger; +const logger = bun.logger; const toml_lexer = @import("./toml_lexer.zig"); const Lexer = toml_lexer.Lexer; const importRecord = @import("../import_record.zig"); diff --git a/src/work_pool.zig b/src/work_pool.zig index c0c5649d44..495bfdb292 100644 --- a/src/work_pool.zig +++ b/src/work_pool.zig @@ -1,5 +1,6 @@ -const ThreadPool = @import("root").bun.ThreadPool; +const ThreadPool = bun.ThreadPool; const std = @import("std"); +const bun = @import("root").bun; pub const Batch = ThreadPool.Batch; pub const Task = ThreadPool.Task;