diff --git a/root.zig b/root.zig index 4778a56d1b0713..657931c9e050ba 100644 --- a/root.zig +++ b/root.zig @@ -1,7 +1,7 @@ -pub usingnamespace @import("./src/main.zig"); +pub usingnamespace @import("src/main.zig"); /// These functions are used throughout Bun's codebase. -pub const bun = @import("./src/bun.zig"); +pub const bun = @import("src/bun.zig"); pub const completions = struct { pub const bash = @embedFile("./completions/bun.bash"); @@ -9,5 +9,5 @@ pub const completions = struct { pub const fish = @embedFile("./completions/bun.fish"); }; -pub const JavaScriptCore = @import("./src/jsc.zig"); -pub const C = @import("./src/c.zig"); +pub const JavaScriptCore = @import("src/jsc.zig"); +pub const C = @import("src/c.zig"); diff --git a/src/Global.zig b/src/Global.zig index f935d3b958c3a9..3f828390a3e119 100644 --- a/src/Global.zig +++ b/src/Global.zig @@ -1,9 +1,9 @@ const std = @import("std"); -const Environment = @import("./env.zig"); +const Environment = @import("env.zig"); const Output = @import("output.zig"); const use_mimalloc = bun.use_mimalloc; -const StringTypes = @import("./string_types.zig"); +const StringTypes = @import("string_types.zig"); const Mimalloc = bun.Mimalloc; const bun = @import("root").bun; @@ -155,7 +155,7 @@ pub inline fn mimalloc_cleanup(force: bool) void { Mimalloc.mi_collect(force); } } -pub const versions = @import("./generated_versions_list.zig"); +pub const versions = @import("generated_versions_list.zig"); // Enabling huge pages slows down bun by 8x or so // Keeping this code for: @@ -163,7 +163,7 @@ pub const versions = @import("./generated_versions_list.zig"); // 2. if I want to configure allocator later pub inline fn configureAllocator(_: AllocatorConfiguration) void { // if (comptime !use_mimalloc) return; - // const Mimalloc = @import("./allocators/mimalloc.zig"); + // const Mimalloc = @import("allocators/mimalloc.zig"); // Mimalloc.mi_option_set_enabled(Mimalloc.mi_option_verbose, config.verbose); // Mimalloc.mi_option_set_enabled(Mimalloc.mi_option_large_os_pages, config.long_running); // if (!config.long_running) Mimalloc.mi_option_set(Mimalloc.mi_option_reset_delay, 0); @@ -187,7 +187,7 @@ pub const BunInfo = struct { bun_version: string, platform: Analytics.GenerateHeader.GeneratePlatform.Platform, - const Analytics = @import("./analytics/analytics_thread.zig"); + const Analytics = @import("analytics/analytics_thread.zig"); const JSON = bun.JSON; const JSAst = bun.JSAst; pub fn generate(comptime Bundler: type, _: Bundler, allocator: std.mem.Allocator) !JSAst.Expr { diff --git a/src/HTMLScanner.zig b/src/HTMLScanner.zig index b029e3dd46f6c6..e3298347b72942 100644 --- a/src/HTMLScanner.zig +++ b/src/HTMLScanner.zig @@ -1,9 +1,9 @@ const std = @import("std"); const bun = @import("root").bun; const string = bun.string; -const ImportRecord = @import("./import_record.zig").ImportRecord; -const ImportKind = @import("./import_record.zig").ImportKind; -const lol = @import("./deps/lol-html.zig"); +const ImportRecord = @import("import_record.zig").ImportRecord; +const ImportKind = @import("import_record.zig").ImportKind; +const lol = @import("deps/lol-html.zig"); const logger = bun.logger; const fs = bun.fs; diff --git a/src/StandaloneModuleGraph.zig b/src/StandaloneModuleGraph.zig index aae3c32a178269..3a851165c65cee 100644 --- a/src/StandaloneModuleGraph.zig +++ b/src/StandaloneModuleGraph.zig @@ -653,7 +653,7 @@ pub const StandaloneModuleGraph = struct { return cloned_executable_fd; } - pub const CompileTarget = @import("./compile_target.zig"); + pub const CompileTarget = @import("compile_target.zig"); pub fn download(allocator: std.mem.Allocator, target: *const CompileTarget, env: *bun.DotEnv.Loader) ![:0]const u8 { var exe_path_buf: bun.PathBuffer = undefined; diff --git a/src/allocators.zig b/src/allocators.zig index a71791466ad869..4827ccc206acac 100644 --- a/src/allocators.zig +++ b/src/allocators.zig @@ -1,7 +1,7 @@ const std = @import("std"); -const FeatureFlags = @import("./feature_flags.zig"); -const Environment = @import("./env.zig"); +const FeatureFlags = @import("feature_flags.zig"); +const Environment = @import("env.zig"); const FixedBufferAllocator = std.heap.FixedBufferAllocator; const bun = @import("root").bun; const OOM = bun.OOM; diff --git a/src/allocators/memory_allocator.zig b/src/allocators/memory_allocator.zig index 07b84ef7b3476f..cd7bbb35cbeb65 100644 --- a/src/allocators/memory_allocator.zig +++ b/src/allocators/memory_allocator.zig @@ -5,7 +5,7 @@ const bun = @import("root").bun; const log = bun.Output.scoped(.mimalloc, true); const assert = bun.assert; const Allocator = mem.Allocator; -const mimalloc = @import("./mimalloc.zig"); +const mimalloc = @import("mimalloc.zig"); const FeatureFlags = @import("../feature_flags.zig"); const Environment = @import("../env.zig"); diff --git a/src/allocators/mimalloc_arena.zig b/src/allocators/mimalloc_arena.zig index d249ee6f6ef1f8..3cb0b8ec232469 100644 --- a/src/allocators/mimalloc_arena.zig +++ b/src/allocators/mimalloc_arena.zig @@ -2,7 +2,7 @@ const mem = @import("std").mem; const builtin = @import("std").builtin; const std = @import("std"); -const mimalloc = @import("./mimalloc.zig"); +const mimalloc = @import("mimalloc.zig"); const Environment = @import("../env.zig"); const FeatureFlags = @import("../feature_flags.zig"); const Allocator = mem.Allocator; diff --git a/src/analytics/analytics_thread.zig b/src/analytics/analytics_thread.zig index d8c77de1eda461..1d4150e46ad05e 100644 --- a/src/analytics/analytics_thread.zig +++ b/src/analytics/analytics_thread.zig @@ -16,8 +16,8 @@ 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 Analytics = @import("analytics_schema.zig").analytics; +const Writer = @import("analytics_schema.zig").Writer; const Headers = bun.http.Headers; const Futex = @import("../futex.zig"); const Semver = @import("../install/semver.zig"); diff --git a/src/async/windows_event_loop.zig b/src/async/windows_event_loop.zig index 0943d1959b1938..01230b5346f72b 100644 --- a/src/async/windows_event_loop.zig +++ b/src/async/windows_event_loop.zig @@ -119,7 +119,7 @@ pub const KeepAlive = struct { } }; -const Posix = @import("./posix_event_loop.zig"); +const Posix = @import("posix_event_loop.zig"); pub const FilePoll = struct { fd: bun.FileDescriptor, diff --git a/src/baby_list.zig b/src/baby_list.zig index fea5af650da4ef..1a656c4341a01b 100644 --- a/src/baby_list.zig +++ b/src/baby_list.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const Environment = @import("./env.zig"); -const strings = @import("./string_immutable.zig"); +const Environment = @import("env.zig"); +const strings = @import("string_immutable.zig"); const bun = @import("root").bun; /// This is like ArrayList except it stores the length and capacity as u32 diff --git a/src/bake/bake.zig b/src/bake/bake.zig index 3722c8efdc7699..7b1984f551c87c 100644 --- a/src/bake/bake.zig +++ b/src/bake/bake.zig @@ -3,9 +3,9 @@ //! server, server components, and other integrations. Instead of taking the //! role as a framework, Bake is tool for frameworks to build on top of. -pub const production = @import("./production.zig"); -pub const DevServer = @import("./DevServer.zig"); -pub const FrameworkRouter = @import("./FrameworkRouter.zig"); +pub const production = @import("production.zig"); +pub const DevServer = @import("DevServer.zig"); +pub const FrameworkRouter = @import("FrameworkRouter.zig"); /// export default { app: ... }; pub const api_name = "app"; diff --git a/src/bindgen.zig b/src/bindgen.zig index 5540f0a55427d4..67b0835b731b53 100644 --- a/src/bindgen.zig +++ b/src/bindgen.zig @@ -1,9 +1,9 @@ pub const bindgen = true; -pub const main = @import("./bun.js/bindings/bindings-generator.zig").main; +pub const main = @import("bun.js/bindings/bindings-generator.zig").main; pub export fn PLCrashReportHandler(_: ?*anyopaque) void {} pub export fn mkdirp(_: ?*anyopaque) void {} pub const build_options = @import("build_options"); -pub const bun = @import("./BunObject.zig"); -pub const JavaScriptCore = @import("./jsc.zig"); -pub const C = @import("./c.zig"); +pub const bun = @import("BunObject.zig"); +pub const JavaScriptCore = @import("jsc.zig"); +pub const C = @import("c.zig"); diff --git a/src/boringssl.zig b/src/boringssl.zig index 3f8892a1aadc00..20c589387e1f24 100644 --- a/src/boringssl.zig +++ b/src/boringssl.zig @@ -1,11 +1,11 @@ -const boring = @import("./deps/boringssl.translated.zig"); +const boring = @import("deps/boringssl.translated.zig"); pub usingnamespace boring; const std = @import("std"); const bun = @import("root").bun; -const c_ares = @import("./deps/c_ares.zig"); +const c_ares = @import("deps/c_ares.zig"); const strings = bun.strings; const builtin = @import("builtin"); -const X509 = @import("./bun.js/api/bun/x509.zig"); +const X509 = @import("bun.js/api/bun/x509.zig"); var loaded = false; pub fn load() void { diff --git a/src/brotli.zig b/src/brotli.zig index 464d4b55c8edeb..a042b25a663ccd 100644 --- a/src/brotli.zig +++ b/src/brotli.zig @@ -1,8 +1,8 @@ const bun = @import("root").bun; const std = @import("std"); pub const c = struct { - pub usingnamespace @import("./deps/brotli_decoder.zig"); - pub usingnamespace @import("./deps/brotli_encoder.zig"); + pub usingnamespace @import("deps/brotli_decoder.zig"); + pub usingnamespace @import("deps/brotli_encoder.zig"); }; const BrotliDecoder = c.BrotliDecoder; const BrotliEncoder = c.BrotliEncoder; diff --git a/src/bun.js/ConsoleObject.zig b/src/bun.js/ConsoleObject.zig index cadd785ed97c45..01791c9bbd6d7a 100644 --- a/src/bun.js/ConsoleObject.zig +++ b/src/bun.js/ConsoleObject.zig @@ -3,7 +3,7 @@ const bun = @import("root").bun; const JSC = bun.JSC; const Output = bun.Output; const ConsoleObject = @This(); -const Shimmer = @import("./bindings/shimmer.zig").Shimmer; +const Shimmer = @import("bindings/shimmer.zig").Shimmer; const String = bun.String; const JSGlobalObject = JSC.JSGlobalObject; const JSValue = JSC.JSValue; @@ -18,7 +18,7 @@ const ScriptArguments = opaque {}; const JSPrinter = bun.js_printer; const Environment = bun.Environment; const default_allocator = bun.default_allocator; -const JestPrettyFormat = @import("./test/pretty_format.zig").JestPrettyFormat; +const JestPrettyFormat = @import("test/pretty_format.zig").JestPrettyFormat; const JSPromise = JSC.JSPromise; const EventType = JSC.EventType; pub const shim = Shimmer("Bun", "ConsoleObject", @This()); diff --git a/src/bun.js/api/BunObject.zig b/src/bun.js/api/BunObject.zig index 6fc5e586b13eac..68e417a65fb24f 100644 --- a/src/bun.js/api/BunObject.zig +++ b/src/bun.js/api/BunObject.zig @@ -202,7 +202,7 @@ const ImportKind = ast.ImportKind; const Analytics = @import("../../analytics/analytics_thread.zig"); const ZigString = bun.JSC.ZigString; const Runtime = @import("../../runtime.zig"); -const Router = @import("./filesystem_router.zig"); +const Router = @import("filesystem_router.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../../env_loader.zig"); const ParseResult = bun.transpiler.ParseResult; @@ -3563,7 +3563,7 @@ const TOMLObject = struct { const Debugger = JSC.Debugger; -pub const Timer = @import("./Timer.zig"); +pub const Timer = @import("Timer.zig"); pub const FFIObject = struct { const fields = .{ @@ -4549,7 +4549,7 @@ pub const JSZlib = struct { } }; -pub usingnamespace @import("./bun/subprocess.zig"); +pub usingnamespace @import("bun/subprocess.zig"); const InternalTestingAPIs = struct { pub fn BunInternalFunction__syntaxHighlighter(globalThis: *JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSValue { diff --git a/src/bun.js/api/Timer.zig b/src/bun.js/api/Timer.zig index 309cfdea2d6f4c..72deba4091ef1a 100644 --- a/src/bun.js/api/Timer.zig +++ b/src/bun.js/api/Timer.zig @@ -10,7 +10,7 @@ const Async = @import("async"); const uv = bun.windows.libuv; const StatWatcherScheduler = @import("../node/node_fs_stat_watcher.zig").StatWatcherScheduler; const Timer = @This(); -const DNSResolver = @import("./bun/dns_resolver.zig").DNSResolver; +const DNSResolver = @import("bun/dns_resolver.zig").DNSResolver; /// TimeoutMap is map of i32 to nullable Timeout structs /// i32 is exposed to JavaScript and can be used with clearTimeout, clearInterval, etc. diff --git a/src/bun.js/api/bun/h2_frame_parser.zig b/src/bun.js/api/bun/h2_frame_parser.zig index 41d8ef85d633db..03a1a4ac60bff7 100644 --- a/src/bun.js/api/bun/h2_frame_parser.zig +++ b/src/bun.js/api/bun/h2_frame_parser.zig @@ -5,11 +5,11 @@ const std = @import("std"); const Allocator = std.mem.Allocator; const JSC = bun.JSC; const MutableString = bun.MutableString; -const lshpack = @import("./lshpack.zig"); +const lshpack = @import("lshpack.zig"); const strings = bun.strings; pub const AutoFlusher = @import("../../webcore/streams.zig").AutoFlusher; -const TLSSocket = @import("./socket.zig").TLSSocket; -const TCPSocket = @import("./socket.zig").TCPSocket; +const TLSSocket = @import("socket.zig").TLSSocket; +const TCPSocket = @import("socket.zig").TCPSocket; const JSTLSSocket = JSC.Codegen.JSTLSSocket; const JSTCPSocket = JSC.Codegen.JSTCPSocket; const MAX_PAYLOAD_SIZE_WITHOUT_FRAME = 16384 - FrameHeader.byteSize - 1; diff --git a/src/bun.js/api/bun/socket.zig b/src/bun.js/api/bun/socket.zig index 7a2fef50eb0484..9a84f59a0a6507 100644 --- a/src/bun.js/api/bun/socket.zig +++ b/src/bun.js/api/bun/socket.zig @@ -16,10 +16,10 @@ const Which = @import("../../../which.zig"); const uws = bun.uws; const ZigString = JSC.ZigString; const BoringSSL = bun.BoringSSL; -const X509 = @import("./x509.zig"); +const X509 = @import("x509.zig"); const Async = bun.Async; const uv = bun.windows.libuv; -const H2FrameParser = @import("./h2_frame_parser.zig").H2FrameParser; +const H2FrameParser = @import("h2_frame_parser.zig").H2FrameParser; const NodePath = @import("../../node/path.zig"); noinline fn getSSLException(globalThis: *JSC.JSGlobalObject, defaultMessage: []const u8) JSValue { var zig_str: ZigString = ZigString.init(""); diff --git a/src/bun.js/api/bun/spawn.zig b/src/bun.js/api/bun/spawn.zig index 0f937974b6badf..9602b397e76b66 100644 --- a/src/bun.js/api/bun/spawn.zig +++ b/src/bun.js/api/bun/spawn.zig @@ -445,6 +445,6 @@ pub const PosixSpawn = struct { } } - pub usingnamespace @import("./process.zig"); - pub usingnamespace @import("./spawn/stdio.zig"); + pub usingnamespace @import("process.zig"); + pub usingnamespace @import("spawn/stdio.zig"); }; diff --git a/src/bun.js/api/bun/ssl_wrapper.zig b/src/bun.js/api/bun/ssl_wrapper.zig index c75fba25fa56a1..5198a0ee69ad74 100644 --- a/src/bun.js/api/bun/ssl_wrapper.zig +++ b/src/bun.js/api/bun/ssl_wrapper.zig @@ -1,7 +1,7 @@ const bun = @import("root").bun; const BoringSSL = bun.BoringSSL; -const X509 = @import("./x509.zig"); +const X509 = @import("x509.zig"); const JSC = bun.JSC; const uws = bun.uws; diff --git a/src/bun.js/api/bun/subprocess.zig b/src/bun.js/api/bun/subprocess.zig index f638466a7d9ef3..735ec8d44d6884 100644 --- a/src/bun.js/api/bun/subprocess.zig +++ b/src/bun.js/api/bun/subprocess.zig @@ -2432,7 +2432,7 @@ pub const Subprocess = struct { return globalThis.throwValue(err); } - const node_cluster_binding = @import("./../../node/node_cluster_binding.zig"); + const node_cluster_binding = @import("../../node/node_cluster_binding.zig"); pub fn handleIPCMessage( this: *Subprocess, diff --git a/src/bun.js/base.zig b/src/bun.js/base.zig index 7bc75dc56af277..5743c9f60d323b 100644 --- a/src/bun.js/base.zig +++ b/src/bun.js/base.zig @@ -10,14 +10,14 @@ const MutableString = bun.MutableString; const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; -const JavaScript = @import("./javascript.zig"); +const JavaScript = @import("javascript.zig"); const JSC = bun.JSC; -const WebCore = @import("./webcore.zig"); -const Test = @import("./test/jest.zig"); +const WebCore = @import("webcore.zig"); +const Test = @import("test/jest.zig"); const Fetch = WebCore.Fetch; const Response = WebCore.Response; const Request = WebCore.Request; -const Router = @import("./api/filesystem_router.zig"); +const Router = @import("api/filesystem_router.zig"); const IdentityContext = @import("../identity_context.zig").IdentityContext; const uws = bun.uws; const Body = WebCore.Body; @@ -1320,9 +1320,9 @@ pub const Ref = struct { } }; -pub const Strong = @import("./Strong.zig").Strong; -pub const Weak = @import("./Weak.zig").Weak; -pub const WeakRefType = @import("./Weak.zig").WeakRefType; +pub const Strong = @import("Strong.zig").Strong; +pub const Weak = @import("Weak.zig").Weak; +pub const WeakRefType = @import("Weak.zig").WeakRefType; pub const BinaryType = enum(u4) { Buffer, diff --git a/src/bun.js/bindings/FFI.zig b/src/bun.js/bindings/FFI.zig index bac1c5f4a0af57..64ed8d92e5db7f 100644 --- a/src/bun.js/bindings/FFI.zig +++ b/src/bun.js/bindings/FFI.zig @@ -14,7 +14,7 @@ pub const union_EncodedJSValue = extern union { asBits: struct_unnamed_1, asPtr: ?*anyopaque, asDouble: f64, - asJSValue: @import("./bindings.zig").JSValue, + asJSValue: @import("bindings.zig").JSValue, }; pub const EncodedJSValue = union_EncodedJSValue; pub export var ValueUndefined: EncodedJSValue = EncodedJSValue{ @@ -59,8 +59,8 @@ pub inline fn JSVALUE_TO_INT64(arg_value: EncodedJSValue) i64 { } pub extern fn JSVALUE_TO_UINT64_SLOW(value: EncodedJSValue) u64; pub extern fn JSVALUE_TO_INT64_SLOW(value: EncodedJSValue) i64; -pub const UINT64_TO_JSVALUE_SLOW = @import("./bindings.zig").JSValue.fromUInt64NoTruncate; -pub const INT64_TO_JSVALUE_SLOW = @import("./bindings.zig").JSValue.fromInt64NoTruncate; +pub const UINT64_TO_JSVALUE_SLOW = @import("bindings.zig").JSValue.fromUInt64NoTruncate; +pub const INT64_TO_JSVALUE_SLOW = @import("bindings.zig").JSValue.fromInt64NoTruncate; pub inline fn UINT64_TO_JSVALUE(arg_globalObject: ?*anyopaque, arg_val: u64) EncodedJSValue { const globalObject = arg_globalObject; const val = arg_val; @@ -70,7 +70,7 @@ pub inline fn UINT64_TO_JSVALUE(arg_globalObject: ?*anyopaque, arg_val: u64) Enc if (val < @as(c_ulonglong, @bitCast(@as(c_longlong, @as(c_long, 9007199254740991))))) { return DOUBLE_TO_JSVALUE(@as(f64, @floatFromInt(val))); } - return UINT64_TO_JSVALUE_SLOW(@as(*@import("./bindings.zig").JSGlobalObject, @ptrCast(globalObject.?)), val).asEncoded(); + return UINT64_TO_JSVALUE_SLOW(@as(*@import("bindings.zig").JSGlobalObject, @ptrCast(globalObject.?)), val).asEncoded(); } pub inline fn INT64_TO_JSVALUE(arg_globalObject: ?*anyopaque, arg_val: i64) EncodedJSValue { const globalObject = arg_globalObject; @@ -81,7 +81,7 @@ pub inline fn INT64_TO_JSVALUE(arg_globalObject: ?*anyopaque, arg_val: i64) Enco if ((val >= @as(c_longlong, @bitCast(@as(c_longlong, -@as(c_long, 9007199254740991))))) and (val <= @as(c_longlong, @bitCast(@as(c_longlong, @as(c_long, 9007199254740991)))))) { return DOUBLE_TO_JSVALUE(@as(f64, @floatFromInt(val))); } - return INT64_TO_JSVALUE_SLOW(@as(*@import("./bindings.zig").JSGlobalObject, @ptrCast(globalObject.?)), val).asEncoded(); + return INT64_TO_JSVALUE_SLOW(@as(*@import("bindings.zig").JSGlobalObject, @ptrCast(globalObject.?)), val).asEncoded(); } pub inline fn INT32_TO_JSVALUE(arg_val: i32) EncodedJSValue { return .{ .asInt64 = @as(i64, @bitCast(@as(c_ulonglong, 18446181123756130304) | @as(c_ulonglong, @bitCast(@as(c_ulonglong, @as(u32, @bitCast(arg_val))))))) }; diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig index e804c0c8d31921..0fdc5c201962d2 100644 --- a/src/bun.js/bindings/bindings.zig +++ b/src/bun.js/bindings/bindings.zig @@ -4,7 +4,7 @@ const string = bun.string; const Output = bun.Output; const C_API = bun.JSC.C; const StringPointer = @import("../../api/schema.zig").Api.StringPointer; -const Exports = @import("./exports.zig"); +const Exports = @import("exports.zig"); const strings = bun.strings; const ErrorableZigString = Exports.ErrorableZigString; const ErrorableResolvedSource = Exports.ErrorableResolvedSource; @@ -15,7 +15,7 @@ const ArrayBuffer = @import("../base.zig").ArrayBuffer; const JSC = bun.JSC; const Shimmer = JSC.Shimmer; const ConsoleObject = JSC.ConsoleObject; -const FFI = @import("./FFI.zig"); +const FFI = @import("FFI.zig"); const NullableAllocator = bun.NullableAllocator; const MutableString = bun.MutableString; const JestPrettyFormat = @import("../test/pretty_format.zig").JestPrettyFormat; @@ -4162,7 +4162,7 @@ pub const JSValue = enum(i64) { } pub fn putZigString(value: JSValue, global: *JSGlobalObject, key: *const ZigString, result: JSC.JSValue) void { - @import("./headers.zig").JSC__JSValue__put(value, global, key, result); + @import("headers.zig").JSC__JSValue__put(value, global, key, result); } extern "C" fn JSC__JSValue__putBunString(value: JSValue, global: *JSGlobalObject, key: *const bun.String, result: JSC.JSValue) void; @@ -6970,7 +6970,7 @@ pub const WTF = struct { } }; -pub usingnamespace @import("./JSPropertyIterator.zig"); +pub usingnamespace @import("JSPropertyIterator.zig"); // DOMCall Fields const Bun = JSC.API.Bun; @@ -7032,7 +7032,7 @@ pub const ScriptExecutionStatus = enum(i32) { comptime { // this file is gennerated, but cant be placed in the build/debug/codegen folder // because zig will complain about outside-of-module stuff - _ = @import("./GeneratedJS2Native.zig"); + _ = @import("GeneratedJS2Native.zig"); } // Error's cannot be created off of the main thread. So we use this to store the diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig index 5bcb682cb33075..1959c62fc06cef 100644 --- a/src/bun.js/bindings/exports.zig +++ b/src/bun.js/bindings/exports.zig @@ -7,7 +7,7 @@ const ZigURL = @import("../../url.zig").URL; const Api = @import("../../api/schema.zig").Api; const bun = @import("root").bun; const std = @import("std"); -const Shimmer = @import("./shimmer.zig").Shimmer; +const Shimmer = @import("shimmer.zig").Shimmer; const strings = bun.strings; const default_allocator = bun.default_allocator; const NewGlobalObject = JSC.NewGlobalObject; diff --git a/src/bun.js/bindings/header-gen.zig b/src/bun.js/bindings/header-gen.zig index 3b4dd7ca1ba808..3f3fe1abbe137e 100644 --- a/src/bun.js/bindings/header-gen.zig +++ b/src/bun.js/bindings/header-gen.zig @@ -6,7 +6,7 @@ const StructMeta = std.builtin.Type.Struct; const EnumMeta = std.builtin.Type.Enum; const UnionMeta = std.builtin.Type.Union; const warn = std.debug.warn; -const StaticExport = @import("./static_export.zig"); +const StaticExport = @import("static_export.zig"); const typeBaseName = @import("../../meta.zig").typeBaseName; const bun = @import("root").bun; const TypeNameMap = bun.StringHashMap([]const u8); diff --git a/src/bun.js/bindings/shimmer.zig b/src/bun.js/bindings/shimmer.zig index 79c3dec3d4e630..d281f180ecd9f2 100644 --- a/src/bun.js/bindings/shimmer.zig +++ b/src/bun.js/bindings/shimmer.zig @@ -1,9 +1,9 @@ const std = @import("std"); const bun = @import("root").bun; -const StaticExport = @import("./static_export.zig"); -const Sizes = @import("./sizes.zig"); +const StaticExport = @import("static_export.zig"); +const Sizes = @import("sizes.zig"); pub const is_bindgen: bool = false; -const headers = @import("./headers.zig"); +const headers = @import("headers.zig"); fn isNullableType(comptime Type: type) bool { return @typeInfo(Type) == .Optional or diff --git a/src/bun.js/event_loop.zig b/src/bun.js/event_loop.zig index 232be9a227ac8b..7126ef41ffde1f 100644 --- a/src/bun.js/event_loop.zig +++ b/src/bun.js/event_loop.zig @@ -406,7 +406,7 @@ const ProcessWaiterThreadTask = if (Environment.isPosix) bun.spawn.WaiterThread. const ProcessMiniEventLoopWaiterThreadTask = if (Environment.isPosix) bun.spawn.WaiterThread.ProcessMiniEventLoopQueue.ResultTask else opaque {}; const ShellAsyncSubprocessDone = bun.shell.Interpreter.Cmd.ShellAsyncSubprocessDone; const RuntimeTranspilerStore = JSC.RuntimeTranspilerStore; -const ServerAllConnectionsClosedTask = @import("./api/server.zig").ServerAllConnectionsClosedTask; +const ServerAllConnectionsClosedTask = @import("api/server.zig").ServerAllConnectionsClosedTask; // Task.get(ReadFileTask) -> ?ReadFileTask pub const Task = TaggedPointerUnion(.{ @@ -493,7 +493,7 @@ pub const Task = TaggedPointerUnion(.{ bun.bake.DevServer.HotReloadEvent, bun.bundle_v2.DeferredBatchTask, }); -const UnboundedQueue = @import("./unbounded_queue.zig").UnboundedQueue; +const UnboundedQueue = @import("unbounded_queue.zig").UnboundedQueue; pub const ConcurrentTask = struct { task: if (JSC.is_bindgen) void else Task = undefined, next: ?*ConcurrentTask = null, diff --git a/src/bun.js/ipc.zig b/src/bun.js/ipc.zig index cfa4150f4f6ac8..ff33d9b25528c0 100644 --- a/src/bun.js/ipc.zig +++ b/src/bun.js/ipc.zig @@ -12,7 +12,7 @@ const JSC = bun.JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; -const node_cluster_binding = @import("./node/node_cluster_binding.zig"); +const node_cluster_binding = @import("node/node_cluster_binding.zig"); pub const log = Output.scoped(.IPC, false); diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig index bb03ba2415d17a..3d495fbbc620ca 100644 --- a/src/bun.js/javascript.zig +++ b/src/bun.js/javascript.zig @@ -1,6 +1,6 @@ const std = @import("std"); const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; -const StaticExport = @import("./bindings/static_export.zig"); +const StaticExport = @import("bindings/static_export.zig"); const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; @@ -37,7 +37,7 @@ const ImportKind = ast.ImportKind; const Analytics = @import("../analytics/analytics_thread.zig"); const ZigString = bun.JSC.ZigString; const Runtime = @import("../runtime.zig"); -const Router = @import("./api/filesystem_router.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; @@ -51,12 +51,12 @@ const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; 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 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 = bun.JSC.JSValue; -const NewClass = @import("./base.zig").NewClass; +const NewClass = @import("base.zig").NewClass; const JSGlobalObject = bun.JSC.JSGlobalObject; const ExceptionValueRef = bun.JSC.ExceptionValueRef; @@ -75,7 +75,7 @@ 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 Config = @import("config.zig"); const URL = @import("../url.zig").URL; const Bun = JSC.API.Bun; const EventLoop = JSC.EventLoop; @@ -614,7 +614,7 @@ pub const ExitHandler = struct { } }; -pub const WebWorker = @import("./web_worker.zig").WebWorker; +pub const WebWorker = @import("web_worker.zig").WebWorker; pub const ImportWatcher = union(enum) { none: void, @@ -4291,7 +4291,7 @@ pub const VirtualMachine = struct { pub usingnamespace bun.New(@This()); - const node_cluster_binding = @import("./node/node_cluster_binding.zig"); + const node_cluster_binding = @import("node/node_cluster_binding.zig"); pub fn ipc(this: *IPCInstance) ?*IPC.IPCData { return &this.data; diff --git a/src/bun.js/javascript_core_c_api.zig b/src/bun.js/javascript_core_c_api.zig index 18e3f199cd7aca..a8984636629370 100644 --- a/src/bun.js/javascript_core_c_api.zig +++ b/src/bun.js/javascript_core_c_api.zig @@ -6,7 +6,7 @@ /// ************************************ const bun = @import("root").bun; const std = @import("std"); -const cpp = @import("./bindings/bindings.zig"); +const cpp = @import("bindings/bindings.zig"); const generic = opaque { pub fn value(this: *const @This()) cpp.JSValue { return @as(cpp.JSValue, @enumFromInt(@as(cpp.JSValueReprInt, @bitCast(@intFromPtr(this))))); diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig index dcb8327de49981..189214962faf54 100644 --- a/src/bun.js/module_loader.zig +++ b/src/bun.js/module_loader.zig @@ -1,6 +1,6 @@ const std = @import("std"); const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; -const StaticExport = @import("./bindings/static_export.zig"); +const StaticExport = @import("bindings/static_export.zig"); const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; @@ -37,7 +37,7 @@ const ImportKind = ast.ImportKind; const Analytics = @import("../analytics/analytics_thread.zig"); const ZigString = bun.JSC.ZigString; const Runtime = @import("../runtime.zig"); -const Router = @import("./api/filesystem_router.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; @@ -50,12 +50,12 @@ const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; 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 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 = bun.JSC.JSValue; -const NewClass = @import("./base.zig").NewClass; +const NewClass = @import("base.zig").NewClass; const JSGlobalObject = bun.JSC.JSGlobalObject; const ExceptionValueRef = bun.JSC.ExceptionValueRef; @@ -74,7 +74,7 @@ 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 Config = @import("config.zig"); const URL = @import("../url.zig").URL; const Bun = JSC.API.Bun; const EventLoop = JSC.EventLoop; diff --git a/src/bun.js/node/fs_events.zig b/src/bun.js/node/fs_events.zig index 9953527a6ebfb6..4144c576bfccb9 100644 --- a/src/bun.js/node/fs_events.zig +++ b/src/bun.js/node/fs_events.zig @@ -8,7 +8,7 @@ const UnboundedQueue = @import("../unbounded_queue.zig").UnboundedQueue; const TaggedPointerUnion = @import("../../tagged_pointer.zig").TaggedPointerUnion; const string = bun.string; -const PathWatcher = @import("./path_watcher.zig").PathWatcher; +const PathWatcher = @import("path_watcher.zig").PathWatcher; const EventType = PathWatcher.EventType; const Event = bun.JSC.Node.FSWatcher.Event; diff --git a/src/bun.js/node/node_assert.zig b/src/bun.js/node/node_assert.zig index 36d944975a059d..ed58fdfa3c0f3c 100644 --- a/src/bun.js/node/node_assert.zig +++ b/src/bun.js/node/node_assert.zig @@ -1,6 +1,6 @@ const std = @import("std"); const bun = @import("root").bun; -const MyersDiff = @import("./assert/myers_diff.zig"); +const MyersDiff = @import("assert/myers_diff.zig"); const Allocator = std.mem.Allocator; const BunString = bun.String; diff --git a/src/bun.js/node/node_assert_binding.zig b/src/bun.js/node/node_assert_binding.zig index 824e06bb7c9949..38e1feeb1e7afa 100644 --- a/src/bun.js/node/node_assert_binding.zig +++ b/src/bun.js/node/node_assert_binding.zig @@ -1,7 +1,7 @@ const std = @import("std"); const bun = @import("root").bun; -const assert = @import("./node_assert.zig"); -const DiffList = @import("./assert/myers_diff.zig").DiffList; +const assert = @import("node_assert.zig"); +const DiffList = @import("assert/myers_diff.zig").DiffList; const Allocator = std.mem.Allocator; const JSC = bun.JSC; diff --git a/src/bun.js/node/node_crypto_binding.zig b/src/bun.js/node/node_crypto_binding.zig index 2605f64fb86a78..5543c7c4e2941a 100644 --- a/src/bun.js/node/node_crypto_binding.zig +++ b/src/bun.js/node/node_crypto_binding.zig @@ -11,7 +11,7 @@ const assert = bun.assert; const EVP = Crypto.EVP; const PBKDF2 = EVP.PBKDF2; const JSValue = JSC.JSValue; -const validators = @import("./util/validators.zig"); +const validators = @import("util/validators.zig"); fn randomInt(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSC.JSValue { const arguments = callframe.arguments_old(2).slice(); diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig index d0500f31cb0ab6..cc2170c8944a7c 100644 --- a/src/bun.js/node/node_fs.zig +++ b/src/bun.js/node/node_fs.zig @@ -21,14 +21,14 @@ const FDImpl = bun.FDImpl; const Syscall = if (Environment.isWindows) bun.sys.sys_uv else bun.sys; -const Constants = @import("./node_fs_constant.zig").Constants; +const Constants = @import("node_fs_constant.zig").Constants; const builtin = @import("builtin"); const posix = std.posix; const darwin = std.os.darwin; const linux = std.os.linux; const PathLike = JSC.Node.PathLike; const PathOrFileDescriptor = JSC.Node.PathOrFileDescriptor; -const DirIterator = @import("./dir_iterator.zig"); +const DirIterator = @import("dir_iterator.zig"); const Path = @import("../../resolver/resolve_path.zig"); const FileSystem = @import("../../fs.zig").FileSystem; const ArgumentsSlice = JSC.Node.ArgumentsSlice; diff --git a/src/bun.js/node/node_fs_stat_watcher.zig b/src/bun.js/node/node_fs_stat_watcher.zig index 8071bfbc2c7a31..475b7d7a3f7641 100644 --- a/src/bun.js/node/node_fs_stat_watcher.zig +++ b/src/bun.js/node/node_fs_stat_watcher.zig @@ -7,7 +7,7 @@ const Encoder = JSC.WebCore.Encoder; const Mutex = bun.Mutex; const uws = @import("../../deps/uws.zig"); -const PathWatcher = @import("./path_watcher.zig"); +const PathWatcher = @import("path_watcher.zig"); const UnboundedQueue = @import("../unbounded_queue.zig").UnboundedQueue; const EventLoopTimer = @import("../api/Timer.zig").EventLoopTimer; const VirtualMachine = JSC.VirtualMachine; diff --git a/src/bun.js/node/node_fs_watcher.zig b/src/bun.js/node/node_fs_watcher.zig index 05cf2b498709b5..1227b62ad46fa9 100644 --- a/src/bun.js/node/node_fs_watcher.zig +++ b/src/bun.js/node/node_fs_watcher.zig @@ -16,7 +16,7 @@ const StoredFileDescriptorType = bun.StoredFileDescriptorType; const Environment = bun.Environment; const Async = bun.Async; const log = Output.scoped(.@"fs.watch", true); -const PathWatcher = if (Environment.isWindows) @import("./win_watcher.zig") else @import("./path_watcher.zig"); +const PathWatcher = if (Environment.isWindows) @import("win_watcher.zig") else @import("path_watcher.zig"); pub const FSWatcher = struct { ctx: *VirtualMachine, diff --git a/src/bun.js/node/node_zlib_binding.zig b/src/bun.js/node/node_zlib_binding.zig index cd233554c775b3..63f90d00c6f90a 100644 --- a/src/bun.js/node/node_zlib_binding.zig +++ b/src/bun.js/node/node_zlib_binding.zig @@ -5,7 +5,7 @@ const JSC = bun.JSC; const string = bun.string; const Output = bun.Output; const ZigString = JSC.ZigString; -const validators = @import("./util/validators.zig"); +const validators = @import("util/validators.zig"); const debug = bun.Output.scoped(.zlib, true); pub fn crc32(globalThis: *JSC.JSGlobalObject, callframe: *JSC.CallFrame) bun.JSError!JSC.JSValue { diff --git a/src/bun.js/node/path.zig b/src/bun.js/node/path.zig index 3545f4418de694..66a634dc8ee17f 100644 --- a/src/bun.js/node/path.zig +++ b/src/bun.js/node/path.zig @@ -5,7 +5,7 @@ const windows = bun.windows; const Path = @This(); const typeBaseNameT = bun.meta.typeBaseNameT; -const validators = @import("./util/validators.zig"); +const validators = @import("util/validators.zig"); const validateObject = validators.validateObject; const validateString = validators.validateString; // Allow on the stack: diff --git a/src/bun.js/node/path_watcher.zig b/src/bun.js/node/path_watcher.zig index 4dd3aae1788bba..c91f47327f2009 100644 --- a/src/bun.js/node/path_watcher.zig +++ b/src/bun.js/node/path_watcher.zig @@ -4,7 +4,7 @@ const UnboundedQueue = @import("../unbounded_queue.zig").UnboundedQueue; const Path = @import("../../resolver/resolve_path.zig"); const Fs = @import("../../fs.zig"); const Mutex = bun.Mutex; -const FSEvents = @import("./fs_events.zig"); +const FSEvents = @import("fs_events.zig"); const bun = @import("root").bun; const Output = bun.Output; diff --git a/src/bun.js/node/types.zig b/src/bun.js/node/types.zig index 302e11fd5e2d7d..99ab6999219c0f 100644 --- a/src/bun.js/node/types.zig +++ b/src/bun.js/node/types.zig @@ -23,9 +23,9 @@ const Shimmer = @import("../bindings/shimmer.zig").Shimmer; const Syscall = bun.sys; const URL = @import("../../url.zig").URL; const Value = std.json.Value; -pub const validators = @import("./util/validators.zig"); +pub const validators = @import("util/validators.zig"); -pub const Path = @import("./path.zig"); +pub const Path = @import("path.zig"); fn typeBaseNameT(comptime T: type) []const u8 { return meta.typeBaseName(@typeName(T)); @@ -669,7 +669,7 @@ pub const StringOrBuffer = union(enum) { } }; -pub const ErrorCode = @import("./nodejs_error_code.zig").Code; +pub const ErrorCode = @import("nodejs_error_code.zig").Code; // We can't really use Zig's error handling for syscalls because Node.js expects the "real" errno to be returned // and various issues with std.posix that make it too unstable for arbitrary user input (e.g. how .BADF is marked as unreachable) diff --git a/src/bun.js/node/util/parse_args.zig b/src/bun.js/node/util/parse_args.zig index 3c1e61e1601bbd..6ad035d609e3e9 100644 --- a/src/bun.js/node/util/parse_args.zig +++ b/src/bun.js/node/util/parse_args.zig @@ -8,7 +8,7 @@ const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const ZigString = JSC.ZigString; -const validators = @import("./validators.zig"); +const validators = @import("validators.zig"); const validateArray = validators.validateArray; const validateBoolean = validators.validateBoolean; const validateBooleanArray = validators.validateBooleanArray; @@ -17,7 +17,7 @@ const validateString = validators.validateString; const validateStringArray = validators.validateStringArray; const validateStringEnum = validators.validateStringEnum; -const utils = @import("./parse_args_utils.zig"); +const utils = @import("parse_args_utils.zig"); const OptionValueType = utils.OptionValueType; const OptionDefinition = utils.OptionDefinition; const findOptionByShortName = utils.findOptionByShortName; diff --git a/src/bun.js/node/win_watcher.zig b/src/bun.js/node/win_watcher.zig index 93a96faf4a01fa..f4680801cbfbea 100644 --- a/src/bun.js/node/win_watcher.zig +++ b/src/bun.js/node/win_watcher.zig @@ -13,7 +13,7 @@ const Output = bun.Output; const Watcher = @import("../../watcher.zig"); const FSWatcher = bun.JSC.Node.FSWatcher; -const EventType = @import("./path_watcher.zig").PathWatcher.EventType; +const EventType = @import("path_watcher.zig").PathWatcher.EventType; const Event = FSWatcher.Event; var default_manager: ?*PathWatcherManager = null; diff --git a/src/bun.js/rare_data.zig b/src/bun.js/rare_data.zig index e49925e14828f9..0da11ab04b8daf 100644 --- a/src/bun.js/rare_data.zig +++ b/src/bun.js/rare_data.zig @@ -11,10 +11,10 @@ const bun = @import("root").bun; const FDImpl = bun.FDImpl; const Environment = bun.Environment; const WebSocketClientMask = @import("../http/websocket_http_client.zig").Mask; -const UUID = @import("./uuid.zig"); +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 StatWatcherScheduler = @import("node/node_fs_stat_watcher.zig").StatWatcherScheduler; +const IPC = @import("ipc.zig"); const uws = bun.uws; boring_ssl_engine: ?*BoringSSL.ENGINE = null, @@ -405,7 +405,7 @@ pub fn stdin(rare: *RareData) *Blob.Store { }; } -const Subprocess = @import("./api/bun/subprocess.zig").Subprocess; +const Subprocess = @import("api/bun/subprocess.zig").Subprocess; pub fn spawnIPCContext(rare: *RareData, vm: *JSC.VirtualMachine) *uws.SocketContext { if (rare.spawn_ipc_usockets_context) |ctx| { diff --git a/src/bun.js/test/expect.zig b/src/bun.js/test/expect.zig index f09abb158fb256..770b0a681a7b18 100644 --- a/src/bun.js/test/expect.zig +++ b/src/bun.js/test/expect.zig @@ -20,7 +20,7 @@ const JSObject = JSC.JSObject; const CallFrame = JSC.CallFrame; const ZigString = JSC.ZigString; const Environment = bun.Environment; -const DiffFormatter = @import("./diff_format.zig").DiffFormatter; +const DiffFormatter = @import("diff_format.zig").DiffFormatter; pub const Counter = struct { expected: u32 = 0, diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig index 4be73143aa7ef1..3ded867127b776 100644 --- a/src/bun.js/test/jest.zig +++ b/src/bun.js/test/jest.zig @@ -8,12 +8,12 @@ const ZigURL = @import("../../url.zig").URL; const HTTPClient = bun.http; const Environment = bun.Environment; -const Snapshots = @import("./snapshot.zig").Snapshots; -const expect = @import("./expect.zig"); +const Snapshots = @import("snapshot.zig").Snapshots; +const expect = @import("expect.zig"); const Counter = expect.Counter; const Expect = expect.Expect; -const DiffFormatter = @import("./diff_format.zig").DiffFormatter; +const DiffFormatter = @import("diff_format.zig").DiffFormatter; const JSC = bun.JSC; const js = JSC.C; diff --git a/src/bun.js/test/pretty_format.zig b/src/bun.js/test/pretty_format.zig index ac9b1fdcd72a27..cb93ff922e99ab 100644 --- a/src/bun.js/test/pretty_format.zig +++ b/src/bun.js/test/pretty_format.zig @@ -15,7 +15,7 @@ const JSPrinter = bun.js_printer; const JSPrivateDataPtr = JSC.JSPrivateDataPtr; const JS = @import("../javascript.zig"); const JSPromise = JSC.JSPromise; -const expect = @import("./expect.zig"); +const expect = @import("expect.zig"); pub const EventType = enum(u8) { Event, diff --git a/src/bun.js/test/snapshot.zig b/src/bun.js/test/snapshot.zig index b9380d4f68b014..fd57267bf6c505 100644 --- a/src/bun.js/test/snapshot.zig +++ b/src/bun.js/test/snapshot.zig @@ -5,7 +5,7 @@ const string = bun.string; const MutableString = bun.MutableString; const strings = bun.strings; const logger = bun.logger; -const jest = @import("./jest.zig"); +const jest = @import("jest.zig"); const Jest = jest.Jest; const TestRunner = jest.TestRunner; const js_parser = bun.js_parser; @@ -13,7 +13,7 @@ const js_ast = bun.JSAst; const JSC = bun.JSC; const JSValue = JSC.JSValue; const VirtualMachine = JSC.VirtualMachine; -const Expect = @import("./expect.zig").Expect; +const Expect = @import("expect.zig").Expect; pub const Snapshots = struct { const file_header = "// Bun Snapshot v1, https://goo.gl/fbAQLP\n"; diff --git a/src/bun.js/webcore.zig b/src/bun.js/webcore.zig index 8699b4b8a7fdc1..d8740982b4ce3d 100644 --- a/src/bun.js/webcore.zig +++ b/src/bun.js/webcore.zig @@ -1,20 +1,20 @@ -pub usingnamespace @import("./webcore/response.zig"); -pub usingnamespace @import("./webcore/encoding.zig"); -pub usingnamespace @import("./webcore/streams.zig"); -pub usingnamespace @import("./webcore/blob.zig"); -pub usingnamespace @import("./webcore/S3Stat.zig"); -pub usingnamespace @import("./webcore/S3Client.zig"); -pub usingnamespace @import("./webcore/request.zig"); -pub usingnamespace @import("./webcore/body.zig"); -pub const ObjectURLRegistry = @import("./webcore/ObjectURLRegistry.zig"); +pub usingnamespace @import("webcore/response.zig"); +pub usingnamespace @import("webcore/encoding.zig"); +pub usingnamespace @import("webcore/streams.zig"); +pub usingnamespace @import("webcore/blob.zig"); +pub usingnamespace @import("webcore/S3Stat.zig"); +pub usingnamespace @import("webcore/S3Client.zig"); +pub usingnamespace @import("webcore/request.zig"); +pub usingnamespace @import("webcore/body.zig"); +pub const ObjectURLRegistry = @import("webcore/ObjectURLRegistry.zig"); const JSC = bun.JSC; const std = @import("std"); const bun = @import("root").bun; const string = bun.string; -pub const AbortSignal = @import("./bindings/bindings.zig").AbortSignal; -pub const JSValue = @import("./bindings/bindings.zig").JSValue; +pub const AbortSignal = @import("bindings/bindings.zig").AbortSignal; +pub const JSValue = @import("bindings/bindings.zig").JSValue; const Environment = bun.Environment; -const UUID7 = @import("./uuid.zig").UUID7; +const UUID7 = @import("uuid.zig").UUID7; pub const Lifetime = enum { clone, diff --git a/src/bun.js/webcore/S3Client.zig b/src/bun.js/webcore/S3Client.zig index 37b1799cb463ec..58a1ebbebedec0 100644 --- a/src/bun.js/webcore/S3Client.zig +++ b/src/bun.js/webcore/S3Client.zig @@ -5,7 +5,7 @@ const Blob = JSC.WebCore.Blob; const PathOrBlob = JSC.Node.PathOrBlob; const ZigString = JSC.ZigString; const Method = bun.http.Method; -const S3File = @import("./S3File.zig"); +const S3File = @import("S3File.zig"); const S3Credentials = bun.S3.S3Credentials; pub fn writeFormatCredentials(credentials: *S3Credentials, options: bun.S3.MultiPartUploadOptions, acl: ?bun.S3.ACL, comptime Formatter: type, formatter: *Formatter, writer: anytype, comptime enable_ansi_colors: bool) !void { diff --git a/src/bun.js/webcore/S3File.zig b/src/bun.js/webcore/S3File.zig index e6f34f97febff1..d2be37febdb4dc 100644 --- a/src/bun.js/webcore/S3File.zig +++ b/src/bun.js/webcore/S3File.zig @@ -8,9 +8,9 @@ const ZigString = JSC.ZigString; const Method = bun.http.Method; const strings = bun.strings; const Output = bun.Output; -const S3Client = @import("./S3Client.zig"); +const S3Client = @import("S3Client.zig"); const S3 = bun.S3; -const S3Stat = @import("./S3Stat.zig").S3Stat; +const S3Stat = @import("S3Stat.zig").S3Stat; pub fn writeFormat(s3: *Blob.S3Store, comptime Formatter: type, formatter: *Formatter, writer: anytype, comptime enable_ansi_colors: bool) !void { try writer.writeAll(comptime Output.prettyFmt("S3Ref", enable_ansi_colors)); const credentials = s3.getCredentials(); diff --git a/src/bun.js/webcore/blob.zig b/src/bun.js/webcore/blob.zig index 53d4c87113c973..99043cc486a001 100644 --- a/src/bun.js/webcore/blob.zig +++ b/src/bun.js/webcore/blob.zig @@ -46,22 +46,22 @@ const libuv = bun.windows.libuv; const S3 = bun.S3; const S3Credentials = S3.S3Credentials; const PathOrBlob = JSC.Node.PathOrBlob; -const WriteFilePromise = @import("./blob/WriteFile.zig").WriteFilePromise; -const WriteFileWaitFromLockedValueTask = @import("./blob/WriteFile.zig").WriteFileWaitFromLockedValueTask; -const NewReadFileHandler = @import("./blob/ReadFile.zig").NewReadFileHandler; -const WriteFile = @import("./blob/WriteFile.zig").WriteFile; -const ReadFile = @import("./blob/ReadFile.zig").ReadFile; -const WriteFileWindows = @import("./blob/WriteFile.zig").WriteFileWindows; +const WriteFilePromise = @import("blob/WriteFile.zig").WriteFilePromise; +const WriteFileWaitFromLockedValueTask = @import("blob/WriteFile.zig").WriteFileWaitFromLockedValueTask; +const NewReadFileHandler = @import("blob/ReadFile.zig").NewReadFileHandler; +const WriteFile = @import("blob/WriteFile.zig").WriteFile; +const ReadFile = @import("blob/ReadFile.zig").ReadFile; +const WriteFileWindows = @import("blob/WriteFile.zig").WriteFileWindows; -const S3File = @import("./S3File.zig"); +const S3File = @import("S3File.zig"); pub const Blob = struct { const bloblog = Output.scoped(.Blob, false); pub usingnamespace bun.New(@This()); pub usingnamespace JSC.Codegen.JSBlob; - pub usingnamespace @import("./blob/WriteFile.zig"); - pub usingnamespace @import("./blob/ReadFile.zig"); + pub usingnamespace @import("blob/WriteFile.zig"); + pub usingnamespace @import("blob/ReadFile.zig"); pub const ClosingState = enum(u8) { running, closing, @@ -142,7 +142,7 @@ pub const Blob = struct { return store.data == .file; } - const ReadFileUV = @import("./blob/ReadFile.zig").ReadFileUV; + const ReadFileUV = @import("blob/ReadFile.zig").ReadFileUV; pub fn doReadFromS3(this: *Blob, comptime Function: anytype, global: *JSGlobalObject) JSValue { bloblog("doReadFromS3", .{}); diff --git a/src/bun.zig b/src/bun.zig index d3351ed033a612..a4d70adade6f23 100644 --- a/src/bun.zig +++ b/src/bun.zig @@ -16,23 +16,23 @@ pub const use_mimalloc = true; pub const default_allocator: std.mem.Allocator = if (!use_mimalloc) std.heap.c_allocator else - @import("./allocators/memory_allocator.zig").c_allocator; + @import("allocators/memory_allocator.zig").c_allocator; /// Zeroing memory allocator pub const z_allocator: std.mem.Allocator = if (!use_mimalloc) std.heap.c_allocator else - @import("./allocators/memory_allocator.zig").z_allocator; + @import("allocators/memory_allocator.zig").z_allocator; pub const huge_allocator: std.mem.Allocator = if (!use_mimalloc) std.heap.c_allocator else - @import("./allocators/memory_allocator.zig").huge_allocator; + @import("allocators/memory_allocator.zig").huge_allocator; pub const auto_allocator: std.mem.Allocator = if (!use_mimalloc) std.heap.c_allocator else - @import("./allocators/memory_allocator.zig").auto_allocator; + @import("allocators/memory_allocator.zig").auto_allocator; pub const callmod_inline: std.builtin.CallModifier = if (builtin.mode == .Debug) .auto else .always_inline; pub const callconv_inline: std.builtin.CallingConvention = if (builtin.mode == .Debug) .Unspecified else .Inline; @@ -100,20 +100,20 @@ pub const JSError = error{ pub const JSOOM = OOM || JSError; -pub const detectCI = @import("./ci_info.zig").detectCI; +pub const detectCI = @import("ci_info.zig").detectCI; pub const C = @import("root").C; -pub const sha = @import("./sha.zig"); +pub const sha = @import("sha.zig"); pub const FeatureFlags = @import("feature_flags.zig"); -pub const meta = @import("./meta.zig"); -pub const base64 = @import("./base64/base64.zig"); -pub const path = @import("./resolver/resolve_path.zig"); -pub const resolver = @import("./resolver/resolver.zig"); -pub const DirIterator = @import("./bun.js/node/dir_iterator.zig"); -pub const PackageJSON = @import("./resolver/package_json.zig").PackageJSON; -pub const fmt = @import("./fmt.zig"); -pub const allocators = @import("./allocators.zig"); -pub const bun_js = @import("./bun_js.zig"); +pub const meta = @import("meta.zig"); +pub const base64 = @import("base64/base64.zig"); +pub const path = @import("resolver/resolve_path.zig"); +pub const resolver = @import("resolver/resolver.zig"); +pub const DirIterator = @import("bun.js/node/dir_iterator.zig"); +pub const PackageJSON = @import("resolver/package_json.zig").PackageJSON; +pub const fmt = @import("fmt.zig"); +pub const allocators = @import("allocators.zig"); +pub const bun_js = @import("bun_js.zig"); /// All functions and interfaces provided from Bun's `bindgen` utility. pub const gen = @import("bun.js/bindings/GeneratedBindings.zig"); @@ -122,30 +122,30 @@ comptime { } /// Copied from Zig std.trait -pub const trait = @import("./trait.zig"); +pub const trait = @import("trait.zig"); /// Copied from Zig std.Progress before 0.13 rewrite -pub const Progress = @import("./Progress.zig"); +pub const Progress = @import("Progress.zig"); /// Modified version of Zig's ComptimeStringMap -pub const comptime_string_map = @import("./comptime_string_map.zig"); +pub const comptime_string_map = @import("comptime_string_map.zig"); pub const ComptimeStringMap = comptime_string_map.ComptimeStringMap; pub const ComptimeStringMap16 = comptime_string_map.ComptimeStringMap16; pub const ComptimeStringMapWithKeyType = comptime_string_map.ComptimeStringMapWithKeyType; -pub const glob = @import("./glob.zig"); -pub const patch = @import("./patch.zig"); -pub const ini = @import("./ini.zig"); -pub const Bitflags = @import("./bitflags.zig").Bitflags; -pub const css = @import("./css/css_parser.zig"); -pub const validators = @import("./bun.js/node/util/validators.zig"); +pub const glob = @import("glob.zig"); +pub const patch = @import("patch.zig"); +pub const ini = @import("ini.zig"); +pub const Bitflags = @import("bitflags.zig").Bitflags; +pub const css = @import("css/css_parser.zig"); +pub const validators = @import("bun.js/node/util/validators.zig"); pub const shell = struct { - pub usingnamespace @import("./shell/shell.zig"); - pub const ShellSubprocess = @import("./shell/subproc.zig").ShellSubprocess; - // pub const ShellSubprocessMini = @import("./shell/subproc.zig").ShellSubprocessMini; + pub usingnamespace @import("shell/shell.zig"); + pub const ShellSubprocess = @import("shell/subproc.zig").ShellSubprocess; + // pub const ShellSubprocessMini = @import("shell/subproc.zig").ShellSubprocessMini; }; -pub const Output = @import("./output.zig"); -pub const Global = @import("./Global.zig"); +pub const Output = @import("output.zig"); +pub const Global = @import("Global.zig"); // make this non-pub after https://github.com/ziglang/zig/issues/18462 is resolved pub const FileDescriptorInt = if (Environment.isBrowser) @@ -269,7 +269,7 @@ pub const FileDescriptor = enum(FileDescriptorInt) { } }; -pub const FDImpl = @import("./fd.zig").FDImpl; +pub const FDImpl = @import("fd.zig").FDImpl; // When we are on a computer with an absurdly high number of max open file handles // such is often the case with macOS @@ -313,7 +313,7 @@ pub fn platformIOVecToSlice(iovec: PlatformIOVec) []u8 { return iovec.base[0..iovec.len]; } -pub const libarchive = @import("./libarchive/libarchive.zig"); +pub const libarchive = @import("libarchive/libarchive.zig"); pub const StringTypes = @import("string_types.zig"); pub const stringZ = StringTypes.stringZ; @@ -323,7 +323,7 @@ pub const PathString = StringTypes.PathString; pub const HashedString = StringTypes.HashedString; pub const strings = @import("string_immutable.zig"); pub const MutableString = @import("string_mutable.zig").MutableString; -pub const RefCount = @import("./ref_count.zig").RefCount; +pub const RefCount = @import("ref_count.zig").RefCount; pub const MAX_PATH_BYTES: usize = if (Environment.isWasm) 1024 else std.fs.max_path_bytes; pub const PathBuffer = [MAX_PATH_BYTES]u8; @@ -423,8 +423,8 @@ pub fn span(ptr: anytype) Span(@TypeOf(ptr)) { } } -pub const IdentityContext = @import("./identity_context.zig").IdentityContext; -pub const ArrayIdentityContext = @import("./identity_context.zig").ArrayIdentityContext; +pub const IdentityContext = @import("identity_context.zig").IdentityContext; +pub const ArrayIdentityContext = @import("identity_context.zig").ArrayIdentityContext; pub const StringHashMapUnowned = struct { pub const Key = struct { hash: u64, @@ -448,7 +448,7 @@ pub const StringHashMapUnowned = struct { } }; }; -pub const BabyList = @import("./baby_list.zig").BabyList; +pub const BabyList = @import("baby_list.zig").BabyList; pub const ByteList = BabyList(u8); pub const OffsetByteList = struct { head: u32 = 0, @@ -552,11 +552,11 @@ pub fn clone(item: anytype, allocator: std.mem.Allocator) !@TypeOf(item) { return try allocator.dupe(Child, item); } -pub const StringBuilder = @import("./string_builder.zig"); +pub const StringBuilder = @import("string_builder.zig"); -pub const LinearFifo = @import("./linear_fifo.zig").LinearFifo; +pub const LinearFifo = @import("linear_fifo.zig").LinearFifo; pub const linux = struct { - pub const memfd_allocator = @import("./allocators/linux_memfd_allocator.zig").LinuxMemFdAllocator; + pub const memfd_allocator = @import("allocators/linux_memfd_allocator.zig").LinuxMemFdAllocator; }; /// hash a string @@ -612,13 +612,13 @@ pub fn hash32(content: []const u8) u32 { return @as(u32, @truncate(res)); } -pub const HiveArray = @import("./hive_array.zig").HiveArray; +pub const HiveArray = @import("hive_array.zig").HiveArray; pub fn rand(bytes: []u8) void { _ = BoringSSL.RAND_bytes(bytes.ptr, bytes.len); } -pub const ObjectPool = @import("./pool.zig").ObjectPool; +pub const ObjectPool = @import("pool.zig").ObjectPool; pub fn assertNonBlocking(fd: anytype) void { assert((std.posix.fcntl(fd, std.posix.F.GETFL, 0) catch unreachable) & O.NONBLOCK != 0); @@ -721,14 +721,14 @@ pub fn StringEnum(comptime Type: type, comptime Map: anytype, value: []const u8) return ComptimeStringMap(Type, Map).get(value); } -pub const Bunfig = @import("./bunfig.zig").Bunfig; +pub const Bunfig = @import("bunfig.zig").Bunfig; -pub const HTTPThread = @import("./http.zig").HTTPThread; -pub const http = @import("./http.zig"); +pub const HTTPThread = @import("http.zig").HTTPThread; +pub const http = @import("http.zig"); -pub const Analytics = @import("./analytics/analytics_thread.zig"); +pub const Analytics = @import("analytics/analytics_thread.zig"); -pub usingnamespace @import("./tagged_pointer.zig"); +pub usingnamespace @import("tagged_pointer.zig"); pub fn onceUnsafe(comptime function: anytype, comptime ReturnType: type) ReturnType { const Result = struct { @@ -757,7 +757,7 @@ pub fn isHeapMemory(memory: anytype) bool { return false; } -pub const Mimalloc = @import("./allocators/mimalloc.zig"); +pub const Mimalloc = @import("allocators/mimalloc.zig"); pub const isSliceInBuffer = allocators.isSliceInBuffer; pub const isSliceInBufferT = allocators.isSliceInBufferT; @@ -787,21 +787,21 @@ pub fn rangeOfSliceInBuffer(slice: []const u8, buffer: []const u8) ?[2]u32 { /// on windows, this is encode(.{ .system, std.math.maxInt(u63) }) pub const invalid_fd: FileDescriptor = FDImpl.invalid.encode(); -pub const simdutf = @import("./bun.js/bindings/bun-simdutf.zig"); +pub const simdutf = @import("bun.js/bindings/bun-simdutf.zig"); pub const JSC = @import("root").JavaScriptCore; pub const AsyncIO = @import("async_io"); -pub const logger = @import("./logger.zig"); -pub const ThreadPool = @import("./thread_pool.zig"); +pub const logger = @import("logger.zig"); +pub const ThreadPool = @import("thread_pool.zig"); pub const default_thread_stack_size = ThreadPool.default_thread_stack_size; -pub const picohttp = @import("./deps/picohttp.zig"); -pub const uws = @import("./deps/uws.zig"); -pub const BoringSSL = @import("./boringssl.zig"); -pub const LOLHTML = @import("./deps/lol-html.zig"); -pub const clap = @import("./deps/zig-clap/clap.zig"); -pub const analytics = @import("./analytics/analytics_thread.zig"); -pub const zlib = @import("./zlib.zig"); +pub const picohttp = @import("deps/picohttp.zig"); +pub const uws = @import("deps/uws.zig"); +pub const BoringSSL = @import("boringssl.zig"); +pub const LOLHTML = @import("deps/lol-html.zig"); +pub const clap = @import("deps/zig-clap/clap.zig"); +pub const analytics = @import("analytics/analytics_thread.zig"); +pub const zlib = @import("zlib.zig"); pub var start_time: i128 = 0; @@ -887,7 +887,7 @@ pub fn openDirAbsoluteNotForDeletingOrRenaming(path_: []const u8) !std.fs.Dir { return fd.asDir(); } -pub const MimallocArena = @import("./allocators/mimalloc_arena.zig").Arena; +pub const MimallocArena = @import("allocators/mimalloc_arena.zig").Arena; pub fn getRuntimeFeatureFlag(comptime flag: [:0]const u8) bool { return struct { const state = enum(u8) { idk, disabled, enabled }; @@ -1162,7 +1162,7 @@ pub fn U32HashMap(comptime Type: type) type { return std.HashMap(u32, Type, U32HashMapContext, std.hash_map.default_max_load_percentage); } -const CopyFile = @import("./copy_file.zig"); +const CopyFile = @import("copy_file.zig"); pub const copyFileErrnoConvert = CopyFile.copyFileErrorConvert; pub const copyFileRange = CopyFile.copyFileRange; pub const canUseCopyFileRangeSyscall = CopyFile.canUseCopyFileRangeSyscall; @@ -1324,22 +1324,22 @@ pub fn isMissingIOUring() bool { }; } -pub const CLI = @import("./cli.zig"); +pub const CLI = @import("cli.zig"); -pub const install = @import("./install/install.zig"); +pub const install = @import("install/install.zig"); pub const PackageManager = install.PackageManager; -pub const RunCommand = @import("./cli/run_command.zig").RunCommand; +pub const RunCommand = @import("cli/run_command.zig").RunCommand; -pub const fs = @import("./fs.zig"); +pub const fs = @import("fs.zig"); pub const Transpiler = transpiler.Transpiler; -pub const transpiler = @import("./transpiler.zig"); -pub const which = @import("./which.zig").which; -pub const js_parser = @import("./js_parser.zig"); -pub const js_printer = @import("./js_printer.zig"); -pub const js_lexer = @import("./js_lexer.zig"); -pub const JSON = @import("./json_parser.zig"); -pub const JSAst = @import("./js_ast.zig"); -pub const bit_set = @import("./bit_set.zig"); +pub const transpiler = @import("transpiler.zig"); +pub const which = @import("which.zig").which; +pub const js_parser = @import("js_parser.zig"); +pub const js_printer = @import("js_printer.zig"); +pub const js_lexer = @import("js_lexer.zig"); +pub const JSON = @import("json_parser.zig"); +pub const JSAst = @import("js_ast.zig"); +pub const bit_set = @import("bit_set.zig"); pub fn enumMap(comptime T: type, comptime args: anytype) (fn (T) [:0]const u8) { const Map = struct { @@ -1376,9 +1376,9 @@ pub fn zero(comptime Type: type) Type { @memset(@as([*]u8, @ptrCast(&out))[0..out.len], 0); return @as(Type, @bitCast(out)); } -pub const c_ares = @import("./deps/c_ares.zig"); -pub const URL = @import("./url.zig").URL; -pub const FormData = @import("./url.zig").FormData; +pub const c_ares = @import("deps/c_ares.zig"); +pub const URL = @import("url.zig").URL; +pub const FormData = @import("url.zig").FormData; var needs_proc_self_workaround: bool = false; @@ -1596,22 +1596,22 @@ pub fn cstring(input: []const u8) [:0]const u8 { return @as([*:0]const u8, @ptrCast(input.ptr))[0..input.len :0]; } -pub const Semver = @import("./install/semver.zig"); -pub const ImportRecord = @import("./import_record.zig").ImportRecord; -pub const ImportKind = @import("./import_record.zig").ImportKind; +pub const Semver = @import("install/semver.zig"); +pub const ImportRecord = @import("import_record.zig").ImportRecord; +pub const ImportKind = @import("import_record.zig").ImportKind; -pub usingnamespace @import("./util.zig"); +pub usingnamespace @import("util.zig"); pub const fast_debug_build_cmd = .None; pub const fast_debug_build_mode = fast_debug_build_cmd != .None and Environment.isDebug; -pub const MultiArrayList = @import("./multi_array_list.zig").MultiArrayList; -pub const StringJoiner = @import("./StringJoiner.zig"); -pub const NullableAllocator = @import("./allocators/NullableAllocator.zig"); +pub const MultiArrayList = @import("multi_array_list.zig").MultiArrayList; +pub const StringJoiner = @import("StringJoiner.zig"); +pub const NullableAllocator = @import("allocators/NullableAllocator.zig"); -pub const renamer = @import("./renamer.zig"); +pub const renamer = @import("renamer.zig"); // TODO: Rename to SourceMap as this is a struct. -pub const sourcemap = @import("./sourcemap/sourcemap.zig"); +pub const sourcemap = @import("sourcemap/sourcemap.zig"); pub fn asByteSlice(buffer: anytype) []const u8 { return switch (@TypeOf(buffer)) { @@ -1625,8 +1625,8 @@ pub fn asByteSlice(buffer: anytype) []const u8 { comptime { if (fast_debug_build_cmd != .RunCommand and fast_debug_build_mode) { - _ = @import("./bun.js/node/buffer.zig").BufferVectorized.fill; - _ = @import("./cli/upgrade_command.zig").Version; + _ = @import("bun.js/node/buffer.zig").BufferVectorized.fill; + _ = @import("cli/upgrade_command.zig").Version; } } @@ -1848,7 +1848,7 @@ pub fn reloadProcess( } pub var auto_reload_on_crash = false; -pub const options = @import("./options.zig"); +pub const options = @import("options.zig"); pub const StringSet = struct { map: Map, @@ -1888,7 +1888,7 @@ pub const StringSet = struct { } }; -pub const Schema = @import("./api/schema.zig"); +pub const Schema = @import("api/schema.zig"); pub const StringMap = struct { map: Map, @@ -1958,14 +1958,14 @@ pub const StringMap = struct { } }; -pub const DotEnv = @import("./env_loader.zig"); -pub const bundle_v2 = @import("./bundler/bundle_v2.zig"); +pub const DotEnv = @import("env_loader.zig"); +pub const bundle_v2 = @import("bundler/bundle_v2.zig"); pub const BundleV2 = bundle_v2.BundleV2; pub const ParseTask = bundle_v2.ParseTask; pub const Lock = @compileError("Use bun.Mutex instead"); -pub const Mutex = @import("./Mutex.zig"); -pub const UnboundedQueue = @import("./bun.js/unbounded_queue.zig").UnboundedQueue; +pub const Mutex = @import("Mutex.zig"); +pub const UnboundedQueue = @import("bun.js/unbounded_queue.zig").UnboundedQueue; pub fn threadlocalAllocator() std.mem.Allocator { if (comptime use_mimalloc) { @@ -2045,9 +2045,9 @@ pub fn HiveRef(comptime T: type, comptime capacity: u16) type { }; } -pub const MaxHeapAllocator = @import("./allocators/max_heap_allocator.zig").MaxHeapAllocator; +pub const MaxHeapAllocator = @import("allocators/max_heap_allocator.zig").MaxHeapAllocator; -pub const tracy = @import("./tracy.zig"); +pub const tracy = @import("tracy.zig"); pub const trace = tracy.trace; pub fn openFileForPath(file_path: [:0]const u8) !std.fs.File { @@ -2078,21 +2078,21 @@ pub fn openDirForPath(file_path: [:0]const u8) !std.fs.Dir { pub const Generation = u16; -pub const zstd = @import("./deps/zstd.zig"); +pub const zstd = @import("deps/zstd.zig"); pub const StringPointer = Schema.Api.StringPointer; -pub const StandaloneModuleGraph = @import("./StandaloneModuleGraph.zig").StandaloneModuleGraph; +pub const StandaloneModuleGraph = @import("StandaloneModuleGraph.zig").StandaloneModuleGraph; -pub const String = @import("./string.zig").String; -pub const SliceWithUnderlyingString = @import("./string.zig").SliceWithUnderlyingString; +pub const String = @import("string.zig").String; +pub const SliceWithUnderlyingString = @import("string.zig").SliceWithUnderlyingString; pub const WTF = struct { /// The String type from WebKit's WTF library. - pub const StringImpl = @import("./string.zig").WTFStringImpl; + pub const StringImpl = @import("string.zig").WTFStringImpl; }; -pub const Wyhash11 = @import("./wyhash.zig").Wyhash11; +pub const Wyhash11 = @import("wyhash.zig").Wyhash11; -pub const RegularExpression = @import("./bun.js/bindings/RegularExpression.zig").RegularExpression; +pub const RegularExpression = @import("bun.js/bindings/RegularExpression.zig").RegularExpression; pub inline fn assertComptime() void { var x = 0; // if you hit an error on this line, you are not in a comptime context @@ -2333,7 +2333,7 @@ pub const posix = struct { }; } - pub const spawn = @import("./bun.js/api/bun/spawn.zig").PosixSpawn; + pub const spawn = @import("bun.js/api/bun/spawn.zig").PosixSpawn; }; pub const win32 = struct { @@ -2381,7 +2381,7 @@ pub const win32 = struct { }; } - pub const spawn = @import("./bun.js/api/bun/spawn.zig").PosixSpawn; + pub const spawn = @import("bun.js/api/bun/spawn.zig").PosixSpawn; pub fn isWatcherChild() bool { var buf: [1]u16 = undefined; @@ -2557,12 +2557,12 @@ pub fn isRegularFile(mode: anytype) bool { return S.ISREG(@intCast(mode)); } -pub const sys = @import("./sys.zig"); +pub const sys = @import("sys.zig"); pub const O = sys.O; pub const Mode = C.Mode; -pub const windows = @import("./windows.zig"); +pub const windows = @import("windows.zig"); pub const FDTag = enum { none, @@ -3035,7 +3035,7 @@ pub fn create(allocator: std.mem.Allocator, comptime T: type, t: T) *T { return ptr; } -pub const heap_breakdown = @import("./heap_breakdown.zig"); +pub const heap_breakdown = @import("heap_breakdown.zig"); /// Globally-allocate a value on the heap. /// @@ -3251,9 +3251,9 @@ pub fn deleteAllPoolsForThreadExit() void { } } -pub const Tmpfile = @import("./tmp.zig").Tmpfile; +pub const Tmpfile = @import("tmp.zig").Tmpfile; -pub const io = @import("./io/io.zig"); +pub const io = @import("io/io.zig"); const errno_map = errno_map: { var max_value = 0; @@ -3295,7 +3295,7 @@ pub fn errnoToZigErr(err: anytype) anyerror { pub const S = if (Environment.isWindows) C.S else std.posix.S; -pub const brotli = @import("./brotli.zig"); +pub const brotli = @import("brotli.zig"); pub fn iterateDir(dir: std.fs.Dir) DirIterator.Iterator { return DirIterator.iterate(dir, .u8).iter; @@ -3482,7 +3482,7 @@ pub fn SliceIterator(comptime T: type) type { }; } -pub const Futex = @import("./futex.zig"); +pub const Futex = @import("futex.zig"); // TODO: migrate pub const ArenaAllocator = std.heap.ArenaAllocator; @@ -3568,7 +3568,7 @@ pub fn unsafeAssert(condition: bool) callconv(callconv_inline) void { if (!condition) unreachable; } -pub const dns = @import("./dns.zig"); +pub const dns = @import("dns.zig"); pub fn getRoughTickCount() timespec { if (comptime Environment.isMac) { @@ -3756,7 +3756,7 @@ pub const timespec = extern struct { } }; -pub const UUID = @import("./bun.js/uuid.zig"); +pub const UUID = @import("bun.js/uuid.zig"); /// An abstract number of element in a sequence. The sequence has a first element. /// This type should be used instead of integer because 2 contradicting traditions can @@ -3824,8 +3824,8 @@ pub fn memmove(output: []u8, input: []const u8) void { } } -pub const hmac = @import("./hmac.zig"); -pub const libdeflate = @import("./deps/libdeflate.zig"); +pub const hmac = @import("hmac.zig"); +pub const libdeflate = @import("deps/libdeflate.zig"); pub const bake = @import("bake/bake.zig"); @@ -4223,4 +4223,4 @@ pub const WPathBufferPool = if (Environment.isWindows) PathBufferPoolT(bun.WPath }; pub const OSPathBufferPool = if (Environment.isWindows) WPathBufferPool else PathBufferPool; -pub const S3 = @import("./s3/client.zig"); +pub const S3 = @import("s3/client.zig"); diff --git a/src/bun_js.zig b/src/bun_js.zig index 3c25404f899c4e..44cf20c1befe07 100644 --- a/src/bun_js.zig +++ b/src/bun_js.zig @@ -19,17 +19,17 @@ const js_printer = bun.js_printer; const js_ast = bun.JSAst; const linker = @import("linker.zig"); -const sync = @import("./sync.zig"); +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 resolve_path = @import("resolver/resolve_path.zig"); +const configureTransformOptionsForBun = @import("bun.js/config.zig").configureTransformOptionsForBun; const Command = @import("cli.zig").Command; const transpiler = bun.transpiler; const DotEnv = @import("env_loader.zig"); const which = @import("which.zig").which; const JSC = bun.JSC; const AsyncHTTP = bun.http.AsyncHTTP; -const Arena = @import("./allocators/mimalloc_arena.zig").Arena; +const Arena = @import("allocators/mimalloc_arena.zig").Arena; const DNSResolver = @import("bun.js/api/bun/dns_resolver.zig").DNSResolver; const OpaqueWrap = JSC.OpaqueWrap; @@ -160,7 +160,7 @@ pub const Run = struct { var bundle = try bun.Transpiler.init( ctx.allocator, ctx.log, - try @import("./bun.js/config.zig").configureTransformOptionsForBunVM(ctx.allocator, ctx.args), + try @import("bun.js/config.zig").configureTransformOptionsForBunVM(ctx.allocator, ctx.args), null, ); try bundle.runEnvLoader(false); diff --git a/src/bundler/bundle_v2.zig b/src/bundler/bundle_v2.zig index 55ce5fe86e1c21..90a74b8364e85e 100644 --- a/src/bundler/bundle_v2.zig +++ b/src/bundler/bundle_v2.zig @@ -101,7 +101,7 @@ const URL = @import("../url.zig").URL; const Linker = linker.Linker; const Resolver = _resolver.Resolver; const TOML = @import("../toml/toml_parser.zig").TOML; -const EntryPoints = @import("./entry_points.zig"); +const EntryPoints = @import("entry_points.zig"); const Dependency = js_ast.Dependency; const JSAst = js_ast.BundledAst; const Loader = options.Loader; diff --git a/src/bunfig.zig b/src/bunfig.zig index 8ca56ec0ee8c7f..4e44b1eb0d0e72 100644 --- a/src/bunfig.zig +++ b/src/bunfig.zig @@ -8,27 +8,27 @@ const strings = bun.strings; const MutableString = bun.MutableString; const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; -const URL = @import("./url.zig").URL; +const URL = @import("url.zig").URL; const C = bun.C; -const options = @import("./options.zig"); +const options = @import("options.zig"); const logger = bun.logger; const js_ast = bun.JSAst; const js_lexer = bun.js_lexer; -const Defines = @import("./defines.zig"); -const ConditionsMap = @import("./resolver/package_json.zig").ESModule.ConditionsMap; -const Api = @import("./api/schema.zig").Api; -const Npm = @import("./install/npm.zig"); -const PackageManager = @import("./install/install.zig").PackageManager; -const PackageJSON = @import("./resolver/package_json.zig").PackageJSON; -const resolver = @import("./resolver/resolver.zig"); -const TestCommand = @import("./cli/test_command.zig").TestCommand; +const Defines = @import("defines.zig"); +const ConditionsMap = @import("resolver/package_json.zig").ESModule.ConditionsMap; +const Api = @import("api/schema.zig").Api; +const Npm = @import("install/npm.zig"); +const PackageManager = @import("install/install.zig").PackageManager; +const PackageJSON = @import("resolver/package_json.zig").PackageJSON; +const resolver = @import("resolver/resolver.zig"); +const TestCommand = @import("cli/test_command.zig").TestCommand; pub const MacroImportReplacementMap = bun.StringArrayHashMap(string); pub const MacroMap = bun.StringArrayHashMapUnmanaged(MacroImportReplacementMap); pub const BundlePackageOverride = bun.StringArrayHashMapUnmanaged(options.BundleOverride); const LoaderMap = bun.StringArrayHashMapUnmanaged(options.Loader); const JSONParser = bun.JSON; const Command = @import("cli.zig").Command; -const TOML = @import("./toml/toml_parser.zig").TOML; +const TOML = @import("toml/toml_parser.zig").TOML; // TODO: replace Api.TransformOptions with Bunfig pub const Bunfig = struct { diff --git a/src/c.zig b/src/c.zig index 1541b9872eaf0e..7bdda0e64116dd 100644 --- a/src/c.zig +++ b/src/c.zig @@ -1,13 +1,13 @@ const std = @import("std"); const bun = @import("root").bun; -const Environment = @import("./env.zig"); +const Environment = @import("env.zig"); pub const translated = @import("translated-c-headers"); const PlatformSpecific = switch (Environment.os) { - .mac => @import("./darwin_c.zig"), - .linux => @import("./linux_c.zig"), - .windows => @import("./windows_c.zig"), + .mac => @import("darwin_c.zig"), + .linux => @import("linux_c.zig"), + .windows => @import("windows_c.zig"), else => struct {}, }; pub usingnamespace PlatformSpecific; @@ -25,8 +25,8 @@ const mode_t = bun.Mode; const libc_stat = bun.Stat; const zeroes = mem.zeroes; -pub const darwin = @import("./darwin_c.zig"); -pub const linux = @import("./linux_c.zig"); +pub const darwin = @import("darwin_c.zig"); +pub const linux = @import("linux_c.zig"); pub extern "c" fn chmod([*c]const u8, mode_t) c_int; pub extern "c" fn fchmod(std.c.fd_t, mode_t) c_int; pub extern "c" fn fchmodat(c_int, [*c]const u8, mode_t, c_int) c_int; diff --git a/src/cache.zig b/src/cache.zig index 96ecf3484c45de..1c3fbb602365d5 100644 --- a/src/cache.zig +++ b/src/cache.zig @@ -15,13 +15,13 @@ const js_ast = bun.JSAst; const logger = bun.logger; const js_parser = bun.js_parser; const json_parser = bun.JSON; -const options = @import("./options.zig"); -const Define = @import("./defines.zig").Define; +const options = @import("options.zig"); +const Define = @import("defines.zig").Define; const std = @import("std"); -const fs = @import("./fs.zig"); +const fs = @import("fs.zig"); const sync = @import("sync.zig"); -const import_record = @import("./import_record.zig"); +const import_record = @import("import_record.zig"); const ImportRecord = import_record.ImportRecord; diff --git a/src/cli.zig b/src/cli.zig index 49bbc294841d19..53232e58b0b057 100644 --- a/src/cli.zig +++ b/src/cli.zig @@ -25,26 +25,26 @@ const File = bun.sys.File; const debug = Output.scoped(.CLI, true); -const sync = @import("./sync.zig"); +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 resolve_path = @import("resolver/resolve_path.zig"); +const configureTransformOptionsForBun = @import("bun.js/config.zig").configureTransformOptionsForBun; const clap = bun.clap; -const BunJS = @import("./bun_js.zig"); -const Install = @import("./install/install.zig"); +const BunJS = @import("bun_js.zig"); +const Install = @import("install/install.zig"); const transpiler = bun.transpiler; -const DotEnv = @import("./env_loader.zig"); -const RunCommand_ = @import("./cli/run_command.zig").RunCommand; -const CreateCommand_ = @import("./cli/create_command.zig").CreateCommand; -const FilterRun = @import("./cli/filter_run.zig"); +const DotEnv = @import("env_loader.zig"); +const RunCommand_ = @import("cli/run_command.zig").RunCommand; +const CreateCommand_ = @import("cli/create_command.zig").CreateCommand; +const FilterRun = @import("cli/filter_run.zig"); const fs = @import("fs.zig"); -const Router = @import("./router.zig"); +const Router = @import("router.zig"); -const MacroMap = @import("./resolver/package_json.zig").MacroMap; -const TestCommand = @import("./cli/test_command.zig").TestCommand; +const MacroMap = @import("resolver/package_json.zig").MacroMap; +const TestCommand = @import("cli/test_command.zig").TestCommand; pub var start_time: i128 = undefined; -const Bunfig = @import("./bunfig.zig").Bunfig; +const Bunfig = @import("bunfig.zig").Bunfig; const OOM = bun.OOM; export var Bun__Node__ProcessNoDeprecation = false; @@ -53,7 +53,7 @@ export var Bun__Node__ProcessThrowDeprecation = false; pub var Bun__Node__ProcessTitle: ?string = null; pub const Cli = struct { - pub const CompileTarget = @import("./compile_target.zig"); + pub const CompileTarget = @import("compile_target.zig"); var wait_group: sync.WaitGroup = undefined; pub var log_: logger.Log = undefined; pub fn startTransform(_: std.mem.Allocator, _: Api.TransformOptions, _: *logger.Log) anyerror!void {} @@ -104,7 +104,7 @@ pub const debug_flags = if (Environment.isDebug) struct { } else @compileError("Do not access this namespace in a release build"); const LoaderMatcher = strings.ExactSizeMatcher(4); -const ColonListType = @import("./cli/colon_list_type.zig").ColonListType; +const ColonListType = @import("cli/colon_list_type.zig").ColonListType; pub const LoaderColonList = ColonListType(Api.Loader, Arguments.loader_resolver); pub const DefineColonList = ColonListType(string, Arguments.noop_resolver); fn invalidTarget(diag: *clap.Diagnostic, _target: []const u8) noreturn { @@ -115,30 +115,30 @@ fn invalidTarget(diag: *clap.Diagnostic, _target: []const u8) noreturn { std.process.exit(1); } -pub const BuildCommand = @import("./cli/build_command.zig").BuildCommand; -pub const AddCommand = @import("./cli/add_command.zig").AddCommand; -pub const CreateCommand = @import("./cli/create_command.zig").CreateCommand; -pub const CreateCommandExample = @import("./cli/create_command.zig").Example; -pub const CreateListExamplesCommand = @import("./cli/create_command.zig").CreateListExamplesCommand; -pub const DiscordCommand = @import("./cli/discord_command.zig").DiscordCommand; -pub const InstallCommand = @import("./cli/install_command.zig").InstallCommand; -pub const LinkCommand = @import("./cli/link_command.zig").LinkCommand; -pub const UnlinkCommand = @import("./cli/unlink_command.zig").UnlinkCommand; -pub const InstallCompletionsCommand = @import("./cli/install_completions_command.zig").InstallCompletionsCommand; -pub const PackageManagerCommand = @import("./cli/package_manager_command.zig").PackageManagerCommand; -pub const RemoveCommand = @import("./cli/remove_command.zig").RemoveCommand; -pub const RunCommand = @import("./cli/run_command.zig").RunCommand; -pub const ShellCompletions = @import("./cli/shell_completions.zig"); -pub const UpdateCommand = @import("./cli/update_command.zig").UpdateCommand; -pub const UpgradeCommand = @import("./cli/upgrade_command.zig").UpgradeCommand; -pub const BunxCommand = @import("./cli/bunx_command.zig").BunxCommand; -pub const ExecCommand = @import("./cli/exec_command.zig").ExecCommand; -pub const PatchCommand = @import("./cli/patch_command.zig").PatchCommand; -pub const PatchCommitCommand = @import("./cli/patch_commit_command.zig").PatchCommitCommand; -pub const OutdatedCommand = @import("./cli/outdated_command.zig").OutdatedCommand; -pub const PublishCommand = @import("./cli/publish_command.zig").PublishCommand; -pub const PackCommand = @import("./cli/pack_command.zig").PackCommand; -pub const InitCommand = @import("./cli/init_command.zig").InitCommand; +pub const BuildCommand = @import("cli/build_command.zig").BuildCommand; +pub const AddCommand = @import("cli/add_command.zig").AddCommand; +pub const CreateCommand = @import("cli/create_command.zig").CreateCommand; +pub const CreateCommandExample = @import("cli/create_command.zig").Example; +pub const CreateListExamplesCommand = @import("cli/create_command.zig").CreateListExamplesCommand; +pub const DiscordCommand = @import("cli/discord_command.zig").DiscordCommand; +pub const InstallCommand = @import("cli/install_command.zig").InstallCommand; +pub const LinkCommand = @import("cli/link_command.zig").LinkCommand; +pub const UnlinkCommand = @import("cli/unlink_command.zig").UnlinkCommand; +pub const InstallCompletionsCommand = @import("cli/install_completions_command.zig").InstallCompletionsCommand; +pub const PackageManagerCommand = @import("cli/package_manager_command.zig").PackageManagerCommand; +pub const RemoveCommand = @import("cli/remove_command.zig").RemoveCommand; +pub const RunCommand = @import("cli/run_command.zig").RunCommand; +pub const ShellCompletions = @import("cli/shell_completions.zig"); +pub const UpdateCommand = @import("cli/update_command.zig").UpdateCommand; +pub const UpgradeCommand = @import("cli/upgrade_command.zig").UpgradeCommand; +pub const BunxCommand = @import("cli/bunx_command.zig").BunxCommand; +pub const ExecCommand = @import("cli/exec_command.zig").ExecCommand; +pub const PatchCommand = @import("cli/patch_command.zig").PatchCommand; +pub const PatchCommitCommand = @import("cli/patch_commit_command.zig").PatchCommitCommand; +pub const OutdatedCommand = @import("cli/outdated_command.zig").OutdatedCommand; +pub const PublishCommand = @import("cli/publish_command.zig").PublishCommand; +pub const PackCommand = @import("cli/pack_command.zig").PackCommand; +pub const InitCommand = @import("cli/init_command.zig").InitCommand; pub const Arguments = struct { pub fn loader_resolver(in: string) !Api.Loader { @@ -1421,7 +1421,7 @@ pub const ReservedCommand = struct { } }; -const AddCompletions = @import("./cli/add_completions.zig"); +const AddCompletions = @import("cli/add_completions.zig"); /// This is set `true` during `Command.which()` if argv0 is "node", in which the CLI is going /// to pretend to be node.js by always choosing RunCommand with a relative filepath. @@ -1656,7 +1656,7 @@ pub const Command = struct { } if (isNode(argv0)) { - @import("./deps/zig-clap/clap/streaming.zig").warn_on_unrecognized_flag = false; + @import("deps/zig-clap/clap/streaming.zig").warn_on_unrecognized_flag = false; pretend_to_be_node = true; return .RunAsNodeCommand; } @@ -1790,7 +1790,7 @@ pub const Command = struct { ctx.passthrough = &[_]string{}; } - try @import("./bun_js.zig").Run.bootStandalone( + try @import("bun_js.zig").Run.bootStandalone( ctx, graph.entryPoint().name, graph, diff --git a/src/cli/bunx_command.zig b/src/cli/bunx_command.zig index f5b19bfc5bb3b5..53a16485d5de8f 100644 --- a/src/cli/bunx_command.zig +++ b/src/cli/bunx_command.zig @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const cli = @import("../cli.zig"); const Command = cli.Command; -const Run = @import("./run_command.zig").RunCommand; +const Run = @import("run_command.zig").RunCommand; const Allocator = std.mem.Allocator; const debug = Output.scoped(.bunx, false); diff --git a/src/cli/init_command.zig b/src/cli/init_command.zig index 01d4d3112acd2e..78f5d1fd0c0aa9 100644 --- a/src/cli/init_command.zig +++ b/src/cli/init_command.zig @@ -17,7 +17,7 @@ const js_parser = bun.js_parser; const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const options = @import("../options.zig"); -const initializeStore = @import("./create_command.zig").initializeStore; +const initializeStore = @import("create_command.zig").initializeStore; const lex = bun.js_lexer; const logger = bun.logger; const JSPrinter = bun.js_printer; diff --git a/src/cli/install_completions_command.zig b/src/cli/install_completions_command.zig index ed9e5d02ace5cf..0ac7e5d1cdf20c 100644 --- a/src/cli/install_completions_command.zig +++ b/src/cli/install_completions_command.zig @@ -38,7 +38,7 @@ const clap = bun.clap; const Lock = bun.Mutex; const Headers = bun.http.Headers; const CopyFile = @import("../copy_file.zig"); -const ShellCompletions = @import("./shell_completions.zig"); +const ShellCompletions = @import("shell_completions.zig"); pub const InstallCompletionsCommand = struct { pub fn testPath(_: string) !std.fs.Dir {} diff --git a/src/cli/package_manager_command.zig b/src/cli/package_manager_command.zig index 9151b94d6f6fd2..44d14012b82578 100644 --- a/src/cli/package_manager_command.zig +++ b/src/cli/package_manager_command.zig @@ -20,11 +20,11 @@ const Path = @import("../resolver/resolve_path.zig"); const String = @import("../install/semver.zig").String; const ArrayIdentityContext = bun.ArrayIdentityContext; const DepIdSet = std.ArrayHashMapUnmanaged(DependencyID, void, ArrayIdentityContext, false); -const UntrustedCommand = @import("./pm_trusted_command.zig").UntrustedCommand; -const TrustCommand = @import("./pm_trusted_command.zig").TrustCommand; -const DefaultTrustedCommand = @import("./pm_trusted_command.zig").DefaultTrustedCommand; +const UntrustedCommand = @import("pm_trusted_command.zig").UntrustedCommand; +const TrustCommand = @import("pm_trusted_command.zig").TrustCommand; +const DefaultTrustedCommand = @import("pm_trusted_command.zig").DefaultTrustedCommand; const Environment = bun.Environment; -pub const PackCommand = @import("./pack_command.zig").PackCommand; +pub const PackCommand = @import("pack_command.zig").PackCommand; const Npm = Install.Npm; const File = bun.sys.File; diff --git a/src/cli/pm_trusted_command.zig b/src/cli/pm_trusted_command.zig index 1341a9aa4703fe..da7d1c44900354 100644 --- a/src/cli/pm_trusted_command.zig +++ b/src/cli/pm_trusted_command.zig @@ -9,7 +9,7 @@ const LifecycleScriptSubprocess = Install.LifecycleScriptSubprocess; const PackageID = Install.PackageID; const String = @import("../install/semver.zig").String; const PackageManager = Install.PackageManager; -const PackageManagerCommand = @import("./package_manager_command.zig").PackageManagerCommand; +const PackageManagerCommand = @import("package_manager_command.zig").PackageManagerCommand; const Lockfile = Install.Lockfile; const Fs = @import("../fs.zig"); const Global = bun.Global; diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig index 4ae3c93ed1c564..3192c0753252d2 100644 --- a/src/cli/run_command.zig +++ b/src/cli/run_command.zig @@ -46,9 +46,9 @@ const NpmArgs = struct { pub const package_version: string = "npm_package_version"; }; const PackageJSON = @import("../resolver/package_json.zig").PackageJSON; -const yarn_commands = @import("./list-of-yarn-commands.zig").all_yarn_commands; +const yarn_commands = @import("list-of-yarn-commands.zig").all_yarn_commands; -const ShellCompletions = @import("./shell_completions.zig"); +const ShellCompletions = @import("shell_completions.zig"); const PosixSpawn = bun.posix.spawn; const PackageManager = @import("../install/install.zig").PackageManager; diff --git a/src/comptime_string_map.zig b/src/comptime_string_map.zig index f5cecafc37eed0..a14246fa1d2973 100644 --- a/src/comptime_string_map.zig +++ b/src/comptime_string_map.zig @@ -2,7 +2,7 @@ const JSC = bun.JSC; const std = @import("std"); const bun = @import("root").bun; const mem = std.mem; -const strings = @import("./string_immutable.zig"); +const strings = @import("string_immutable.zig"); /// Comptime string map optimized for small sets of disparate string keys. /// Works by separating the keys by length at comptime and only checking strings of diff --git a/src/crash_handler.zig b/src/crash_handler.zig index b8d4e5a4e4032b..2b01585152ec37 100644 --- a/src/crash_handler.zig +++ b/src/crash_handler.zig @@ -21,7 +21,7 @@ const std = @import("std"); const bun = @import("root").bun; const builtin = @import("builtin"); const mimalloc = @import("allocators/mimalloc.zig"); -const SourceMap = @import("./sourcemap/sourcemap.zig"); +const SourceMap = @import("sourcemap/sourcemap.zig"); const windows = std.os.windows; const Output = bun.Output; const Global = bun.Global; @@ -71,7 +71,7 @@ var before_crash_handlers: std.ArrayListUnmanaged(struct { *anyopaque, *const On // TODO: I don't think it's safe to lock/unlock a mutex inside a signal handler. var before_crash_handlers_mutex: bun.Mutex = .{}; -const CPUFeatures = @import("./bun.js/bindings/CPUFeatures.zig").CPUFeatures; +const CPUFeatures = @import("bun.js/bindings/CPUFeatures.zig").CPUFeatures; /// This structure and formatter must be kept in sync with `bun.report`'s decoder implementation. pub const CrashReason = union(enum) { diff --git a/src/css/build-prefixes.js b/src/css/build-prefixes.js index bb36e786692b95..87f77ef98033d9 100644 --- a/src/css/build-prefixes.js +++ b/src/css/build-prefixes.js @@ -584,7 +584,7 @@ exports.Features = { let s = `// This file is autogenerated by build-prefixes.js. DO NOT EDIT! -const css = @import("./css_parser.zig"); +const css = @import("css_parser.zig"); const VendorPrefix = css.VendorPrefix; const Browsers = css.targets.Browsers; @@ -668,7 +668,7 @@ await Bun.$`zig fmt src/css/prefixes.zig`; let c = `// This file is autogenerated by build-prefixes.js. DO NOT EDIT! -const Browsers = @import("./targets.zig").Browsers; +const Browsers = @import("targets.zig").Browsers; pub const Feature = enum { ${[...compat.keys()].flat().map(enumify).sort().join(",\n ")}, diff --git a/src/css/compat.zig b/src/css/compat.zig index 7d94f023d8c464..6372d79ddbec5a 100644 --- a/src/css/compat.zig +++ b/src/css/compat.zig @@ -1,6 +1,6 @@ // This file is autogenerated by build-prefixes.js. DO NOT EDIT! -const Browsers = @import("./targets.zig").Browsers; +const Browsers = @import("targets.zig").Browsers; pub const Feature = enum { abs_function, diff --git a/src/css/context.zig b/src/css/context.zig index 09c9e59373c206..9d7f61600ea2ab 100644 --- a/src/css/context.zig +++ b/src/css/context.zig @@ -4,7 +4,7 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); +pub const css = @import("css_parser.zig"); const ArrayList = std.ArrayListUnmanaged; diff --git a/src/css/css_modules.zig b/src/css/css_modules.zig index e476b03b4c2bd1..b69631109ad81e 100644 --- a/src/css/css_modules.zig +++ b/src/css/css_modules.zig @@ -4,8 +4,8 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); -pub const css_values = @import("./values/values.zig"); +pub const css = @import("css_parser.zig"); +pub const css_values = @import("values/values.zig"); const DashedIdent = css_values.ident.DashedIdent; const Ident = css_values.ident.Ident; pub const Error = css.Error; diff --git a/src/css/css_parser.zig b/src/css/css_parser.zig index 306b4d4dcd41cc..bc293d0ecae542 100644 --- a/src/css/css_parser.zig +++ b/src/css/css_parser.zig @@ -9,18 +9,18 @@ const ArrayList = std.ArrayListUnmanaged; const ImportRecord = bun.ImportRecord; const ImportKind = bun.ImportKind; -pub const prefixes = @import("./prefixes.zig"); +pub const prefixes = @import("prefixes.zig"); -pub const dependencies = @import("./dependencies.zig"); +pub const dependencies = @import("dependencies.zig"); pub const Dependency = dependencies.Dependency; -pub const css_modules = @import("./css_modules.zig"); +pub const css_modules = @import("css_modules.zig"); pub const CssModuleExports = css_modules.CssModuleExports; pub const CssModule = css_modules.CssModule; pub const CssModuleReferences = css_modules.CssModuleReferences; pub const CssModuleReference = css_modules.CssModuleReference; -pub const css_rules = @import("./rules/rules.zig"); +pub const css_rules = @import("rules/rules.zig"); pub const CssRule = css_rules.CssRule; pub const CssRuleList = css_rules.CssRuleList; pub const LayerName = css_rules.layer.LayerName; @@ -36,11 +36,11 @@ pub const TailwindAtRule = css_rules.tailwind.TailwindAtRule; pub const MinifyContext = css_rules.MinifyContext; -pub const media_query = @import("./media_query.zig"); +pub const media_query = @import("media_query.zig"); pub const MediaList = media_query.MediaList; pub const MediaFeatureType = media_query.MediaFeatureType; -pub const css_values = @import("./values/values.zig"); +pub const css_values = @import("values/values.zig"); pub const DashedIdent = css_values.ident.DashedIdent; pub const DashedIdentFns = css_values.ident.DashedIdentFns; pub const CssColor = css_values.color.CssColor; @@ -57,44 +57,44 @@ pub const CustomIdent = css_values.ident.CustomIdent; pub const CustomIdentFns = css_values.ident.CustomIdentFns; pub const Url = css_values.url.Url; -pub const declaration = @import("./declaration.zig"); +pub const declaration = @import("declaration.zig"); -pub const css_properties = @import("./properties/properties.zig"); +pub const css_properties = @import("properties/properties.zig"); pub const Property = css_properties.Property; pub const PropertyId = css_properties.PropertyId; pub const PropertyIdTag = css_properties.PropertyIdTag; pub const TokenList = css_properties.custom.TokenList; pub const TokenListFns = css_properties.custom.TokenListFns; -const css_decls = @import("./declaration.zig"); +const css_decls = @import("declaration.zig"); pub const DeclarationList = css_decls.DeclarationList; pub const DeclarationBlock = css_decls.DeclarationBlock; -pub const selector = @import("./selectors/selector.zig"); +pub const selector = @import("selectors/selector.zig"); pub const SelectorList = selector.parser.SelectorList; pub const Selector = selector.parser.Selector; pub const Component = selector.parser.Component; pub const PseudoClass = selector.parser.PseudoClass; pub const PseudoElement = selector.parser.PseudoElement; -pub const logical = @import("./logical.zig"); +pub const logical = @import("logical.zig"); pub const PropertyCategory = logical.PropertyCategory; pub const LogicalGroup = logical.LogicalGroup; -pub const css_printer = @import("./printer.zig"); +pub const css_printer = @import("printer.zig"); pub const Printer = css_printer.Printer; pub const PrinterOptions = css_printer.PrinterOptions; -pub const targets = @import("./targets.zig"); +pub const targets = @import("targets.zig"); pub const Targets = css_printer.Targets; // pub const Features = css_printer.Features; -const context = @import("./context.zig"); +const context = @import("context.zig"); pub const PropertyHandlerContext = context.PropertyHandlerContext; pub const DeclarationHandler = declaration.DeclarationHandler; pub const Maybe = bun.JSC.Node.Maybe; // TODO: Remove existing Error defined here and replace it with these -const errors_ = @import("./error.zig"); +const errors_ = @import("error.zig"); pub const Err = errors_.Err; pub const PrinterErrorKind = errors_.PrinterErrorKind; pub const PrinterError = errors_.PrinterError; @@ -108,12 +108,12 @@ pub const MinifyErrorKind = errors_.MinifyErrorKind; pub const MinifyError = errors_.MinifyError; pub const MinifyErr = errors_.MinifyErr; -pub const generic = @import("./generics.zig"); +pub const generic = @import("generics.zig"); pub const HASH_SEED = generic.HASH_SEED; pub const ImportConditions = css_rules.import.ImportConditions; -pub const compat = @import("./compat.zig"); +pub const compat = @import("compat.zig"); pub const Features = targets.Features; pub const Feature = compat.Feature; @@ -131,7 +131,7 @@ pub fn OOM(e: anyerror) noreturn { bun.outOfMemory(); } -pub const SmallList = @import("./small_list.zig").SmallList; +pub const SmallList = @import("small_list.zig").SmallList; pub const Bitflags = bun.Bitflags; pub const todo_stuff = struct { diff --git a/src/css/declaration.zig b/src/css/declaration.zig index a7ec7e1182eb67..df6d1f12061170 100644 --- a/src/css/declaration.zig +++ b/src/css/declaration.zig @@ -4,7 +4,7 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); +pub const css = @import("css_parser.zig"); pub const Error = css.Error; const Printer = css.Printer; const PrintErr = css.PrintErr; diff --git a/src/css/dependencies.zig b/src/css/dependencies.zig index 453f9cefb3e962..f8fd7fa637b0cf 100644 --- a/src/css/dependencies.zig +++ b/src/css/dependencies.zig @@ -4,8 +4,8 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); -pub const css_values = @import("./values/values.zig"); +pub const css = @import("css_parser.zig"); +pub const css_values = @import("values/values.zig"); const DashedIdent = css_values.ident.DashedIdent; const Url = css_values.url.Url; const Ident = css_values.ident.Ident; diff --git a/src/css/error.zig b/src/css/error.zig index b70281f28e82cc..e0755cbc0325de 100644 --- a/src/css/error.zig +++ b/src/css/error.zig @@ -4,8 +4,8 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); -pub const css_values = @import("./values/values.zig"); +pub const css = @import("css_parser.zig"); +pub const css_values = @import("values/values.zig"); const DashedIdent = css_values.ident.DashedIdent; const Ident = css_values.ident.Ident; pub const Error = css.Error; diff --git a/src/css/generics.zig b/src/css/generics.zig index 7dc3a088787a17..ac49f07afe0142 100644 --- a/src/css/generics.zig +++ b/src/css/generics.zig @@ -6,7 +6,7 @@ const Log = logger.Log; const ArrayList = std.ArrayListUnmanaged; -const css = @import("./css_parser.zig"); +const css = @import("css_parser.zig"); const css_values = css.css_values; const Parser = css.Parser; diff --git a/src/css/logical.zig b/src/css/logical.zig index adcbf8a346cc2c..5e2757dab0e4ac 100644 --- a/src/css/logical.zig +++ b/src/css/logical.zig @@ -4,7 +4,7 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); +pub const css = @import("css_parser.zig"); pub const Error = css.Error; const ArrayList = std.ArrayListUnmanaged; diff --git a/src/css/media_query.zig b/src/css/media_query.zig index 1f56da703ec1e8..57e95c86f1c562 100644 --- a/src/css/media_query.zig +++ b/src/css/media_query.zig @@ -4,7 +4,7 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); +pub const css = @import("css_parser.zig"); pub const Error = css.Error; const ArrayList = std.ArrayListUnmanaged; diff --git a/src/css/prefixes.zig b/src/css/prefixes.zig index 2a9b29edafc83c..0d0baa8b864179 100644 --- a/src/css/prefixes.zig +++ b/src/css/prefixes.zig @@ -1,6 +1,6 @@ // This file is autogenerated by build-prefixes.js. DO NOT EDIT! -const css = @import("./css_parser.zig"); +const css = @import("css_parser.zig"); const VendorPrefix = css.VendorPrefix; const Browsers = css.targets.Browsers; diff --git a/src/css/printer.zig b/src/css/printer.zig index c50adb3bcde426..0c7b56864c040f 100644 --- a/src/css/printer.zig +++ b/src/css/printer.zig @@ -4,8 +4,8 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); -pub const css_values = @import("./values/values.zig"); +pub const css = @import("css_parser.zig"); +pub const css_values = @import("values/values.zig"); const DashedIdent = css_values.ident.DashedIdent; const Ident = css_values.ident.Ident; pub const Error = css.Error; @@ -14,7 +14,7 @@ const PrintErr = css.PrintErr; const ArrayList = std.ArrayListUnmanaged; -const sourcemap = @import("./sourcemap.zig"); +const sourcemap = @import("sourcemap.zig"); /// Options that control how CSS is serialized to a string. pub const PrinterOptions = struct { diff --git a/src/css/properties/generate_properties.ts b/src/css/properties/generate_properties.ts index f55f04d022fba2..973bfe6e3d9b2c 100644 --- a/src/css/properties/generate_properties.ts +++ b/src/css/properties/generate_properties.ts @@ -1754,8 +1754,8 @@ const PrintErr = css.PrintErr; const VendorPrefix = css.VendorPrefix; -const PropertyImpl = @import("./properties_impl.zig").PropertyImpl; -const PropertyIdImpl = @import("./properties_impl.zig").PropertyIdImpl; +const PropertyImpl = @import("properties_impl.zig").PropertyImpl; +const PropertyIdImpl = @import("properties_impl.zig").PropertyIdImpl; const CSSWideKeyword = css.css_properties.CSSWideKeyword; const UnparsedProperty = css.css_properties.custom.UnparsedProperty; diff --git a/src/css/properties/properties.zig b/src/css/properties/properties.zig index 4ec12ffa41202a..276ed0f1fc14bd 100644 --- a/src/css/properties/properties.zig +++ b/src/css/properties/properties.zig @@ -9,38 +9,38 @@ const Error = css.Error; const ArrayList = std.ArrayListUnmanaged; const SmallList = css.SmallList; -pub const CustomPropertyName = @import("./custom.zig").CustomPropertyName; - -pub const @"align" = @import("./align.zig"); -pub const animation = @import("./animation.zig"); -pub const background = @import("./background.zig"); -pub const border = @import("./border.zig"); -pub const border_image = @import("./border_image.zig"); -pub const border_radius = @import("./border_radius.zig"); -pub const box_shadow = @import("./box_shadow.zig"); -pub const contain = @import("./contain.zig"); -pub const css_modules = @import("./css_modules.zig"); -pub const custom = @import("./custom.zig"); -pub const display = @import("./display.zig"); -pub const effects = @import("./effects.zig"); -pub const flex = @import("./flex.zig"); -pub const font = @import("./font.zig"); -pub const list = @import("./list.zig"); -pub const margin_padding = @import("./margin_padding.zig"); -pub const masking = @import("./masking.zig"); -pub const outline = @import("./outline.zig"); -pub const overflow = @import("./overflow.zig"); -pub const position = @import("./position.zig"); -pub const prefix_handler = @import("./prefix_handler.zig"); -pub const shape = @import("./shape.zig"); -pub const size = @import("./size.zig"); -pub const svg = @import("./svg.zig"); -pub const text = @import("./text.zig"); -pub const transform = @import("./transform.zig"); -pub const transition = @import("./transition.zig"); -pub const ui = @import("./ui.zig"); - -const generated = @import("./properties_generated.zig"); +pub const CustomPropertyName = @import("custom.zig").CustomPropertyName; + +pub const @"align" = @import("align.zig"); +pub const animation = @import("animation.zig"); +pub const background = @import("background.zig"); +pub const border = @import("border.zig"); +pub const border_image = @import("border_image.zig"); +pub const border_radius = @import("border_radius.zig"); +pub const box_shadow = @import("box_shadow.zig"); +pub const contain = @import("contain.zig"); +pub const css_modules = @import("css_modules.zig"); +pub const custom = @import("custom.zig"); +pub const display = @import("display.zig"); +pub const effects = @import("effects.zig"); +pub const flex = @import("flex.zig"); +pub const font = @import("font.zig"); +pub const list = @import("list.zig"); +pub const margin_padding = @import("margin_padding.zig"); +pub const masking = @import("masking.zig"); +pub const outline = @import("outline.zig"); +pub const overflow = @import("overflow.zig"); +pub const position = @import("position.zig"); +pub const prefix_handler = @import("prefix_handler.zig"); +pub const shape = @import("shape.zig"); +pub const size = @import("size.zig"); +pub const svg = @import("svg.zig"); +pub const text = @import("text.zig"); +pub const transform = @import("transform.zig"); +pub const transition = @import("transition.zig"); +pub const ui = @import("ui.zig"); + +const generated = @import("properties_generated.zig"); pub const PropertyId = generated.PropertyId; pub const Property = generated.Property; pub const PropertyIdTag = generated.PropertyIdTag; diff --git a/src/css/properties/properties_generated.zig b/src/css/properties/properties_generated.zig index 46615f071a42f8..0cadcefd3fbbbc 100644 --- a/src/css/properties/properties_generated.zig +++ b/src/css/properties/properties_generated.zig @@ -8,8 +8,8 @@ const Printer = css.Printer; const PrintErr = css.PrintErr; const VendorPrefix = css.VendorPrefix; -const PropertyImpl = @import("./properties_impl.zig").PropertyImpl; -const PropertyIdImpl = @import("./properties_impl.zig").PropertyIdImpl; +const PropertyImpl = @import("properties_impl.zig").PropertyImpl; +const PropertyIdImpl = @import("properties_impl.zig").PropertyIdImpl; const CSSWideKeyword = css.css_properties.CSSWideKeyword; const UnparsedProperty = css.css_properties.custom.UnparsedProperty; diff --git a/src/css/rules/rules.zig b/src/css/rules/rules.zig index 951a302c92c86a..d1c70d3debabcf 100644 --- a/src/css/rules/rules.zig +++ b/src/css/rules/rules.zig @@ -16,28 +16,28 @@ const Url = css.css_values.url.Url; const Size2D = css.css_values.size.Size2D; const fontprops = css.css_properties.font; -pub const import = @import("./import.zig"); -pub const layer = @import("./layer.zig"); -pub const style = @import("./style.zig"); -pub const keyframes = @import("./keyframes.zig"); -pub const font_face = @import("./font_face.zig"); -pub const font_palette_values = @import("./font_palette_values.zig"); -pub const page = @import("./page.zig"); -pub const supports = @import("./supports.zig"); -pub const counter_style = @import("./counter_style.zig"); -pub const custom_media = @import("./custom_media.zig"); -pub const namespace = @import("./namespace.zig"); -pub const unknown = @import("./unknown.zig"); -pub const document = @import("./document.zig"); -pub const nesting = @import("./nesting.zig"); -pub const viewport = @import("./viewport.zig"); -pub const property = @import("./property.zig"); -pub const container = @import("./container.zig"); -pub const scope = @import("./scope.zig"); -pub const media = @import("./media.zig"); -pub const starting_style = @import("./starting_style.zig"); - -pub const tailwind = @import("./tailwind.zig"); +pub const import = @import("import.zig"); +pub const layer = @import("layer.zig"); +pub const style = @import("style.zig"); +pub const keyframes = @import("keyframes.zig"); +pub const font_face = @import("font_face.zig"); +pub const font_palette_values = @import("font_palette_values.zig"); +pub const page = @import("page.zig"); +pub const supports = @import("supports.zig"); +pub const counter_style = @import("counter_style.zig"); +pub const custom_media = @import("custom_media.zig"); +pub const namespace = @import("namespace.zig"); +pub const unknown = @import("unknown.zig"); +pub const document = @import("document.zig"); +pub const nesting = @import("nesting.zig"); +pub const viewport = @import("viewport.zig"); +pub const property = @import("property.zig"); +pub const container = @import("container.zig"); +pub const scope = @import("scope.zig"); +pub const media = @import("media.zig"); +pub const starting_style = @import("starting_style.zig"); + +pub const tailwind = @import("tailwind.zig"); const debug = bun.Output.scoped(.CSS_MINIFY, false); diff --git a/src/css/selectors/parser.zig b/src/css/selectors/parser.zig index bcd01753cc4d9e..feddba48444544 100644 --- a/src/css/selectors/parser.zig +++ b/src/css/selectors/parser.zig @@ -47,7 +47,7 @@ pub fn ValidSelectorImpl(comptime T: type) void { _ = T.SelectorImpl.PseudoElement; } -const selector_builder = @import("./builder.zig"); +const selector_builder = @import("builder.zig"); pub const attrs = struct { pub fn NamespaceUrl(comptime Impl: type) type { diff --git a/src/css/selectors/selector.zig b/src/css/selectors/selector.zig index 63886309308772..3be819a9f0cbb6 100644 --- a/src/css/selectors/selector.zig +++ b/src/css/selectors/selector.zig @@ -45,7 +45,7 @@ pub const impl = struct { }; }; -pub const parser = @import("./parser.zig"); +pub const parser = @import("parser.zig"); /// Returns whether two selector lists are equivalent, i.e. the same minus any vendor prefix differences. pub fn isEquivalent(selectors: []const Selector, other: []const Selector) bool { diff --git a/src/css/small_list.zig b/src/css/small_list.zig index bb48ca8593953a..5b8123cad9ab58 100644 --- a/src/css/small_list.zig +++ b/src/css/small_list.zig @@ -1,6 +1,6 @@ const std = @import("std"); const bun = @import("root").bun; -const css = @import("./css_parser.zig"); +const css = @import("css_parser.zig"); const Printer = css.Printer; const Parser = css.Parser; const Result = css.Result; diff --git a/src/css/sourcemap.zig b/src/css/sourcemap.zig index 57f5cab30ff9a5..2376761eb277dc 100644 --- a/src/css/sourcemap.zig +++ b/src/css/sourcemap.zig @@ -4,8 +4,8 @@ const bun = @import("root").bun; const logger = bun.logger; const Log = logger.Log; -pub const css = @import("./css_parser.zig"); -pub const css_values = @import("./values/values.zig"); +pub const css = @import("css_parser.zig"); +pub const css_values = @import("values/values.zig"); const DashedIdent = css_values.ident.DashedIdent; const Ident = css_values.ident.Ident; pub const Error = css.Error; diff --git a/src/css/targets.zig b/src/css/targets.zig index c5fe76f2140b96..be51a3bf7ab040 100644 --- a/src/css/targets.zig +++ b/src/css/targets.zig @@ -2,7 +2,7 @@ const std = @import("std"); const bun = @import("root").bun; const Allocator = std.mem.Allocator; -pub const css = @import("./css_parser.zig"); +pub const css = @import("css_parser.zig"); const Printer = css.Printer; const PrintErr = css.PrintErr; diff --git a/src/css/values/color.zig b/src/css/values/color.zig index e742af54b745c7..9ca41de49d6917 100644 --- a/src/css/values/color.zig +++ b/src/css/values/color.zig @@ -95,7 +95,7 @@ pub const CssColor = union(enum) { const This = @This(); - pub const jsFunctionColor = @import("./color_js.zig").jsFunctionColor; + pub const jsFunctionColor = @import("color_js.zig").jsFunctionColor; pub fn isCompatible(this: *const CssColor, browsers: css.targets.Browsers) bool { return switch (this.*) { @@ -3477,7 +3477,7 @@ const D50: []const f32 = &.{ @floatCast(@as(f64, 0.3457) / @as(f64, 0.3585)), 1. // const D50: []const f32 = &.{ 0.9642956, 1.0, 0.82510453 }; const color_conversions = struct { - const generated = @import("./color_generated.zig").generated_color_conversions; + const generated = @import("color_generated.zig").generated_color_conversions; pub const convert_RGBA = struct { pub usingnamespace generated.convert_RGBA; diff --git a/src/css/values/color_generated.zig b/src/css/values/color_generated.zig index a767990f1f9b5b..7126beea1a0d7d 100644 --- a/src/css/values/color_generated.zig +++ b/src/css/values/color_generated.zig @@ -1,5 +1,5 @@ //!This file is generated by `color_via.ts`. Do not edit it directly! -const color = @import("./color.zig"); +const color = @import("color.zig"); const RGBA = color.RGBA; const LAB = color.LAB; const LCH = color.LCH; diff --git a/src/css/values/color_js.zig b/src/css/values/color_js.zig index d1dd0f6abc80bb..3bb291c8600e78 100644 --- a/src/css/values/color_js.zig +++ b/src/css/values/color_js.zig @@ -1,6 +1,6 @@ const bun = @import("root").bun; const std = @import("std"); -const color = @import("./color.zig"); +const color = @import("color.zig"); const RGBA = color.RGBA; const LAB = color.LAB; const LCH = color.LCH; diff --git a/src/css/values/color_via.ts b/src/css/values/color_via.ts index fd1127c6f0d292..052fa5330f1abb 100644 --- a/src/css/values/color_via.ts +++ b/src/css/values/color_via.ts @@ -64,7 +64,7 @@ function initColorSpaces() { async function generateCode() { const output = `//!This file is generated by \`color_via.ts\`. Do not edit it directly! -const color = @import("./color.zig"); +const color = @import("color.zig"); const RGBA = color.RGBA; const LAB = color.LAB; const LCH = color.LCH; diff --git a/src/css/values/values.zig b/src/css/values/values.zig index f500f14ae73dab..1b3a64fd71b8bf 100644 --- a/src/css/values/values.zig +++ b/src/css/values/values.zig @@ -20,23 +20,23 @@ pub const css_modules = struct { }; }; -pub const angle = @import("./angle.zig"); -pub const ident = @import("./ident.zig"); -pub const string = @import("./css_string.zig"); -pub const color = @import("./color.zig"); -pub const image = @import("./image.zig"); -pub const number = @import("./number.zig"); -pub const calc = @import("./calc.zig"); -pub const percentage = @import("./percentage.zig"); -pub const length = @import("./length.zig"); -pub const position = @import("./position.zig"); -pub const syntax = @import("./syntax.zig"); -pub const alpha = @import("./alpha.zig"); -pub const ratio = @import("./ratio.zig"); -pub const size = @import("./size.zig"); -pub const rect = @import("./rect.zig"); -pub const time = @import("./time.zig"); -pub const easing = @import("./easing.zig"); -pub const url = @import("./url.zig"); -pub const resolution = @import("./resolution.zig"); -pub const gradient = @import("./gradient.zig"); +pub const angle = @import("angle.zig"); +pub const ident = @import("ident.zig"); +pub const string = @import("css_string.zig"); +pub const color = @import("color.zig"); +pub const image = @import("image.zig"); +pub const number = @import("number.zig"); +pub const calc = @import("calc.zig"); +pub const percentage = @import("percentage.zig"); +pub const length = @import("length.zig"); +pub const position = @import("position.zig"); +pub const syntax = @import("syntax.zig"); +pub const alpha = @import("alpha.zig"); +pub const ratio = @import("ratio.zig"); +pub const size = @import("size.zig"); +pub const rect = @import("rect.zig"); +pub const time = @import("time.zig"); +pub const easing = @import("easing.zig"); +pub const url = @import("url.zig"); +pub const resolution = @import("resolution.zig"); +pub const gradient = @import("gradient.zig"); diff --git a/src/css_scanner.zig b/src/css_scanner.zig index 03ad54e3bb6e92..9e9427a2625147 100644 --- a/src/css_scanner.zig +++ b/src/css_scanner.zig @@ -13,13 +13,13 @@ const FeatureFlags = bun.FeatureFlags; const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; -const options = @import("./options.zig"); +const options = @import("options.zig"); const import_record = @import("import_record.zig"); const logger = bun.logger; const Options = options; -const resolver = @import("./resolver/resolver.zig"); -const _linker = @import("./linker.zig"); -const URL = @import("./url.zig").URL; +const resolver = @import("resolver/resolver.zig"); +const _linker = @import("linker.zig"); +const URL = @import("url.zig").URL; const replacementCharacter: CodePoint = 0xFFFD; pub const Chunk = struct { diff --git a/src/defines-table.zig b/src/defines-table.zig index 8fdfeda58e52f2..f7b59c47b26a54 100644 --- a/src/defines-table.zig +++ b/src/defines-table.zig @@ -9,7 +9,7 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const defines = @import("./defines.zig"); +const defines = @import("defines.zig"); // If something is in this list, then a direct identifier expression or property // access chain matching this will be assumed to have no side effects and will diff --git a/src/defines.zig b/src/defines.zig index f038248505ab35..88a05d8f8a3c3e 100644 --- a/src/defines.zig +++ b/src/defines.zig @@ -16,8 +16,8 @@ const default_allocator = bun.default_allocator; const C = bun.C; const Ref = @import("ast/base.zig").Ref; -const GlobalDefinesKey = @import("./defines-table.zig").GlobalDefinesKey; -const table = @import("./defines-table.zig"); +const GlobalDefinesKey = @import("defines-table.zig").GlobalDefinesKey; +const table = @import("defines-table.zig"); const Globals = struct { pub const Undefined = js_ast.E.Undefined{}; diff --git a/src/deps/zlib.posix.zig b/src/deps/zlib.posix.zig index 0cb5dec403704c..fcfff5cf8e7e66 100644 --- a/src/deps/zlib.posix.zig +++ b/src/deps/zlib.posix.zig @@ -61,9 +61,9 @@ pub const zStream_struct = extern struct { pub const z_stream = zStream_struct; pub const z_streamp = *z_stream; -pub const DataType = @import("./zlib.shared.zig").DataType; -pub const FlushValue = @import("./zlib.shared.zig").FlushValue; -pub const ReturnCode = @import("./zlib.shared.zig").ReturnCode; +pub const DataType = @import("zlib.shared.zig").DataType; +pub const FlushValue = @import("zlib.shared.zig").FlushValue; +pub const ReturnCode = @import("zlib.shared.zig").ReturnCode; pub extern fn zlibVersion() [*c]const u8; pub extern fn deflateInit_(strm: z_streamp, level: c_int, version: [*c]const u8, stream_size: c_int) ReturnCode; diff --git a/src/deps/zlib.win32.zig b/src/deps/zlib.win32.zig index 6560576c206294..1ea4acae857919 100644 --- a/src/deps/zlib.win32.zig +++ b/src/deps/zlib.win32.zig @@ -205,6 +205,6 @@ pub const zStream_struct = struct_z_stream_s; pub const gz_header_s = struct_gz_header_s; pub const gzFile_s = struct_gzFile_s; -pub const DataType = @import("./zlib.shared.zig").DataType; -pub const FlushValue = @import("./zlib.shared.zig").FlushValue; -pub const ReturnCode = @import("./zlib.shared.zig").ReturnCode; +pub const DataType = @import("zlib.shared.zig").DataType; +pub const FlushValue = @import("zlib.shared.zig").FlushValue; +pub const ReturnCode = @import("zlib.shared.zig").ReturnCode; diff --git a/src/env_loader.zig b/src/env_loader.zig index 63646845276287..da39c9fe1725c6 100644 --- a/src/env_loader.zig +++ b/src/env_loader.zig @@ -11,12 +11,12 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const CodePoint = bun.CodePoint; const C = bun.C; -const CodepointIterator = @import("./string_immutable.zig").CodepointIterator; -const Analytics = @import("./analytics/analytics_thread.zig"); -const Fs = @import("./fs.zig"); -const URL = @import("./url.zig").URL; -const Api = @import("./api/schema.zig").Api; -const which = @import("./which.zig").which; +const CodepointIterator = @import("string_immutable.zig").CodepointIterator; +const Analytics = @import("analytics/analytics_thread.zig"); +const Fs = @import("fs.zig"); +const URL = @import("url.zig").URL; +const Api = @import("api/schema.zig").Api; +const which = @import("which.zig").which; const s3 = bun.S3; const DotEnvFileSuffix = enum { diff --git a/src/fs.zig b/src/fs.zig index d64b8270911742..cccbc74075dced 100644 --- a/src/fs.zig +++ b/src/fs.zig @@ -16,7 +16,7 @@ const sync = @import("sync.zig"); const Mutex = bun.Mutex; const Semaphore = sync.Semaphore; const Fs = @This(); -const path_handler = @import("./resolver/resolve_path.zig"); +const path_handler = @import("resolver/resolve_path.zig"); const PathString = bun.PathString; const allocators = bun.allocators; const OOM = bun.OOM; diff --git a/src/glob.zig b/src/glob.zig index 09248b37ae247b..d68ebcdd79b81d 100644 --- a/src/glob.zig +++ b/src/glob.zig @@ -1,5 +1,5 @@ -pub const walk = @import("./glob/GlobWalker.zig"); -pub const Ascii = @import("./glob/ascii.zig"); +pub const walk = @import("glob/GlobWalker.zig"); +pub const Ascii = @import("glob/ascii.zig"); pub const GlobWalker = walk.GlobWalker_; pub const BunGlobWalker = GlobWalker(null, walk.SyscallAccessor, false); diff --git a/src/glob/GlobWalker.zig b/src/glob/GlobWalker.zig index 6498fbb7d4c9a9..e5f4eb37a2c0bf 100644 --- a/src/glob/GlobWalker.zig +++ b/src/glob/GlobWalker.zig @@ -41,7 +41,7 @@ const Codepoint = CodepointIterator.Cursor.CodePointType; const Dirent = @import("../bun.js/node/types.zig").Dirent; const DirIterator = @import("../bun.js/node/dir_iterator.zig"); const EntryKind = @import("../bun.js/node/types.zig").Dirent.Kind; -const GlobAscii = @import("./ascii.zig"); +const GlobAscii = @import("ascii.zig"); const JSC = bun.JSC; const Maybe = JSC.Maybe; const PathLike = @import("../bun.js/node/types.zig").PathLike; diff --git a/src/http.zig b/src/http.zig index 3b4451c0cce36d..56e933a977db57 100644 --- a/src/http.zig +++ b/src/http.zig @@ -12,40 +12,40 @@ const stringZ = bun.stringZ; const C = bun.C; const Loc = bun.logger.Loc; const Log = bun.logger.Log; -const DotEnv = @import("./env_loader.zig"); +const DotEnv = @import("env_loader.zig"); const std = @import("std"); -const URL = @import("./url.zig").URL; -const PercentEncoding = @import("./url.zig").PercentEncoding; -pub const Method = @import("./http/method.zig").Method; -const Api = @import("./api/schema.zig").Api; +const URL = @import("url.zig").URL; +const PercentEncoding = @import("url.zig").PercentEncoding; +pub const Method = @import("http/method.zig").Method; +const Api = @import("api/schema.zig").Api; const Lock = bun.Mutex; const HTTPClient = @This(); -const Zlib = @import("./zlib.zig"); +const Zlib = @import("zlib.zig"); const Brotli = bun.brotli; -const StringBuilder = @import("./string_builder.zig"); +const StringBuilder = @import("string_builder.zig"); const ThreadPool = bun.ThreadPool; -const ObjectPool = @import("./pool.zig").ObjectPool; +const ObjectPool = @import("pool.zig").ObjectPool; const posix = std.posix; const SOCK = posix.SOCK; -const Arena = @import("./allocators/mimalloc_arena.zig").Arena; -const ZlibPool = @import("./http/zlib.zig"); +const Arena = @import("allocators/mimalloc_arena.zig").Arena; +const ZlibPool = @import("http/zlib.zig"); const BoringSSL = bun.BoringSSL; const Progress = bun.Progress; -const X509 = @import("./bun.js/api/bun/x509.zig"); -const SSLConfig = @import("./bun.js/api/server.zig").ServerConfig.SSLConfig; -const SSLWrapper = @import("./bun.js/api/bun/ssl_wrapper.zig").SSLWrapper; +const X509 = @import("bun.js/api/bun/x509.zig"); +const SSLConfig = @import("bun.js/api/server.zig").ServerConfig.SSLConfig; +const SSLWrapper = @import("bun.js/api/bun/ssl_wrapper.zig").SSLWrapper; const URLBufferPool = ObjectPool([8192]u8, null, false, 10); const uws = bun.uws; -pub const MimeType = @import("./http/mime_type.zig"); -pub const URLPath = @import("./http/url_path.zig"); +pub const MimeType = @import("http/mime_type.zig"); +pub const URLPath = @import("http/url_path.zig"); // This becomes Arena.allocator pub var default_allocator: std.mem.Allocator = undefined; var default_arena: Arena = undefined; pub var http_thread: HTTPThread = undefined; -const HiveArray = @import("./hive_array.zig").HiveArray; +const HiveArray = @import("hive_array.zig").HiveArray; const Batch = bun.ThreadPool.Batch; -const TaggedPointerUnion = @import("./tagged_pointer.zig").TaggedPointerUnion; +const TaggedPointerUnion = @import("tagged_pointer.zig").TaggedPointerUnion; const DeadSocket = opaque {}; var dead_socket = @as(*DeadSocket, @ptrFromInt(1)); //TODO: this needs to be freed when Worker Threads are implemented @@ -1026,7 +1026,7 @@ fn NewHTTPContext(comptime ssl: bool) type { }; } -const UnboundedQueue = @import("./bun.js/unbounded_queue.zig").UnboundedQueue; +const UnboundedQueue = @import("bun.js/unbounded_queue.zig").UnboundedQueue; const Queue = UnboundedQueue(AsyncHTTP, .next); const ShutdownQueue = UnboundedQueue(AsyncHTTP, .next); const RequestWriteQueue = UnboundedQueue(AsyncHTTP, .next); @@ -1767,7 +1767,7 @@ pub inline fn cleanup(force: bool) void { default_arena.gc(force); } -pub const Headers = @import("./http/headers.zig"); +pub const Headers = @import("http/headers.zig"); pub const SOCKET_FLAGS: u32 = if (Environment.isLinux) SOCK.CLOEXEC | posix.MSG.NOSIGNAL @@ -2373,13 +2373,13 @@ pub fn headerStr(this: *const HTTPClient, ptr: Api.StringPointer) string { return this.header_buf[ptr.offset..][0..ptr.length]; } -pub const HeaderBuilder = @import("./http/header_builder.zig"); +pub const HeaderBuilder = @import("http/header_builder.zig"); const HTTPCallbackPair = .{ *AsyncHTTP, HTTPClientResult }; -pub const HTTPChannel = @import("./sync.zig").Channel(HTTPCallbackPair, .{ .Static = 1000 }); +pub const HTTPChannel = @import("sync.zig").Channel(HTTPCallbackPair, .{ .Static = 1000 }); // 32 pointers much cheaper than 1000 pointers const SingleHTTPChannel = struct { - const SingleHTTPCHannel_ = @import("./sync.zig").Channel(HTTPClientResult, .{ .Static = 8 }); + const SingleHTTPCHannel_ = @import("sync.zig").Channel(HTTPClientResult, .{ .Static = 8 }); channel: SingleHTTPCHannel_, pub fn reset(_: *@This()) void {} pub fn init() SingleHTTPChannel { diff --git a/src/http/header_builder.zig b/src/http/header_builder.zig index 94744fc3263e5e..9c635ace60d216 100644 --- a/src/http/header_builder.zig +++ b/src/http/header_builder.zig @@ -1,6 +1,6 @@ const HeaderBuilder = @This(); const StringBuilder = @import("../string_builder.zig"); -const Headers = @import("./headers.zig"); +const Headers = @import("headers.zig"); const string = bun.string; const HTTPClient = @import("../http.zig"); const Api = @import("../api/schema.zig").Api; diff --git a/src/http/websocket_http_client.zig b/src/http/websocket_http_client.zig index 734b795835dffc..42f0fd8e451f5b 100644 --- a/src/http/websocket_http_client.zig +++ b/src/http/websocket_http_client.zig @@ -17,9 +17,9 @@ 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; -const Opcode = @import("./websocket.zig").Opcode; +const WebsocketHeader = @import("websocket.zig").WebsocketHeader; +const WebsocketDataFrame = @import("websocket.zig").WebsocketDataFrame; +const Opcode = @import("websocket.zig").Opcode; const ZigURL = @import("../url.zig").URL; const Async = bun.Async; diff --git a/src/import_record.zig b/src/import_record.zig index 87d1f93ac52781..d23ce986441806 100644 --- a/src/import_record.zig +++ b/src/import_record.zig @@ -4,7 +4,7 @@ const logger = bun.logger; const std = @import("std"); const Ref = @import("ast/base.zig").Ref; const Index = @import("ast/base.zig").Index; -const Api = @import("./api/schema.zig").Api; +const Api = @import("api/schema.zig").Api; pub const ImportKind = enum(u8) { /// An entry point provided by the user diff --git a/src/install/bin.zig b/src/install/bin.zig index d0162e63839de4..4c40f08e5ec42d 100644 --- a/src/install/bin.zig +++ b/src/install/bin.zig @@ -1,5 +1,5 @@ -const ExternalStringList = @import("./install.zig").ExternalStringList; -const Semver = @import("./semver.zig"); +const ExternalStringList = @import("install.zig").ExternalStringList; +const Semver = @import("semver.zig"); const ExternalString = Semver.ExternalString; const String = Semver.String; const Output = bun.Output; @@ -10,13 +10,13 @@ const Environment = @import("../env.zig"); const C = @import("../c.zig"); const Fs = @import("../fs.zig"); const stringZ = bun.stringZ; -const Resolution = @import("./resolution.zig").Resolution; +const Resolution = @import("resolution.zig").Resolution; const bun = @import("root").bun; const path = bun.path; const string = bun.string; -const Install = @import("./install.zig"); +const Install = @import("install.zig"); const PackageInstall = Install.PackageInstall; -const Dependency = @import("./dependency.zig"); +const Dependency = @import("dependency.zig"); const OOM = bun.OOM; const JSON = bun.JSON; const Lockfile = Install.Lockfile; @@ -620,7 +620,7 @@ pub const Bin = extern struct { } fn createWindowsShim(this: *Linker, target: bun.FileDescriptor, abs_target: [:0]const u8, abs_dest: [:0]const u8, global: bool) void { - const WinBinLinkingShim = @import("./windows-shim/BinLinkingShim.zig"); + const WinBinLinkingShim = @import("windows-shim/BinLinkingShim.zig"); var shim_buf: [65536]u8 = undefined; var read_in_buf: [WinBinLinkingShim.Shebang.max_shebang_input_length]u8 = undefined; diff --git a/src/install/bun.lock.zig b/src/install/bun.lock.zig index b34d21e0097bd8..7d36f5b649f5bb 100644 --- a/src/install/bun.lock.zig +++ b/src/install/bun.lock.zig @@ -29,8 +29,8 @@ const LoadResult = BinaryLockfile.LoadResult; const TruncatedPackageNameHash = Install.TruncatedPackageNameHash; const invalid_package_id = Install.invalid_package_id; const Npm = Install.Npm; -const ExtractTarball = @import("./extract_tarball.zig"); -const Integrity = @import("./integrity.zig").Integrity; +const ExtractTarball = @import("extract_tarball.zig"); +const Integrity = @import("integrity.zig").Integrity; const Meta = BinaryLockfile.Package.Meta; const Negatable = Npm.Negatable; const DependencyID = Install.DependencyID; diff --git a/src/install/dependency.zig b/src/install/dependency.zig index 4ded9d5682eb59..e8eaa243918f28 100644 --- a/src/install/dependency.zig +++ b/src/install/dependency.zig @@ -1,13 +1,13 @@ const bun = @import("root").bun; const logger = bun.logger; const Environment = @import("../env.zig"); -const Install = @import("./install.zig"); +const Install = @import("install.zig"); const PackageManager = Install.PackageManager; const ExternalStringList = Install.ExternalStringList; const Features = Install.Features; const PackageNameHash = Install.PackageNameHash; -const Repository = @import("./repository.zig").Repository; -const Semver = @import("./semver.zig"); +const Repository = @import("repository.zig").Repository; +const Semver = @import("semver.zig"); const ExternalString = Semver.ExternalString; const SlicedString = Semver.SlicedString; const String = Semver.String; diff --git a/src/install/extract_tarball.zig b/src/install/extract_tarball.zig index e8b8fb0c481d88..5abdbfd7a3addf 100644 --- a/src/install/extract_tarball.zig +++ b/src/install/extract_tarball.zig @@ -5,13 +5,13 @@ const json_parser = bun.JSON; const logger = bun.logger; const Output = bun.Output; const FileSystem = @import("../fs.zig").FileSystem; -const Install = @import("./install.zig"); +const Install = @import("install.zig"); const DependencyID = Install.DependencyID; const PackageManager = Install.PackageManager; -const Integrity = @import("./integrity.zig").Integrity; -const Npm = @import("./npm.zig"); -const Resolution = @import("./resolution.zig").Resolution; -const Semver = @import("./semver.zig"); +const Integrity = @import("integrity.zig").Integrity; +const Npm = @import("npm.zig"); +const Resolution = @import("resolution.zig").Resolution; +const Semver = @import("semver.zig"); const std = @import("std"); const string = @import("../string_types.zig").string; const strings = @import("../string_immutable.zig"); diff --git a/src/install/install.zig b/src/install/install.zig index 400b5a0c124766..79839acd44e414 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -52,10 +52,10 @@ const HTTPChannel = HTTP.HTTPChannel; const HeaderBuilder = HTTP.HeaderBuilder; -const Integrity = @import("./integrity.zig").Integrity; +const Integrity = @import("integrity.zig").Integrity; const clap = bun.clap; -const ExtractTarball = @import("./extract_tarball.zig"); -pub const Npm = @import("./npm.zig"); +const ExtractTarball = @import("extract_tarball.zig"); +pub const Npm = @import("npm.zig"); const Bitset = bun.bit_set.DynamicBitSetUnmanaged; const z_allocator = @import("../allocators/memory_allocator.zig").z_allocator; const Syscall = bun.sys; @@ -64,7 +64,7 @@ const PackageManagerCommand = @import("../cli/package_manager_command.zig").Pack threadlocal var initialized_store = false; const Futex = @import("../futex.zig"); -pub const Lockfile = @import("./lockfile.zig"); +pub const Lockfile = @import("lockfile.zig"); pub const PatchedDep = Lockfile.PatchedDep; const Walker = @import("../walker_skippable.zig"); @@ -86,7 +86,7 @@ pub fn buntaghashbuf_make(buf: *BuntagHashBuf, patch_hash: u64) [:0]u8 { return bunhashtag; } -pub const patch = @import("./patch_install.zig"); +pub const patch = @import("patch_install.zig"); pub const PatchTask = patch.PatchTask; // these bytes are skipped @@ -143,16 +143,16 @@ const IdentityContext = @import("../identity_context.zig").IdentityContext; const ArrayIdentityContext = @import("../identity_context.zig").ArrayIdentityContext; const NetworkQueue = std.fifo.LinearFifo(*NetworkTask, .{ .Static = 32 }); const PatchTaskFifo = std.fifo.LinearFifo(*PatchTask, .{ .Static = 32 }); -const Semver = @import("./semver.zig"); +const Semver = @import("semver.zig"); const ExternalString = Semver.ExternalString; const String = Semver.String; const GlobalStringBuilder = @import("../string_builder.zig"); const SlicedString = Semver.SlicedString; -pub const Repository = @import("./repository.zig").Repository; -pub const Bin = @import("./bin.zig").Bin; -pub const Dependency = @import("./dependency.zig"); -const Behavior = @import("./dependency.zig").Behavior; -const FolderResolution = @import("./resolvers/folder_resolver.zig").FolderResolution; +pub const Repository = @import("repository.zig").Repository; +pub const Bin = @import("bin.zig").Bin; +pub const Dependency = @import("dependency.zig"); +const Behavior = @import("dependency.zig").Behavior; +const FolderResolution = @import("resolvers/folder_resolver.zig").FolderResolution; pub fn ExternalSlice(comptime Type: type) type { return extern struct { @@ -2230,7 +2230,7 @@ pub fn NewPackageInstall(comptime kind: PkgInstallKind) type { } pub fn isDanglingWindowsBinLink(node_mod_fd: bun.FileDescriptor, path: []const u16, temp_buffer: []u8) bool { - const WinBinLinkingShim = @import("./windows-shim/BinLinkingShim.zig"); + const WinBinLinkingShim = @import("windows-shim/BinLinkingShim.zig"); const bin_path = bin_path: { const fd = bun.sys.openatWindows(node_mod_fd, path, bun.O.RDONLY).unwrap() catch return true; defer _ = bun.sys.close(fd); @@ -2499,7 +2499,7 @@ pub fn NewPackageInstall(comptime kind: PkgInstallKind) type { }; } -pub const Resolution = @import("./resolution.zig").Resolution; +pub const Resolution = @import("resolution.zig").Resolution; const Progress = bun.Progress; const TaggedPointer = @import("../tagged_pointer.zig"); @@ -15502,7 +15502,7 @@ pub const PackageManifestError = error{ PackageManifestHTTP5xx, }; -pub const LifecycleScriptSubprocess = @import("./lifecycle_script_runner.zig").LifecycleScriptSubprocess; +pub const LifecycleScriptSubprocess = @import("lifecycle_script_runner.zig").LifecycleScriptSubprocess; pub const bun_install_js_bindings = struct { const JSValue = JSC.JSValue; diff --git a/src/install/lifecycle_script_runner.zig b/src/install/lifecycle_script_runner.zig index 6b054644a0f0c6..7caf66596409dd 100644 --- a/src/install/lifecycle_script_runner.zig +++ b/src/install/lifecycle_script_runner.zig @@ -1,9 +1,9 @@ const bun = @import("root").bun; -const Lockfile = @import("./lockfile.zig"); +const Lockfile = @import("lockfile.zig"); const std = @import("std"); const Async = bun.Async; const PosixSpawn = bun.posix.spawn; -const PackageManager = @import("./install.zig").PackageManager; +const PackageManager = @import("install.zig").PackageManager; const Environment = bun.Environment; const Output = bun.Output; const Global = bun.Global; diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig index 969a31c1dd136b..a8b3ad8fcdd21b 100644 --- a/src/install/lockfile.zig +++ b/src/install/lockfile.zig @@ -13,7 +13,7 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const JSAst = bun.JSAst; -const TextLockfile = @import("./bun.lock.zig"); +const TextLockfile = @import("bun.lock.zig"); const OOM = bun.OOM; const WorkspaceFilter = PackageManager.WorkspaceFilter; @@ -26,7 +26,7 @@ const JSON = bun.JSON; const JSPrinter = bun.js_printer; const linker = @import("../linker.zig"); -const migration = @import("./migration.zig"); +const migration = @import("migration.zig"); const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; @@ -46,27 +46,27 @@ const URL = @import("../url.zig").URL; const AsyncHTTP = bun.http.AsyncHTTP; const HTTPChannel = bun.http.HTTPChannel; -const Integrity = @import("./integrity.zig").Integrity; +const Integrity = @import("integrity.zig").Integrity; const clap = bun.clap; -const ExtractTarball = @import("./extract_tarball.zig"); -const Npm = @import("./npm.zig"); +const ExtractTarball = @import("extract_tarball.zig"); +const Npm = @import("npm.zig"); const Bitset = bun.bit_set.DynamicBitSetUnmanaged; const z_allocator = @import("../allocators/memory_allocator.zig").z_allocator; const Lockfile = @This(); const IdentityContext = @import("../identity_context.zig").IdentityContext; const ArrayIdentityContext = @import("../identity_context.zig").ArrayIdentityContext; -const Semver = @import("./semver.zig"); +const Semver = @import("semver.zig"); const ExternalString = Semver.ExternalString; const String = Semver.String; const GlobalStringBuilder = @import("../string_builder.zig"); const SlicedString = Semver.SlicedString; -const Repository = @import("./repository.zig").Repository; -const Bin = @import("./bin.zig").Bin; -const Dependency = @import("./dependency.zig"); +const Repository = @import("repository.zig").Repository; +const Bin = @import("bin.zig").Bin; +const Dependency = @import("dependency.zig"); const Behavior = Dependency.Behavior; -const FolderResolution = @import("./resolvers/folder_resolver.zig").FolderResolution; -const Install = @import("./install.zig"); +const FolderResolution = @import("resolvers/folder_resolver.zig").FolderResolution; +const Install = @import("install.zig"); const Aligner = Install.Aligner; const alignment_bytes_to_repeat_buffer = Install.alignment_bytes_to_repeat_buffer; const PackageManager = Install.PackageManager; @@ -85,7 +85,7 @@ const PackageInstall = Install.PackageInstall; const PackageNameHash = Install.PackageNameHash; const PackageNameAndVersionHash = Install.PackageNameAndVersionHash; const TruncatedPackageNameHash = Install.TruncatedPackageNameHash; -const Resolution = @import("./resolution.zig").Resolution; +const Resolution = @import("resolution.zig").Resolution; const Crypto = @import("../sha.zig").Hashers; const PackageJSON = @import("../resolver/package_json.zig").PackageJSON; const StaticHashMap = @import("../StaticHashMap.zig").StaticHashMap; @@ -113,7 +113,7 @@ pub const PatchedDep = extern struct { } }; const File = bun.sys.File; -const assertNoUninitializedPadding = @import("./padding_checker.zig").assertNoUninitializedPadding; +const assertNoUninitializedPadding = @import("padding_checker.zig").assertNoUninitializedPadding; const IGNORED_PATHS: []const []const u8 = &.{ "node_modules", diff --git a/src/install/migration.zig b/src/install/migration.zig index 71ecc89e8fe7db..7e21ac9628ac5b 100644 --- a/src/install/migration.zig +++ b/src/install/migration.zig @@ -12,20 +12,20 @@ const stringZ = bun.stringZ; const logger = bun.logger; const File = bun.sys.File; -const Install = @import("./install.zig"); -const Resolution = @import("./resolution.zig").Resolution; -const Dependency = @import("./dependency.zig"); -const VersionedURL = @import("./versioned_url.zig"); -const Npm = @import("./npm.zig"); -const Integrity = @import("./integrity.zig").Integrity; -const Bin = @import("./bin.zig").Bin; - -const Semver = @import("./semver.zig"); +const Install = @import("install.zig"); +const Resolution = @import("resolution.zig").Resolution; +const Dependency = @import("dependency.zig"); +const VersionedURL = @import("versioned_url.zig"); +const Npm = @import("npm.zig"); +const Integrity = @import("integrity.zig").Integrity; +const Bin = @import("bin.zig").Bin; + +const Semver = @import("semver.zig"); const String = Semver.String; const ExternalString = Semver.ExternalString; const stringHash = String.Builder.stringHash; -const Lockfile = @import("./lockfile.zig"); +const Lockfile = @import("lockfile.zig"); const LoadResult = Lockfile.LoadResult; const JSAst = bun.JSAst; diff --git a/src/install/npm.zig b/src/install/npm.zig index e0801946d1a9e3..d334155114ef3b 100644 --- a/src/install/npm.zig +++ b/src/install/npm.zig @@ -2,24 +2,24 @@ const URL = @import("../url.zig").URL; const bun = @import("root").bun; const std = @import("std"); const MutableString = @import("../string_mutable.zig").MutableString; -const Semver = @import("./semver.zig"); +const Semver = @import("semver.zig"); const ExternalString = Semver.ExternalString; const String = Semver.String; const string = @import("../string_types.zig").string; const strings = @import("../string_immutable.zig"); -const PackageManager = @import("./install.zig").PackageManager; -const ExternalStringMap = @import("./install.zig").ExternalStringMap; +const PackageManager = @import("install.zig").PackageManager; +const ExternalStringMap = @import("install.zig").ExternalStringMap; const ExternalPackageNameHashList = bun.install.ExternalPackageNameHashList; const PackageNameHash = bun.install.PackageNameHash; -const ExternalStringList = @import("./install.zig").ExternalStringList; -const ExternalSlice = @import("./install.zig").ExternalSlice; -const initializeStore = @import("./install.zig").initializeMiniStore; +const ExternalStringList = @import("install.zig").ExternalStringList; +const ExternalSlice = @import("install.zig").ExternalSlice; +const initializeStore = @import("install.zig").initializeMiniStore; const logger = bun.logger; const Output = bun.Output; -const Integrity = @import("./integrity.zig").Integrity; -const Bin = @import("./bin.zig").Bin; +const Integrity = @import("integrity.zig").Integrity; +const Bin = @import("bin.zig").Bin; const Environment = bun.Environment; -const Aligner = @import("./install.zig").Aligner; +const Aligner = @import("install.zig").Aligner; const HTTPClient = bun.http; const JSON = bun.JSON; const default_allocator = bun.default_allocator; @@ -27,9 +27,9 @@ const IdentityContext = @import("../identity_context.zig").IdentityContext; const ArrayIdentityContext = @import("../identity_context.zig").ArrayIdentityContext; const SlicedString = Semver.SlicedString; const FileSystem = @import("../fs.zig").FileSystem; -const Dependency = @import("./dependency.zig"); -const VersionedURL = @import("./versioned_url.zig"); -const VersionSlice = @import("./install.zig").VersionSlice; +const Dependency = @import("dependency.zig"); +const VersionedURL = @import("versioned_url.zig"); +const VersionSlice = @import("install.zig").VersionSlice; const ObjectPool = @import("../pool.zig").ObjectPool; const Api = @import("../api/schema.zig").Api; const DotEnv = @import("../env_loader.zig"); diff --git a/src/install/patch_install.zig b/src/install/patch_install.zig index 842ca4a01f40b9..d89bec5ceb168e 100644 --- a/src/install/patch_install.zig +++ b/src/install/patch_install.zig @@ -19,12 +19,12 @@ pub const PackageID = bun.install.PackageID; pub const DependencyID = bun.install.DependencyID; const Task = bun.install.Task; -pub const Lockfile = @import("./lockfile.zig"); +pub const Lockfile = @import("lockfile.zig"); pub const PatchedDep = Lockfile.PatchedDep; const ThreadPool = bun.ThreadPool; -pub const Resolution = @import("./resolution.zig").Resolution; +pub const Resolution = @import("resolution.zig").Resolution; pub const PackageInstall = bun.install.PackageInstall; pub const PreparePatchPackageInstall = bun.install.PreparePatchPackageInstall; diff --git a/src/install/repository.zig b/src/install/repository.zig index 8e016bf9656589..360f17a2ae3318 100644 --- a/src/install/repository.zig +++ b/src/install/repository.zig @@ -1,14 +1,14 @@ const bun = @import("root").bun; const Global = bun.Global; const logger = bun.logger; -const Dependency = @import("./dependency.zig"); +const Dependency = @import("dependency.zig"); const DotEnv = @import("../env_loader.zig"); const Environment = @import("../env.zig"); const FileSystem = @import("../fs.zig").FileSystem; -const Install = @import("./install.zig"); +const Install = @import("install.zig"); const ExtractData = Install.ExtractData; const PackageManager = Install.PackageManager; -const Semver = @import("./semver.zig"); +const Semver = @import("semver.zig"); const ExternalString = Semver.ExternalString; const String = Semver.String; const std = @import("std"); diff --git a/src/install/resolution.zig b/src/install/resolution.zig index d51829b1d40dbd..f88448bed7ca3f 100644 --- a/src/install/resolution.zig +++ b/src/install/resolution.zig @@ -1,13 +1,13 @@ -const PackageManager = @import("./install.zig").PackageManager; -const Semver = @import("./semver.zig"); +const PackageManager = @import("install.zig").PackageManager; +const Semver = @import("semver.zig"); const ExternalString = Semver.ExternalString; const String = Semver.String; const std = @import("std"); -const Repository = @import("./repository.zig").Repository; +const Repository = @import("repository.zig").Repository; const string = @import("../string_types.zig").string; -const ExtractTarball = @import("./extract_tarball.zig"); +const ExtractTarball = @import("extract_tarball.zig"); const strings = @import("../string_immutable.zig"); -const VersionedURL = @import("./versioned_url.zig").VersionedURL; +const VersionedURL = @import("versioned_url.zig").VersionedURL; const bun = @import("root").bun; const Path = bun.path; const JSON = bun.JSON; diff --git a/src/install/versioned_url.zig b/src/install/versioned_url.zig index ac31f98ece1521..42ff998945398c 100644 --- a/src/install/versioned_url.zig +++ b/src/install/versioned_url.zig @@ -1,5 +1,5 @@ -const Semver = @import("./semver.zig"); -const String = @import("./semver.zig").String; +const Semver = @import("semver.zig"); +const String = @import("semver.zig").String; pub const VersionedURL = extern struct { url: String, diff --git a/src/install/windows-shim/bun_shim_impl.zig b/src/install/windows-shim/bun_shim_impl.zig index c8cf07e09db1b2..12c30babe1c747 100644 --- a/src/install/windows-shim/bun_shim_impl.zig +++ b/src/install/windows-shim/bun_shim_impl.zig @@ -51,7 +51,7 @@ const bun = if (!is_standalone) @import("root").bun else @compileError("cannot u const bunDebugMessage = bun.Output.scoped(.bun_shim_impl, true); const callmod_inline = if (is_standalone) std.builtin.CallModifier.always_inline else bun.callmod_inline; -const Flags = @import("./BinLinkingShim.zig").Flags; +const Flags = @import("BinLinkingShim.zig").Flags; const wliteral = std.unicode.utf8ToUtf16LeStringLiteral; diff --git a/src/io/PipeReader.zig b/src/io/PipeReader.zig index 668f7b55fe2f7d..5ba2f9628de81a 100644 --- a/src/io/PipeReader.zig +++ b/src/io/PipeReader.zig @@ -1,10 +1,10 @@ const bun = @import("root").bun; const std = @import("std"); const uv = bun.windows.libuv; -const Source = @import("./source.zig").Source; +const Source = @import("source.zig").Source; -const ReadState = @import("./pipes.zig").ReadState; -const FileType = @import("./pipes.zig").FileType; +const ReadState = @import("pipes.zig").ReadState; +const FileType = @import("pipes.zig").FileType; /// Read a blocking pipe without blocking the current thread. pub fn PosixPipeReader( @@ -338,7 +338,7 @@ pub fn PosixPipeReader( }; } -const PollOrFd = @import("./pipes.zig").PollOrFd; +const PollOrFd = @import("pipes.zig").PollOrFd; pub fn WindowsPipeReader( comptime This: type, diff --git a/src/io/PipeWriter.zig b/src/io/PipeWriter.zig index 622fda152768a9..757afd0bc6cd70 100644 --- a/src/io/PipeWriter.zig +++ b/src/io/PipeWriter.zig @@ -3,10 +3,10 @@ const std = @import("std"); const Async = bun.Async; const JSC = bun.JSC; const uv = bun.windows.libuv; -const Source = @import("./source.zig").Source; +const Source = @import("source.zig").Source; const log = bun.Output.scoped(.PipeWriter, true); -const FileType = @import("./pipes.zig").FileType; +const FileType = @import("pipes.zig").FileType; pub const WriteResult = union(enum) { done: usize, @@ -181,7 +181,7 @@ pub fn PosixPipeWriter( }; } -const PollOrFd = @import("./pipes.zig").PollOrFd; +const PollOrFd = @import("pipes.zig").PollOrFd; pub fn PosixBufferedWriter( comptime Parent: type, diff --git a/src/io/io.zig b/src/io/io.zig index 7a4f36d3c2505b..c8ed1d823238f5 100644 --- a/src/io/io.zig +++ b/src/io/io.zig @@ -3,7 +3,7 @@ const std = @import("std"); const sys = bun.sys; const linux = std.os.linux; const Environment = bun.Environment; -pub const heap = @import("./heap.zig"); +pub const heap = @import("heap.zig"); const JSC = bun.JSC; const log = bun.Output.scoped(.loop, false); @@ -11,7 +11,7 @@ const log = bun.Output.scoped(.loop, false); const posix = std.posix; const assert = bun.assert; -pub const Source = @import("./source.zig").Source; +pub const Source = @import("source.zig").Source; pub const Loop = struct { pending: Request.Queue = .{}, @@ -684,12 +684,12 @@ pub const Poll = struct { pub const retry = bun.C.E.AGAIN; -pub const ReadState = @import("./pipes.zig").ReadState; -pub const PipeReader = @import("./PipeReader.zig").PipeReader; -pub const BufferedReader = @import("./PipeReader.zig").BufferedReader; -pub const BufferedWriter = @import("./PipeWriter.zig").BufferedWriter; -pub const WriteResult = @import("./PipeWriter.zig").WriteResult; -pub const WriteStatus = @import("./PipeWriter.zig").WriteStatus; -pub const StreamingWriter = @import("./PipeWriter.zig").StreamingWriter; -pub const StreamBuffer = @import("./PipeWriter.zig").StreamBuffer; -pub const FileType = @import("./pipes.zig").FileType; +pub const ReadState = @import("pipes.zig").ReadState; +pub const PipeReader = @import("PipeReader.zig").PipeReader; +pub const BufferedReader = @import("PipeReader.zig").BufferedReader; +pub const BufferedWriter = @import("PipeWriter.zig").BufferedWriter; +pub const WriteResult = @import("PipeWriter.zig").WriteResult; +pub const WriteStatus = @import("PipeWriter.zig").WriteStatus; +pub const StreamingWriter = @import("PipeWriter.zig").StreamingWriter; +pub const StreamBuffer = @import("PipeWriter.zig").StreamBuffer; +pub const FileType = @import("pipes.zig").FileType; diff --git a/src/js_ast.zig b/src/js_ast.zig index f78d7dbe8ced2f..b1256c0c78b1a6 100644 --- a/src/js_ast.zig +++ b/src/js_ast.zig @@ -15,18 +15,18 @@ const C = bun.C; pub const Ref = @import("ast/base.zig").Ref; pub const Index = @import("ast/base.zig").Index; const RefHashCtx = @import("ast/base.zig").RefHashCtx; -const ObjectPool = @import("./pool.zig").ObjectPool; +const ObjectPool = @import("pool.zig").ObjectPool; const ImportRecord = @import("import_record.zig").ImportRecord; const allocators = @import("allocators.zig"); const JSC = bun.JSC; -const RefCtx = @import("./ast/base.zig").RefCtx; +const RefCtx = @import("ast/base.zig").RefCtx; const JSONParser = bun.JSON; const is_bindgen = false; const ComptimeStringMap = bun.ComptimeStringMap; -const JSPrinter = @import("./js_printer.zig"); -const js_lexer = @import("./js_lexer.zig"); -const TypeScript = @import("./js_parser.zig").TypeScript; -const ThreadlocalArena = @import("./allocators/mimalloc_arena.zig").Arena; +const JSPrinter = @import("js_printer.zig"); +const js_lexer = @import("js_lexer.zig"); +const TypeScript = @import("js_parser.zig").TypeScript; +const ThreadlocalArena = @import("allocators/mimalloc_arena.zig").Arena; const MimeType = bun.http.MimeType; const OOM = bun.OOM; const Loader = bun.options.Loader; @@ -7986,17 +7986,17 @@ pub fn printmem(comptime format: string, args: anytype) void { pub const Macro = struct { 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; - const ResolveResult = @import("./resolver/resolver.zig").Result; - const DotEnv = @import("./env_loader.zig"); - const js = @import("./bun.js/javascript_core_c_api.zig"); - const Zig = @import("./bun.js/bindings/exports.zig"); + const JSCBase = @import("bun.js/base.zig"); + const Resolver = @import("resolver/resolver.zig").Resolver; + const isPackagePath = @import("resolver/resolver.zig").isPackagePath; + const ResolveResult = @import("resolver/resolver.zig").Result; + const DotEnv = @import("env_loader.zig"); + const js = @import("bun.js/javascript_core_c_api.zig"); + const Zig = @import("bun.js/bindings/exports.zig"); const Transpiler = bun.Transpiler; const MacroEntryPoint = bun.transpiler.MacroEntryPoint; - const MacroRemap = @import("./resolver/package_json.zig").MacroMap; - pub const MacroRemapEntry = @import("./resolver/package_json.zig").MacroImportReplacementMap; + const MacroRemap = @import("resolver/package_json.zig").MacroMap; + pub const MacroRemapEntry = @import("resolver/package_json.zig").MacroImportReplacementMap; pub const namespace: string = "macro"; pub const namespaceWithColon: string = namespace ++ ":"; diff --git a/src/js_lexer.zig b/src/js_lexer.zig index 1560f026213327..6b40fb08f05229 100644 --- a/src/js_lexer.zig +++ b/src/js_lexer.zig @@ -3041,7 +3041,7 @@ fn NewLexer_( pub const Lexer = NewLexer(.{}); -const JSIdentifier = @import("./js_lexer/identifier.zig"); +const JSIdentifier = @import("js_lexer/identifier.zig"); pub inline fn isIdentifierStart(codepoint: i32) bool { return JSIdentifier.isIdentifierStart(codepoint); } diff --git a/src/js_parser.zig b/src/js_parser.zig index 62e6515a8eb5d0..5af150ee224059 100644 --- a/src/js_parser.zig +++ b/src/js_parser.zig @@ -6,30 +6,30 @@ pub const std = @import("std"); const bun = @import("root").bun; pub const logger = bun.logger; pub const js_lexer = bun.js_lexer; -pub const importRecord = @import("./import_record.zig"); +pub const importRecord = @import("import_record.zig"); pub const js_ast = bun.JSAst; -pub const options = @import("./options.zig"); +pub const options = @import("options.zig"); pub const js_printer = bun.js_printer; -pub const renamer = @import("./renamer.zig"); -const _runtime = @import("./runtime.zig"); +pub const renamer = @import("renamer.zig"); +const _runtime = @import("runtime.zig"); pub const RuntimeImports = _runtime.Runtime.Imports; pub const RuntimeFeatures = _runtime.Runtime.Features; pub const RuntimeNames = _runtime.Runtime.Names; -pub const fs = @import("./fs.zig"); +pub const fs = @import("fs.zig"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; const Environment = bun.Environment; const strings = bun.strings; -const MutableString = @import("./string_mutable.zig").MutableString; +const MutableString = @import("string_mutable.zig").MutableString; const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const G = js_ast.G; -const Define = @import("./defines.zig").Define; -const DefineData = @import("./defines.zig").DefineData; -const FeatureFlags = @import("./feature_flags.zig"); -pub const isPackagePath = @import("./resolver/resolver.zig").isPackagePath; +const Define = @import("defines.zig").Define; +const DefineData = @import("defines.zig").DefineData; +const FeatureFlags = @import("feature_flags.zig"); +pub const isPackagePath = @import("resolver/resolver.zig").isPackagePath; pub const ImportKind = importRecord.ImportKind; pub const BindingNodeIndex = js_ast.BindingNodeIndex; const Decl = G.Decl; @@ -43,7 +43,7 @@ pub const StmtNodeList = js_ast.StmtNodeList; pub const BindingNodeList = js_ast.BindingNodeList; const DeclaredSymbol = js_ast.DeclaredSymbol; const JSC = bun.JSC; -const Index = @import("./ast/base.zig").Index; +const Index = @import("ast/base.zig").Index; fn _disabledAssert(_: bool) void { if (!Environment.allow_assert) @compileError("assert is missing an if (Environment.allow_assert)"); @@ -69,14 +69,14 @@ pub const Level = js_ast.Op.Level; pub const Op = js_ast.Op; pub const Scope = js_ast.Scope; pub const locModuleScope = logger.Loc{ .start = -100 }; -const Ref = @import("./ast/base.zig").Ref; -const RefHashCtx = @import("./ast/base.zig").RefHashCtx; +const Ref = @import("ast/base.zig").Ref; +const RefHashCtx = @import("ast/base.zig").RefHashCtx; pub const StringHashMap = bun.StringHashMap; pub const AutoHashMap = std.AutoHashMap; const StringHashMapUnmanaged = bun.StringHashMapUnmanaged; -const ObjectPool = @import("./pool.zig").ObjectPool; -const NodeFallbackModules = @import("./node_fallbacks.zig"); +const ObjectPool = @import("pool.zig").ObjectPool; +const NodeFallbackModules = @import("node_fallbacks.zig"); const DeferredImportNamespace = struct { namespace: LocRef, @@ -2652,12 +2652,12 @@ pub const StringVoidMap = struct { pub const Pool = ObjectPool(StringVoidMap, init, true, 32); pub const Node = Pool.Node; }; -const RefCtx = @import("./ast/base.zig").RefCtx; +const RefCtx = @import("ast/base.zig").RefCtx; const SymbolUseMap = js_ast.Part.SymbolUseMap; const SymbolPropertyUseMap = js_ast.Part.SymbolPropertyUseMap; const StringBoolMap = bun.StringHashMapUnmanaged(bool); const RefMap = std.HashMapUnmanaged(Ref, void, RefCtx, 80); -const RefArrayMap = std.ArrayHashMapUnmanaged(Ref, void, @import("./ast/base.zig").RefHashCtx, false); +const RefArrayMap = std.ArrayHashMapUnmanaged(Ref, void, @import("ast/base.zig").RefHashCtx, false); const RefRefMap = std.HashMapUnmanaged(Ref, Ref, RefCtx, 80); const ImportRecord = importRecord.ImportRecord; diff --git a/src/js_printer.zig b/src/js_printer.zig index be9dd807f10ff4..d0543a1e2dad4c 100644 --- a/src/js_printer.zig +++ b/src/js_printer.zig @@ -7,7 +7,7 @@ const options = @import("options.zig"); const rename = @import("renamer.zig"); const runtime = @import("runtime.zig"); const Lock = bun.Mutex; -const Api = @import("./api/schema.zig").Api; +const Api = @import("api/schema.zig").Api; const fs = @import("fs.zig"); const bun = @import("root").bun; const string = bun.string; @@ -53,13 +53,13 @@ const first_high_surrogate = 0xD800; const last_high_surrogate = 0xDBFF; const first_low_surrogate = 0xDC00; const last_low_surrogate = 0xDFFF; -const CodepointIterator = @import("./string_immutable.zig").UnsignedCodepointIterator; +const CodepointIterator = @import("string_immutable.zig").UnsignedCodepointIterator; const assert = bun.assert; threadlocal var imported_module_ids_list: std.ArrayList(u32) = undefined; threadlocal var imported_module_ids_list_unset: bool = true; const ImportRecord = bun.ImportRecord; -const SourceMap = @import("./sourcemap/sourcemap.zig"); +const SourceMap = @import("sourcemap/sourcemap.zig"); /// For support JavaScriptCore const ascii_only_always_on_unless_minifying = true; diff --git a/src/jsc.zig b/src/jsc.zig index 7fa5521390aa17..d30245a9172771 100644 --- a/src/jsc.zig +++ b/src/jsc.zig @@ -1,78 +1,78 @@ // Top-level so it can access all files -pub usingnamespace @import("./bun.js/base.zig"); -pub usingnamespace @import("./bun.js/bindings/bindings.zig"); -pub usingnamespace @import("./bun.js/bindings/exports.zig"); -pub usingnamespace @import("./bun.js/event_loop.zig"); -pub usingnamespace @import("./bun.js/javascript.zig"); -pub usingnamespace @import("./bun.js/module_loader.zig"); +pub usingnamespace @import("bun.js/base.zig"); +pub usingnamespace @import("bun.js/bindings/bindings.zig"); +pub usingnamespace @import("bun.js/bindings/exports.zig"); +pub usingnamespace @import("bun.js/event_loop.zig"); +pub usingnamespace @import("bun.js/javascript.zig"); +pub usingnamespace @import("bun.js/module_loader.zig"); pub const is_bindgen = false; -pub const Debugger = @import("./bun.js/bindings/Debugger.zig").Debugger; -pub const napi = @import("./napi/napi.zig"); -pub const RareData = @import("./bun.js/rare_data.zig"); -pub const Shimmer = @import("./bun.js/bindings/shimmer.zig").Shimmer; -pub const C = @import("./bun.js/javascript_core_c_api.zig"); -pub const WebCore = @import("./bun.js/webcore.zig"); -pub const BuildMessage = @import("./bun.js/BuildMessage.zig").BuildMessage; -pub const ResolveMessage = @import("./bun.js/ResolveMessage.zig").ResolveMessage; +pub const Debugger = @import("bun.js/bindings/Debugger.zig").Debugger; +pub const napi = @import("napi/napi.zig"); +pub const RareData = @import("bun.js/rare_data.zig"); +pub const Shimmer = @import("bun.js/bindings/shimmer.zig").Shimmer; +pub const C = @import("bun.js/javascript_core_c_api.zig"); +pub const WebCore = @import("bun.js/webcore.zig"); +pub const BuildMessage = @import("bun.js/BuildMessage.zig").BuildMessage; +pub const ResolveMessage = @import("bun.js/ResolveMessage.zig").ResolveMessage; pub const Cloudflare = struct { - pub const HTMLRewriter = @import("./bun.js/api/html_rewriter.zig").HTMLRewriter; - pub const ContentOptions = @import("./bun.js/api/html_rewriter.zig").ContentOptions; - pub const Element = @import("./bun.js/api/html_rewriter.zig").Element; - pub const Comment = @import("./bun.js/api/html_rewriter.zig").Comment; - pub const TextChunk = @import("./bun.js/api/html_rewriter.zig").TextChunk; - pub const DocType = @import("./bun.js/api/html_rewriter.zig").DocType; - pub const DocEnd = @import("./bun.js/api/html_rewriter.zig").DocEnd; - pub const EndTag = @import("./bun.js/api/html_rewriter.zig").EndTag; - pub const AttributeIterator = @import("./bun.js/api/html_rewriter.zig").AttributeIterator; + pub const HTMLRewriter = @import("bun.js/api/html_rewriter.zig").HTMLRewriter; + pub const ContentOptions = @import("bun.js/api/html_rewriter.zig").ContentOptions; + pub const Element = @import("bun.js/api/html_rewriter.zig").Element; + pub const Comment = @import("bun.js/api/html_rewriter.zig").Comment; + pub const TextChunk = @import("bun.js/api/html_rewriter.zig").TextChunk; + pub const DocType = @import("bun.js/api/html_rewriter.zig").DocType; + pub const DocEnd = @import("bun.js/api/html_rewriter.zig").DocEnd; + pub const EndTag = @import("bun.js/api/html_rewriter.zig").EndTag; + pub const AttributeIterator = @import("bun.js/api/html_rewriter.zig").AttributeIterator; }; -pub const Jest = @import("./bun.js/test/jest.zig"); -pub const Expect = @import("./bun.js/test/expect.zig"); -pub const Snapshot = @import("./bun.js/test/snapshot.zig"); +pub const Jest = @import("bun.js/test/jest.zig"); +pub const Expect = @import("bun.js/test/expect.zig"); +pub const Snapshot = @import("bun.js/test/snapshot.zig"); pub const API = struct { - pub const Glob = @import("./bun.js/api/glob.zig"); - pub const Shell = @import("./shell/shell.zig"); - pub const JSBundler = @import("./bun.js/api/JSBundler.zig").JSBundler; - pub const BuildArtifact = @import("./bun.js/api/JSBundler.zig").BuildArtifact; - pub const JSTranspiler = @import("./bun.js/api/JSTranspiler.zig"); - pub const HTTPServer = @import("./bun.js/api/server.zig").HTTPServer; - pub const AnyServer = @import("./bun.js/api/server.zig").AnyServer; - pub const SavedRequest = @import("./bun.js/api/server.zig").SavedRequest; - pub const ServerConfig = @import("./bun.js/api/server.zig").ServerConfig; - pub const ServerWebSocket = @import("./bun.js/api/server.zig").ServerWebSocket; - pub const HTTPSServer = @import("./bun.js/api/server.zig").HTTPSServer; - pub const DebugHTTPServer = @import("./bun.js/api/server.zig").DebugHTTPServer; - pub const DebugHTTPSServer = @import("./bun.js/api/server.zig").DebugHTTPSServer; - pub const AnyRequestContext = @import("./bun.js/api/server.zig").AnyRequestContext; - pub const Bun = @import("./bun.js/api/BunObject.zig"); - pub const FileSystemRouter = @import("./bun.js/api/filesystem_router.zig").FileSystemRouter; - pub const MatchedRoute = @import("./bun.js/api/filesystem_router.zig").MatchedRoute; - pub const TCPSocket = @import("./bun.js/api/bun/socket.zig").TCPSocket; - pub const TLSSocket = @import("./bun.js/api/bun/socket.zig").TLSSocket; - pub const UDPSocket = @import("./bun.js/api/bun/udp_socket.zig").UDPSocket; - pub const Listener = @import("./bun.js/api/bun/socket.zig").Listener; - pub const H2FrameParser = @import("./bun.js/api/bun/h2_frame_parser.zig").H2FrameParser; - pub const NativeZlib = @import("./bun.js/node/node_zlib_binding.zig").SNativeZlib; - pub const NativeBrotli = @import("./bun.js/node/node_zlib_binding.zig").SNativeBrotli; + pub const Glob = @import("bun.js/api/glob.zig"); + pub const Shell = @import("shell/shell.zig"); + pub const JSBundler = @import("bun.js/api/JSBundler.zig").JSBundler; + pub const BuildArtifact = @import("bun.js/api/JSBundler.zig").BuildArtifact; + pub const JSTranspiler = @import("bun.js/api/JSTranspiler.zig"); + pub const HTTPServer = @import("bun.js/api/server.zig").HTTPServer; + pub const AnyServer = @import("bun.js/api/server.zig").AnyServer; + pub const SavedRequest = @import("bun.js/api/server.zig").SavedRequest; + pub const ServerConfig = @import("bun.js/api/server.zig").ServerConfig; + pub const ServerWebSocket = @import("bun.js/api/server.zig").ServerWebSocket; + pub const HTTPSServer = @import("bun.js/api/server.zig").HTTPSServer; + pub const DebugHTTPServer = @import("bun.js/api/server.zig").DebugHTTPServer; + pub const DebugHTTPSServer = @import("bun.js/api/server.zig").DebugHTTPSServer; + pub const AnyRequestContext = @import("bun.js/api/server.zig").AnyRequestContext; + pub const Bun = @import("bun.js/api/BunObject.zig"); + pub const FileSystemRouter = @import("bun.js/api/filesystem_router.zig").FileSystemRouter; + pub const MatchedRoute = @import("bun.js/api/filesystem_router.zig").MatchedRoute; + pub const TCPSocket = @import("bun.js/api/bun/socket.zig").TCPSocket; + pub const TLSSocket = @import("bun.js/api/bun/socket.zig").TLSSocket; + pub const UDPSocket = @import("bun.js/api/bun/udp_socket.zig").UDPSocket; + pub const Listener = @import("bun.js/api/bun/socket.zig").Listener; + pub const H2FrameParser = @import("bun.js/api/bun/h2_frame_parser.zig").H2FrameParser; + pub const NativeZlib = @import("bun.js/node/node_zlib_binding.zig").SNativeZlib; + pub const NativeBrotli = @import("bun.js/node/node_zlib_binding.zig").SNativeBrotli; }; -pub const Postgres = @import("./sql/postgres.zig"); -pub const DNS = @import("./bun.js/api/bun/dns_resolver.zig"); -pub const FFI = @import("./bun.js/api/ffi.zig").FFI; +pub const Postgres = @import("sql/postgres.zig"); +pub const DNS = @import("bun.js/api/bun/dns_resolver.zig"); +pub const FFI = @import("bun.js/api/ffi.zig").FFI; pub const Node = struct { - pub usingnamespace @import("./bun.js/node/types.zig"); - pub usingnamespace @import("./bun.js/node/node_fs.zig"); - pub usingnamespace @import("./bun.js/node/node_fs_watcher.zig"); - pub usingnamespace @import("./bun.js/node/node_fs_stat_watcher.zig"); - pub usingnamespace @import("./bun.js/node/node_fs_binding.zig"); - pub usingnamespace @import("./bun.js/node/node_os.zig"); - pub const fs = @import("./bun.js/node/node_fs_constant.zig"); + pub usingnamespace @import("bun.js/node/types.zig"); + pub usingnamespace @import("bun.js/node/node_fs.zig"); + pub usingnamespace @import("bun.js/node/node_fs_watcher.zig"); + pub usingnamespace @import("bun.js/node/node_fs_stat_watcher.zig"); + pub usingnamespace @import("bun.js/node/node_fs_binding.zig"); + pub usingnamespace @import("bun.js/node/node_os.zig"); + pub const fs = @import("bun.js/node/node_fs_constant.zig"); pub const Util = struct { - pub const parseArgs = @import("./bun.js/node/util/parse_args.zig").parseArgs; + pub const parseArgs = @import("bun.js/node/util/parse_args.zig").parseArgs; }; }; const std = @import("std"); -const Syscall = @import("./sys.zig"); -const Output = @import("./output.zig"); +const Syscall = @import("sys.zig"); +const Output = @import("output.zig"); pub const Maybe = Syscall.Maybe; pub const jsBoolean = @This().JSValue.jsBoolean; @@ -101,12 +101,12 @@ pub const ResourceUsage = API.Bun.ResourceUsage; pub const Codegen = struct { pub const GeneratedClasses = @import("ZigGeneratedClasses"); pub usingnamespace GeneratedClasses; - pub usingnamespace @import("./bun.js/bindings/codegen.zig"); + pub usingnamespace @import("bun.js/bindings/codegen.zig"); }; -pub const GeneratedClassesList = @import("./bun.js/bindings/generated_classes_list.zig").Classes; +pub const GeneratedClassesList = @import("bun.js/bindings/generated_classes_list.zig").Classes; -pub const RuntimeTranspilerCache = @import("./bun.js/RuntimeTranspilerCache.zig").RuntimeTranspilerCache; +pub const RuntimeTranspilerCache = @import("bun.js/RuntimeTranspilerCache.zig").RuntimeTranspilerCache; /// The calling convention used for JavaScript functions <> Native const bun = @import("root").bun; diff --git a/src/json_parser.zig b/src/json_parser.zig index 47267b62ee56d3..59d86e1a3ba002 100644 --- a/src/json_parser.zig +++ b/src/json_parser.zig @@ -4,7 +4,7 @@ const js_lexer = bun.js_lexer; const importRecord = @import("import_record.zig"); const js_ast = bun.JSAst; const options = @import("options.zig"); -const BabyList = @import("./baby_list.zig").BabyList; +const BabyList = @import("baby_list.zig").BabyList; const fs = @import("fs.zig"); const bun = @import("root").bun; const string = bun.string; diff --git a/src/libarchive/libarchive.zig b/src/libarchive/libarchive.zig index 09f5c495546e12..72f887f998489b 100644 --- a/src/libarchive/libarchive.zig +++ b/src/libarchive/libarchive.zig @@ -1,6 +1,6 @@ // @link "../deps/libarchive.a" -pub const lib = @import("./libarchive-bindings.zig"); +pub const lib = @import("libarchive-bindings.zig"); const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; diff --git a/src/linker.zig b/src/linker.zig index dcaecf25e83c40..14ce81e21dfbe8 100644 --- a/src/linker.zig +++ b/src/linker.zig @@ -11,7 +11,7 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const FileDescriptorType = bun.FileDescriptor; const C = bun.C; -const Ref = @import("./ast/base.zig").Ref; +const Ref = @import("ast/base.zig").Ref; const std = @import("std"); const lex = bun.js_lexer; @@ -24,20 +24,20 @@ const js_ast = bun.JSAst; const Fs = @import("fs.zig"); const Api = @import("api/schema.zig").Api; -const Resolver = @import("./resolver/resolver.zig"); +const Resolver = @import("resolver/resolver.zig"); const sync = @import("sync.zig"); -const _import_record = @import("./import_record.zig"); +const _import_record = @import("import_record.zig"); const ImportRecord = _import_record.ImportRecord; const ImportKind = _import_record.ImportKind; -const allocators = @import("./allocators.zig"); -const MimeType = @import("./http/mime_type.zig"); -const resolve_path = @import("./resolver/resolve_path.zig"); +const allocators = @import("allocators.zig"); +const MimeType = @import("http/mime_type.zig"); +const resolve_path = @import("resolver/resolve_path.zig"); const _transpiler = bun.transpiler; const Transpiler = _transpiler.Transpiler; const ResolveQueue = _transpiler.ResolveQueue; const ResolverType = Resolver.Resolver; -const ESModule = @import("./resolver/package_json.zig").ESModule; -const Runtime = @import("./runtime.zig").Runtime; +const ESModule = @import("resolver/package_json.zig").ESModule; +const Runtime = @import("runtime.zig").Runtime; const URL = @import("url.zig").URL; const JSC = bun.JSC; const PluginRunner = bun.transpiler.PluginRunner; diff --git a/src/logger.zig b/src/logger.zig index d0af8cb71e319f..0db97be2c921a9 100644 --- a/src/logger.zig +++ b/src/logger.zig @@ -1,7 +1,7 @@ const std = @import("std"); -const Api = @import("./api/schema.zig").Api; +const Api = @import("api/schema.zig").Api; const js = bun.JSC; -const ImportKind = @import("./import_record.zig").ImportKind; +const ImportKind = @import("import_record.zig").ImportKind; const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; @@ -15,11 +15,11 @@ const C = bun.C; const JSC = bun.JSC; const fs = @import("fs.zig"); const unicode = std.unicode; -const Ref = @import("./ast/base.zig").Ref; +const Ref = @import("ast/base.zig").Ref; const expect = std.testing.expect; const assert = bun.assert; -const StringBuilder = @import("./string_builder.zig"); -const Index = @import("./ast/base.zig").Index; +const StringBuilder = @import("string_builder.zig"); +const Index = @import("ast/base.zig").Index; const OOM = bun.OOM; const JSError = bun.JSError; @@ -1308,7 +1308,7 @@ pub const Source = struct { } pub fn rangeOfIdentifier(this: *const Source, loc: Loc) Range { - const js_lexer = @import("./js_lexer.zig"); + const js_lexer = @import("js_lexer.zig"); return js_lexer.rangeOfIdentifier(this, loc); } diff --git a/src/main.zig b/src/main.zig index d3b73b7ee552c5..0e6f826b421e97 100644 --- a/src/main.zig +++ b/src/main.zig @@ -42,7 +42,7 @@ pub fn main() void { Output.Source.Stdio.init(); defer Output.flush(); if (Environment.isX64 and Environment.enableSIMD and Environment.isPosix) { - bun_warn_avx_missing(@import("./cli/upgrade_command.zig").Version.Bun__githubBaselineURL.ptr); + bun_warn_avx_missing(@import("cli/upgrade_command.zig").Version.Bun__githubBaselineURL.ptr); } bun.StackCheck.configureThread(); bun.CLI.Cli.start(bun.default_allocator); diff --git a/src/main_wasm.zig b/src/main_wasm.zig index f94e2bc914001c..8fe21cdd2e625c 100644 --- a/src/main_wasm.zig +++ b/src/main_wasm.zig @@ -2,16 +2,16 @@ const bun = @import("root").bun; const JSParser = bun.js_parser; const JSPrinter = bun.js_printer; const JSAst = bun.JSAst; -const Api = @import("./api/schema.zig").Api; +const Api = @import("api/schema.zig").Api; const Logger = bun.logger; const global = @import("root").bun; const default_allocator = global.default_allocator; const std = @import("std"); -const Define = @import("./defines.zig"); -const Options = @import("./options.zig"); -const ApiWriter = @import("./api/schema.zig").Writer; -const ApiReader = @import("./api/schema.zig").Reader; -const ImportKind = @import("./import_record.zig").ImportKind; +const Define = @import("defines.zig"); +const Options = @import("options.zig"); +const ApiWriter = @import("api/schema.zig").Writer; +const ApiReader = @import("api/schema.zig").Reader; +const ImportKind = @import("import_record.zig").ImportKind; const Output = global.Output; export var code_buffer_ptr: ?[*]const u8 = null; @@ -184,7 +184,7 @@ var error_stream = std.io.fixedBufferStream(&error_stream_buf); var output_source: global.Output.Source = undefined; var init_counter: usize = 0; export fn init(heapsize: u32) void { - const Mimalloc = @import("./allocators/mimalloc.zig"); + const Mimalloc = @import("allocators/mimalloc.zig"); defer init_counter +%= 1; if (init_counter == 0) { @@ -205,7 +205,7 @@ export fn init(heapsize: u32) void { buffer_writer = writer.ctx; } } -const Arena = @import("./allocators/mimalloc_arena.zig").Arena; +const Arena = @import("allocators/mimalloc_arena.zig").Arena; var log: Logger.Log = undefined; diff --git a/src/node_fallbacks.zig b/src/node_fallbacks.zig index 89998d3a13a9b4..d26f283bba371f 100644 --- a/src/node_fallbacks.zig +++ b/src/node_fallbacks.zig @@ -1,8 +1,8 @@ const std = @import("std"); -const string = @import("./string_types.zig").string; -const PackageJSON = @import("./resolver/package_json.zig").PackageJSON; +const string = @import("string_types.zig").string; +const PackageJSON = @import("resolver/package_json.zig").PackageJSON; const logger = bun.logger; -const Fs = @import("./fs.zig"); +const Fs = @import("fs.zig"); const bun = @import("root").bun; const Environment = bun.Environment; diff --git a/src/open.zig b/src/open.zig index c14c2895c96288..0de793ab8297bd 100644 --- a/src/open.zig +++ b/src/open.zig @@ -105,7 +105,7 @@ pub const Editor = enum(u8) { return null; } - const which = @import("./which.zig").which; + const which = @import("which.zig").which; pub fn byPATH(env: *DotEnv.Loader, buf: *bun.PathBuffer, cwd: string, out: *[]const u8) ?Editor { const PATH = env.get("PATH") orelse return null; @@ -350,7 +350,7 @@ pub const EditorContext = struct { editor: ?Editor = null, name: string = "", path: string = "", - const Fs = @import("./fs.zig"); + const Fs = @import("fs.zig"); pub fn openInEditor(this: *EditorContext, editor_: Editor, blob: []const u8, id: string, tmpdir: std.fs.Dir, line: string, column: string) void { _openInEditor(this.path, editor_, blob, id, tmpdir, line, column) catch |err| { diff --git a/src/options.zig b/src/options.zig index 63e6582d1a3618..3bf10c002f50f1 100644 --- a/src/options.zig +++ b/src/options.zig @@ -4,12 +4,12 @@ const std = @import("std"); const logger = bun.logger; const Fs = @import("fs.zig"); -const resolver = @import("./resolver/resolver.zig"); -const api = @import("./api/schema.zig"); +const resolver = @import("resolver/resolver.zig"); +const api = @import("api/schema.zig"); const Api = api.Api; -const resolve_path = @import("./resolver/resolve_path.zig"); -const URL = @import("./url.zig").URL; -const ConditionsMap = @import("./resolver/package_json.zig").ESModule.ConditionsMap; +const resolve_path = @import("resolver/resolve_path.zig"); +const URL = @import("url.zig").URL; +const ConditionsMap = @import("resolver/package_json.zig").ESModule.ConditionsMap; const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; @@ -23,12 +23,12 @@ const default_allocator = bun.default_allocator; const C = bun.C; const StoredFileDescriptorType = bun.StoredFileDescriptorType; 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; -const DotEnv = @import("./env_loader.zig"); +const Runtime = @import("runtime.zig").Runtime; +const Analytics = @import("analytics/analytics_thread.zig"); +const MacroRemap = @import("resolver/package_json.zig").MacroMap; +const DotEnv = @import("env_loader.zig"); -pub const defines = @import("./defines.zig"); +pub const defines = @import("defines.zig"); pub const Define = defines.Define; const assert = bun.assert; @@ -2645,7 +2645,7 @@ pub const RouteConfig = struct { } }; -pub const GlobalCache = @import("./resolver/resolver.zig").GlobalCache; +pub const GlobalCache = @import("resolver/resolver.zig").GlobalCache; pub const PathTemplate = struct { data: string = "", diff --git a/src/output.zig b/src/output.zig index ce10ab39502de6..dde9e27289c021 100644 --- a/src/output.zig +++ b/src/output.zig @@ -1,6 +1,6 @@ const bun = @import("root").bun; const std = @import("std"); -const Environment = @import("./env.zig"); +const Environment = @import("env.zig"); const string = bun.string; const root = @import("root"); const strings = bun.strings; @@ -11,7 +11,7 @@ const use_mimalloc = bun.use_mimalloc; const writeStream = std.json.writeStream; const WriteStream = std.json.WriteStream; -const SystemTimer = @import("./system_timer.zig").Timer; +const SystemTimer = @import("system_timer.zig").Timer; // These are threadlocal so we don't have stdout/stderr writing on top of each other threadlocal var source: Source = undefined; @@ -63,7 +63,7 @@ pub const Source = struct { if (comptime Environment.isDebug) { if (comptime use_mimalloc) { if (!source_set) { - const Mimalloc = @import("./allocators/mimalloc.zig"); + const Mimalloc = @import("allocators/mimalloc.zig"); Mimalloc.mi_option_set(.show_errors, 1); } } diff --git a/src/pool.zig b/src/pool.zig index 30e5d3e31facab..31bcf4172b0941 100644 --- a/src/pool.zig +++ b/src/pool.zig @@ -157,7 +157,7 @@ pub fn ObjectPool( } pub fn push(allocator: std.mem.Allocator, pooled: Type) void { - if (comptime @import("./env.zig").allow_assert) + if (comptime @import("env.zig").allow_assert) bun.assert(!full()); const new_node = allocator.create(LinkedList.Node) catch unreachable; diff --git a/src/renamer.zig b/src/renamer.zig index c41e4ca66c2f88..7b4b4402531cb2 100644 --- a/src/renamer.zig +++ b/src/renamer.zig @@ -10,10 +10,10 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const Ref = @import("./ast/base.zig").Ref; -const RefCtx = @import("./ast/base.zig").RefCtx; +const Ref = @import("ast/base.zig").Ref; +const RefCtx = @import("ast/base.zig").RefCtx; const logger = bun.logger; -const JSLexer = @import("./js_lexer.zig"); +const JSLexer = @import("js_lexer.zig"); pub const NoOpRenamer = struct { symbols: js_ast.Symbol.Map, diff --git a/src/resolver/dir_info.zig b/src/resolver/dir_info.zig index 5ff0767b54c0ca..f01ccc9bc8a453 100644 --- a/src/resolver/dir_info.zig +++ b/src/resolver/dir_info.zig @@ -15,8 +15,8 @@ const FeatureFlags = bun.FeatureFlags; const allocators = @import("../allocators.zig"); const DirInfo = @This(); const Fs = @import("../fs.zig"); -const TSConfigJSON = @import("./tsconfig_json.zig").TSConfigJSON; -const PackageJSON = @import("./package_json.zig").PackageJSON; +const TSConfigJSON = @import("tsconfig_json.zig").TSConfigJSON; +const PackageJSON = @import("package_json.zig").PackageJSON; pub const Index = allocators.IndexType; diff --git a/src/resolver/package_json.zig b/src/resolver/package_json.zig index c3435c06cb5929..abd9f968c1a006 100644 --- a/src/resolver/package_json.zig +++ b/src/resolver/package_json.zig @@ -17,9 +17,9 @@ const logger = bun.logger; const js_ast = bun.JSAst; const fs = @import("../fs.zig"); -const resolver = @import("./resolver.zig"); +const resolver = @import("resolver.zig"); const js_lexer = bun.js_lexer; -const resolve_path = @import("./resolve_path.zig"); +const resolve_path = @import("resolve_path.zig"); // Assume they're not going to have hundreds of main fields or browser map // so use an array-backed hash table instead of bucketed const MainFieldMap = bun.StringMap; diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig index d427747c82c518..7e3f6781b22d42 100644 --- a/src/resolver/resolver.zig +++ b/src/resolver/resolver.zig @@ -18,15 +18,15 @@ const Fs = @import("../fs.zig"); const std = @import("std"); const cache = @import("../cache.zig"); const sync = @import("../sync.zig"); -const TSConfigJSON = @import("./tsconfig_json.zig").TSConfigJSON; -const PackageJSON = @import("./package_json.zig").PackageJSON; -const MacroRemap = @import("./package_json.zig").MacroMap; -const ESModule = @import("./package_json.zig").ESModule; -const BrowserMap = @import("./package_json.zig").BrowserMap; +const TSConfigJSON = @import("tsconfig_json.zig").TSConfigJSON; +const PackageJSON = @import("package_json.zig").PackageJSON; +const MacroRemap = @import("package_json.zig").MacroMap; +const ESModule = @import("package_json.zig").ESModule; +const BrowserMap = @import("package_json.zig").BrowserMap; const CacheSet = cache.Set; -const DataURL = @import("./data_url.zig").DataURL; -pub const DirInfo = @import("./dir_info.zig"); -const ResolvePath = @import("./resolve_path.zig"); +const DataURL = @import("data_url.zig").DataURL; +pub const DirInfo = @import("dir_info.zig"); +const ResolvePath = @import("resolve_path.zig"); const NodeFallbackModules = @import("../node_fallbacks.zig"); const Mutex = bun.Mutex; const StringBoolMap = bun.StringHashMap(bool); diff --git a/src/router.zig b/src/router.zig index 23f61bf3155149..08ce835718aa6f 100644 --- a/src/router.zig +++ b/src/router.zig @@ -5,7 +5,7 @@ // All it does is resolve URL paths to the appropriate entry point and parse URL params/query. const Router = @This(); -const Api = @import("./api/schema.zig").Api; +const Api = @import("api/schema.zig").Api; const std = @import("std"); const bun = @import("root").bun; const string = bun.string; @@ -20,13 +20,13 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const StoredFileDescriptorType = bun.StoredFileDescriptorType; -const DirInfo = @import("./resolver/dir_info.zig"); -const Fs = @import("./fs.zig"); -const Options = @import("./options.zig"); -const allocators = @import("./allocators.zig"); -const URLPath = @import("./http/url_path.zig"); -const PathnameScanner = @import("./url.zig").PathnameScanner; -const CodepointIterator = @import("./string_immutable.zig").CodepointIterator; +const DirInfo = @import("resolver/dir_info.zig"); +const Fs = @import("fs.zig"); +const Options = @import("options.zig"); +const allocators = @import("allocators.zig"); +const URLPath = @import("http/url_path.zig"); +const PathnameScanner = @import("url.zig").PathnameScanner; +const CodepointIterator = @import("string_immutable.zig").CodepointIterator; const index_route_hash = @as(u32, @truncate(bun.hash("$$/index-route$$-!(@*@#&*%-901823098123"))); const arbitrary_max_route = 4096; @@ -990,7 +990,7 @@ pub const Test = struct { .extensions = &.{"js"}, }); - const Resolver = @import("./resolver/resolver.zig").Resolver; + const Resolver = @import("resolver/resolver.zig").Resolver; var logger = Logger.Log.init(default_allocator); errdefer { logger.print(Output.errorWriter()) catch {}; @@ -1027,7 +1027,7 @@ pub const Test = struct { } pub fn make(comptime testName: string, data: anytype) !Router { - std.testing.refAllDecls(@import("./bun.js/bindings/exports.zig")); + std.testing.refAllDecls(@import("bun.js/bindings/exports.zig")); try makeTest(testName, data); const JSAst = bun.JSAst; JSAst.Expr.Data.Store.create(default_allocator); @@ -1046,7 +1046,7 @@ pub const Test = struct { .extensions = &.{"js"}, }); - const Resolver = @import("./resolver/resolver.zig").Resolver; + const Resolver = @import("resolver/resolver.zig").Resolver; var logger = Logger.Log.init(default_allocator); errdefer { logger.print(Output.errorWriter()) catch {}; @@ -1604,7 +1604,7 @@ test "Github API Route Loader" { var ctx = MockRequestContextType{ .url = try URLPath.parse("/hi"), }; - const fixtures = @import("./test/fixtures.zig"); + const fixtures = @import("test/fixtures.zig"); var router = try Test.make("routes-github-api", fixtures.github_api_routes_list); { @@ -1713,7 +1713,7 @@ test "Sample Route Loader" { var ctx = MockRequestContextType{ .url = try URLPath.parse("/hi"), }; - const fixtures = @import("./test/fixtures.zig"); + const fixtures = @import("test/fixtures.zig"); var router = try Test.make("routes-sample", fixtures.sample_route_list); { diff --git a/src/runtime.zig b/src/runtime.zig index 3585fe11b04fed..83d915a45425e0 100644 --- a/src/runtime.zig +++ b/src/runtime.zig @@ -1,4 +1,4 @@ -const options = @import("./options.zig"); +const options = @import("options.zig"); const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; @@ -10,9 +10,9 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const resolve_path = @import("./resolver/resolve_path.zig"); -const Fs = @import("./fs.zig"); -const Schema = @import("./api/schema.zig"); +const resolve_path = @import("resolver/resolve_path.zig"); +const Fs = @import("fs.zig"); +const Schema = @import("api/schema.zig"); const Ref = @import("ast/base.zig").Ref; const JSAst = bun.JSAst; const content = @import("root").content; diff --git a/src/s3/client.zig b/src/s3/client.zig index 684ae76ca4eb3e..9c30ce70008f4c 100644 --- a/src/s3/client.zig +++ b/src/s3/client.zig @@ -3,20 +3,20 @@ const bun = @import("root").bun; const JSC = bun.JSC; const picohttp = bun.picohttp; -pub const ACL = @import("./acl.zig").ACL; -pub const S3HttpDownloadStreamingTask = @import("./download_stream.zig").S3HttpDownloadStreamingTask; -pub const MultiPartUploadOptions = @import("./multipart_options.zig").MultiPartUploadOptions; -pub const MultiPartUpload = @import("./multipart.zig").MultiPartUpload; +pub const ACL = @import("acl.zig").ACL; +pub const S3HttpDownloadStreamingTask = @import("download_stream.zig").S3HttpDownloadStreamingTask; +pub const MultiPartUploadOptions = @import("multipart_options.zig").MultiPartUploadOptions; +pub const MultiPartUpload = @import("multipart.zig").MultiPartUpload; -pub const Error = @import("./error.zig"); +pub const Error = @import("error.zig"); pub const throwSignError = Error.throwSignError; pub const getJSSignError = Error.getJSSignError; -const Credentials = @import("./credentials.zig"); +const Credentials = @import("credentials.zig"); pub const S3Credentials = Credentials.S3Credentials; pub const S3CredentialsWithOptions = Credentials.S3CredentialsWithOptions; -const S3SimpleRequest = @import("./simple_request.zig"); +const S3SimpleRequest = @import("simple_request.zig"); pub const S3HttpSimpleTask = S3SimpleRequest.S3HttpSimpleTask; pub const S3UploadResult = S3SimpleRequest.S3UploadResult; pub const S3StatResult = S3SimpleRequest.S3StatResult; diff --git a/src/s3/credentials.zig b/src/s3/credentials.zig index b72c0b8c886d00..470fb18335e4de 100644 --- a/src/s3/credentials.zig +++ b/src/s3/credentials.zig @@ -2,8 +2,8 @@ const bun = @import("root").bun; const picohttp = bun.picohttp; const std = @import("std"); -const MultiPartUploadOptions = @import("./multipart_options.zig").MultiPartUploadOptions; -const ACL = @import("./acl.zig").ACL; +const MultiPartUploadOptions = @import("multipart_options.zig").MultiPartUploadOptions; +const ACL = @import("acl.zig").ACL; const JSC = bun.JSC; const RareData = JSC.RareData; const strings = bun.strings; diff --git a/src/s3/download_stream.zig b/src/s3/download_stream.zig index fd2470b19b4fd0..38bee1ca0ef0aa 100644 --- a/src/s3/download_stream.zig +++ b/src/s3/download_stream.zig @@ -2,8 +2,8 @@ const std = @import("std"); const bun = @import("root").bun; const JSC = bun.JSC; const picohttp = JSC.WebCore.picohttp; -const S3Error = @import("./error.zig").S3Error; -const S3Credentials = @import("./credentials.zig").S3Credentials; +const S3Error = @import("error.zig").S3Error; +const S3Credentials = @import("credentials.zig").S3Credentials; const SignResult = S3Credentials.SignResult; const strings = bun.strings; const log = bun.Output.scoped(.S3, true); diff --git a/src/s3/multipart.zig b/src/s3/multipart.zig index af5a37ebcb8793..a3768c9b7d54d9 100644 --- a/src/s3/multipart.zig +++ b/src/s3/multipart.zig @@ -1,13 +1,13 @@ const std = @import("std"); const bun = @import("root").bun; const strings = bun.strings; -const S3Credentials = @import("./credentials.zig").S3Credentials; -const ACL = @import("./acl.zig").ACL; +const S3Credentials = @import("credentials.zig").S3Credentials; +const ACL = @import("acl.zig").ACL; const JSC = bun.JSC; -const MultiPartUploadOptions = @import("./multipart_options.zig").MultiPartUploadOptions; -const S3SimpleRequest = @import("./simple_request.zig"); +const MultiPartUploadOptions = @import("multipart_options.zig").MultiPartUploadOptions; +const S3SimpleRequest = @import("simple_request.zig"); const executeSimpleS3Request = S3SimpleRequest.executeSimpleS3Request; -const S3Error = @import("./error.zig").S3Error; +const S3Error = @import("error.zig").S3Error; pub const MultiPartUpload = struct { const OneMiB: usize = MultiPartUploadOptions.OneMiB; diff --git a/src/s3/simple_request.zig b/src/s3/simple_request.zig index d9a6891b7b1997..dffab387f35fda 100644 --- a/src/s3/simple_request.zig +++ b/src/s3/simple_request.zig @@ -2,12 +2,12 @@ const std = @import("std"); const bun = @import("root").bun; const JSC = bun.JSC; const strings = bun.strings; -const SignResult = @import("./credentials.zig").S3Credentials.SignResult; -const S3Error = @import("./error.zig").S3Error; -const getSignErrorCodeAndMessage = @import("./error.zig").getSignErrorCodeAndMessage; -const S3Credentials = @import("./credentials.zig").S3Credentials; +const SignResult = @import("credentials.zig").S3Credentials.SignResult; +const S3Error = @import("error.zig").S3Error; +const getSignErrorCodeAndMessage = @import("error.zig").getSignErrorCodeAndMessage; +const S3Credentials = @import("credentials.zig").S3Credentials; const picohttp = bun.picohttp; -const ACL = @import("./acl.zig").ACL; +const ACL = @import("acl.zig").ACL; pub const S3StatResult = union(enum) { success: struct { size: usize = 0, diff --git a/src/shell/braces.zig b/src/shell/braces.zig index 3532be44f86520..cd9a172e06e0ce 100644 --- a/src/shell/braces.zig +++ b/src/shell/braces.zig @@ -402,7 +402,7 @@ pub const Parser = struct { fn has_eq_sign(self: *Parser, str: []const u8) ?u32 { _ = self; - return @import("./shell.zig").hasEqSign(str); + return @import("shell.zig").hasEqSign(str); } fn advance(self: *Parser) Token { @@ -590,8 +590,8 @@ pub fn buildExpansionTable( } } -const Encoding = @import("./shell.zig").StringEncoding; -const NewChars = @import("./shell.zig").ShellCharIter; +const Encoding = @import("shell.zig").StringEncoding; +const NewChars = @import("shell.zig").ShellCharIter; pub const Lexer = NewLexer(.ascii); diff --git a/src/shell/interpreter.zig b/src/shell/interpreter.zig index 6fb90f25ac40e6..9b11fda0dbdb2c 100644 --- a/src/shell/interpreter.zig +++ b/src/shell/interpreter.zig @@ -29,7 +29,7 @@ const JSValue = bun.JSC.JSValue; const JSPromise = bun.JSC.JSPromise; const JSGlobalObject = bun.JSC.JSGlobalObject; const which = @import("../which.zig").which; -const Braces = @import("./braces.zig"); +const Braces = @import("braces.zig"); const Syscall = @import("../sys.zig"); const Glob = @import("../glob.zig"); const ResolvePath = @import("../resolver/resolve_path.zig"); @@ -44,7 +44,7 @@ const Maybe = JSC.Maybe; const WTFStringImplStruct = @import("../string.zig").WTFStringImplStruct; const Pipe = [2]bun.FileDescriptor; -const shell = @import("./shell.zig"); +const shell = @import("shell.zig"); const Token = shell.Token; const ShellError = shell.ShellError; const ast = shell.AST; diff --git a/src/shell/shell.zig b/src/shell/shell.zig index 481c0581e942be..2330d7ef610627 100644 --- a/src/shell/shell.zig +++ b/src/shell/shell.zig @@ -9,7 +9,7 @@ const JSValue = bun.JSC.JSValue; const JSPromise = bun.JSC.JSPromise; const JSGlobalObject = bun.JSC.JSGlobalObject; const Which = @import("../which.zig"); -const Braces = @import("./braces.zig"); +const Braces = @import("braces.zig"); const Syscall = @import("../sys.zig"); const Glob = @import("../glob.zig"); const ResolvePath = @import("../resolver/resolve_path.zig"); @@ -18,8 +18,8 @@ const CodepointIterator = @import("../string_immutable.zig").PackedCodepointIter const isAllAscii = @import("../string_immutable.zig").isAllASCII; const TaggedPointerUnion = @import("../tagged_pointer.zig").TaggedPointerUnion; -pub const interpret = @import("./interpreter.zig"); -pub const subproc = @import("./subproc.zig"); +pub const interpret = @import("interpreter.zig"); +pub const subproc = @import("subproc.zig"); pub const EnvMap = interpret.EnvMap; pub const EnvStr = interpret.EnvStr; diff --git a/src/shell/subproc.zig b/src/shell/subproc.zig index 672abdcf22d5df..6a7169aa41d24c 100644 --- a/src/shell/subproc.zig +++ b/src/shell/subproc.zig @@ -20,7 +20,7 @@ const sh = bun.shell; const PosixSpawn = bun.spawn; -const util = @import("./util.zig"); +const util = @import("util.zig"); pub const Stdio = util.Stdio; const FileSink = JSC.WebCore.FileSink; diff --git a/src/sourcemap/sourcemap.zig b/src/sourcemap/sourcemap.zig index 41ddfd67f13d67..61599aad390fb9 100644 --- a/src/sourcemap/sourcemap.zig +++ b/src/sourcemap/sourcemap.zig @@ -1956,4 +1956,4 @@ pub const DebugIDFormatter = struct { const assert = bun.assert; -pub usingnamespace @import("./CodeCoverage.zig"); +pub usingnamespace @import("CodeCoverage.zig"); diff --git a/src/sql/postgres.zig b/src/sql/postgres.zig index c0f2bbef847e23..f08c070f838a05 100644 --- a/src/sql/postgres.zig +++ b/src/sql/postgres.zig @@ -114,8 +114,8 @@ pub const Data = union(enum) { }; } }; -pub const protocol = @import("./postgres/postgres_protocol.zig"); -pub const types = @import("./postgres/postgres_types.zig"); +pub const protocol = @import("postgres/postgres_protocol.zig"); +pub const types = @import("postgres/postgres_types.zig"); const Socket = uws.AnySocket; const PreparedStatementsMap = std.HashMapUnmanaged(u64, *PostgresSQLStatement, bun.IdentityContext(u64), 80); diff --git a/src/string_immutable.zig b/src/string_immutable.zig index db9db240b6160a..08510c4d046b0d 100644 --- a/src/string_immutable.zig +++ b/src/string_immutable.zig @@ -1,13 +1,13 @@ const std = @import("std"); const expect = std.testing.expect; -const Environment = @import("./env.zig"); +const Environment = @import("env.zig"); const string = bun.string; const stringZ = bun.stringZ; const CodePoint = bun.CodePoint; const bun = @import("root").bun; const log = bun.Output.scoped(.STR, true); -const js_lexer = @import("./js_lexer.zig"); -const grapheme = @import("./grapheme.zig"); +const js_lexer = @import("js_lexer.zig"); +const grapheme = @import("grapheme.zig"); const JSC = bun.JSC; const OOM = bun.OOM; diff --git a/src/string_mutable.zig b/src/string_mutable.zig index 0a78d7335f94a0..7165cf8e449df8 100644 --- a/src/string_mutable.zig +++ b/src/string_mutable.zig @@ -91,7 +91,7 @@ pub const MutableString = struct { if (!iterator.next(&cursor)) return "_"; - const JSLexerTables = @import("./js_lexer_tables.zig"); + const JSLexerTables = @import("js_lexer_tables.zig"); // Common case: no gap necessary. No allocation necessary. needs_gap = !js_lexer.isIdentifierStart(cursor.c); diff --git a/src/string_types.zig b/src/string_types.zig index 7e6a8f97674b51..a47907bac0b74d 100644 --- a/src/string_types.zig +++ b/src/string_types.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const BabyList = @import("./baby_list.zig").BabyList; +const BabyList = @import("baby_list.zig").BabyList; pub const string = []const u8; pub const stringZ = [:0]const u8; pub const stringMutable = []u8; diff --git a/src/sys.zig b/src/sys.zig index fa7d22c4dff856..a7a5a12ccd2782 100644 --- a/src/sys.zig +++ b/src/sys.zig @@ -25,7 +25,7 @@ const SystemError = JSC.SystemError; const linux = syscall; -pub const sys_uv = if (Environment.isWindows) @import("./sys_uv.zig") else Syscall; +pub const sys_uv = if (Environment.isWindows) @import("sys_uv.zig") else Syscall; const log = bun.Output.scoped(.SYS, false); pub const syslog = log; @@ -3613,5 +3613,5 @@ pub inline fn toLibUVOwnedFD( }; } -pub const Dir = @import("./dir.zig"); +pub const Dir = @import("dir.zig"); const FILE_SHARE = w.FILE_SHARE_WRITE | w.FILE_SHARE_READ | w.FILE_SHARE_DELETE; diff --git a/src/sys_uv.zig b/src/sys_uv.zig index 75557717a15594..b5b12f5c1016b1 100644 --- a/src/sys_uv.zig +++ b/src/sys_uv.zig @@ -417,4 +417,4 @@ pub inline fn write(fd: FileDescriptor, buf: []const u8) Maybe(usize) { return writev(fd, &bufs); } -pub const Tag = @import("./sys.zig").Tag; +pub const Tag = @import("sys.zig").Tag; diff --git a/src/system_timer.zig b/src/system_timer.zig index 1c7b88cb6835de..4b3efbd04cd608 100644 --- a/src/system_timer.zig +++ b/src/system_timer.zig @@ -1,4 +1,4 @@ -const Environment = @import("./env.zig"); +const Environment = @import("env.zig"); const std = @import("std"); fn NewTimer() type { diff --git a/src/tagged_pointer.zig b/src/tagged_pointer.zig index f81aa656b3a111..60c3304fc46228 100644 --- a/src/tagged_pointer.zig +++ b/src/tagged_pointer.zig @@ -7,7 +7,7 @@ const Environment = bun.Environment; const strings = bun.strings; const default_allocator = bun.default_allocator; const C = bun.C; -const typeBaseName = @import("./meta.zig").typeBaseName; +const typeBaseName = @import("meta.zig").typeBaseName; const TagSize = u15; const AddressableSize = u49; diff --git a/src/thread_pool.zig b/src/thread_pool.zig index 4186d489c2a08c..0f9d8e16d27218 100644 --- a/src/thread_pool.zig +++ b/src/thread_pool.zig @@ -4,7 +4,7 @@ const std = @import("std"); const bun = @import("root").bun; const ThreadPool = @This(); -const Futex = @import("./futex.zig"); +const Futex = @import("futex.zig"); const Environment = bun.Environment; const assert = bun.assert; diff --git a/src/toml/toml_parser.zig b/src/toml/toml_parser.zig index 0d07d49714394f..19c4463272fdc2 100644 --- a/src/toml/toml_parser.zig +++ b/src/toml/toml_parser.zig @@ -1,6 +1,6 @@ const std = @import("std"); const logger = bun.logger; -const toml_lexer = @import("./toml_lexer.zig"); +const toml_lexer = @import("toml_lexer.zig"); const Lexer = toml_lexer.Lexer; const importRecord = @import("../import_record.zig"); const js_ast = bun.JSAst; diff --git a/src/transpiler.zig b/src/transpiler.zig index 54ec22dff3fb7d..d6f5afde726de1 100644 --- a/src/transpiler.zig +++ b/src/transpiler.zig @@ -21,37 +21,37 @@ const js_ast = bun.JSAst; const linker = @import("linker.zig"); const Ref = @import("ast/base.zig").Ref; const Define = @import("defines.zig").Define; -const DebugOptions = @import("./cli.zig").Command.DebugOptions; -const ThreadPoolLib = @import("./thread_pool.zig"); +const DebugOptions = @import("cli.zig").Command.DebugOptions; +const ThreadPoolLib = @import("thread_pool.zig"); const Fs = @import("fs.zig"); const schema = @import("api/schema.zig"); const Api = schema.Api; -const _resolver = @import("./resolver/resolver.zig"); +const _resolver = @import("resolver/resolver.zig"); const sync = @import("sync.zig"); -const ImportRecord = @import("./import_record.zig").ImportRecord; -const allocators = @import("./allocators.zig"); -const MimeType = @import("./http/mime_type.zig"); -const resolve_path = @import("./resolver/resolve_path.zig"); -const runtime = @import("./runtime.zig"); -const PackageJSON = @import("./resolver/package_json.zig").PackageJSON; -const MacroRemap = @import("./resolver/package_json.zig").MacroMap; +const ImportRecord = @import("import_record.zig").ImportRecord; +const allocators = @import("allocators.zig"); +const MimeType = @import("http/mime_type.zig"); +const resolve_path = @import("resolver/resolve_path.zig"); +const runtime = @import("runtime.zig"); +const PackageJSON = @import("resolver/package_json.zig").PackageJSON; +const MacroRemap = @import("resolver/package_json.zig").MacroMap; const DebugLogs = _resolver.DebugLogs; -const Router = @import("./router.zig"); +const Router = @import("router.zig"); const isPackagePath = _resolver.isPackagePath; const Css = @import("css_scanner.zig"); -const DotEnv = @import("./env_loader.zig"); +const DotEnv = @import("env_loader.zig"); const Lock = bun.Mutex; -const NodeFallbackModules = @import("./node_fallbacks.zig"); -const CacheEntry = @import("./cache.zig").FsCacheEntry; -const Analytics = @import("./analytics/analytics_thread.zig"); -const URL = @import("./url.zig").URL; +const NodeFallbackModules = @import("node_fallbacks.zig"); +const CacheEntry = @import("cache.zig").FsCacheEntry; +const Analytics = @import("analytics/analytics_thread.zig"); +const URL = @import("url.zig").URL; const Linker = linker.Linker; const Resolver = _resolver.Resolver; -const TOML = @import("./toml/toml_parser.zig").TOML; +const TOML = @import("toml/toml_parser.zig").TOML; const JSC = bun.JSC; -const PackageManager = @import("./install/install.zig").PackageManager; -const DataURL = @import("./resolver/data_url.zig").DataURL; +const PackageManager = @import("install/install.zig").PackageManager; +const DataURL = @import("resolver/data_url.zig").DataURL; pub fn MacroJSValueType_() type { if (comptime JSC.is_bindgen) { @@ -64,8 +64,8 @@ pub fn MacroJSValueType_() type { pub const MacroJSValueType = MacroJSValueType_(); const default_macro_js_value = if (JSC.is_bindgen) MacroJSValueType{} else JSC.JSValue.zero; -const EntryPoints = @import("./bundler/entry_points.zig"); -const SystemTimer = @import("./system_timer.zig").Timer; +const EntryPoints = @import("bundler/entry_points.zig"); +const SystemTimer = @import("system_timer.zig").Timer; pub usingnamespace EntryPoints; pub const ParseResult = struct { source: logger.Source, diff --git a/src/url.zig b/src/url.zig index f96325ade9efd4..27646db9307e8e 100644 --- a/src/url.zig +++ b/src/url.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const Api = @import("./api/schema.zig").Api; -const resolve_path = @import("./resolver/resolve_path.zig"); +const Api = @import("api/schema.zig").Api; +const resolve_path = @import("resolver/resolve_path.zig"); const bun = @import("root").bun; const string = bun.string; const Output = bun.Output; @@ -1262,7 +1262,7 @@ pub const FormData = struct { } }; -const ParamsList = @import("./router.zig").Param.List; +const ParamsList = @import("router.zig").Param.List; pub const CombinedScanner = struct { query: Scanner, pathname: PathnameScanner, diff --git a/src/watcher.zig b/src/watcher.zig index 1cd75586b57448..4424cd0a3748d5 100644 --- a/src/watcher.zig +++ b/src/watcher.zig @@ -7,12 +7,12 @@ const Environment = bun.Environment; const strings = bun.strings; const stringZ = bun.stringZ; const FeatureFlags = bun.FeatureFlags; -const options = @import("./options.zig"); +const options = @import("options.zig"); const Mutex = bun.Mutex; -const Futex = @import("./futex.zig"); +const Futex = @import("futex.zig"); pub const WatchItemIndex = u16; -const PackageJSON = @import("./resolver/package_json.zig").PackageJSON; +const PackageJSON = @import("resolver/package_json.zig").PackageJSON; const log = bun.Output.scoped(.watcher, false); diff --git a/src/windows.zig b/src/windows.zig index b7d7d6860cba40..55977963ecf24e 100644 --- a/src/windows.zig +++ b/src/windows.zig @@ -2982,7 +2982,7 @@ pub const Win32Error = enum(u16) { } }; -pub const libuv = @import("./deps/libuv.zig"); +pub const libuv = @import("deps/libuv.zig"); pub extern fn GetProcAddress( ptr: ?*anyopaque, diff --git a/src/windows_c.zig b/src/windows_c.zig index df725226c65c49..b6b926f5e21828 100644 --- a/src/windows_c.zig +++ b/src/windows_c.zig @@ -1067,7 +1067,7 @@ pub const UV_EUNATCH = -uv.UV_EUNATCH; pub const off_t = i64; pub fn preallocate_file(_: posix.fd_t, _: off_t, _: off_t) !void {} -const uv = @import("./deps/libuv.zig"); +const uv = @import("deps/libuv.zig"); pub const E = enum(u16) { SUCCESS = 0, diff --git a/src/zlib.zig b/src/zlib.zig index 537d047709d8a2..15c0602fb78288 100644 --- a/src/zlib.zig +++ b/src/zlib.zig @@ -3,7 +3,7 @@ const std = @import("std"); const bun = @import("root").bun; -const mimalloc = @import("./allocators/mimalloc.zig"); +const mimalloc = @import("allocators/mimalloc.zig"); pub const MIN_WBITS = 8; pub const MAX_WBITS = 15;