diff options
Diffstat (limited to 'src')
153 files changed, 594 insertions, 635 deletions
diff --git a/src/__global.zig b/src/__global.zig index fd10a67d5..d284c0f3a 100644 --- a/src/__global.zig +++ b/src/__global.zig @@ -2,9 +2,9 @@ const std = @import("std"); const Environment = @import("./env.zig"); const Output = @import("output.zig"); -const use_mimalloc = @import("./global.zig").use_mimalloc; +const use_mimalloc = @import("bun").use_mimalloc; const StringTypes = @import("./string_types.zig"); -const Mimalloc = @import("./global.zig").Mimalloc; +const Mimalloc = @import("bun").Mimalloc; const BASE_VERSION = "0.3"; @@ -43,7 +43,7 @@ else pub inline fn getStartTime() i128 { if (Environment.isTest) return 0; - return @import("root").start_time; + return @import("bun").start_time; } pub const version: @import("./install/semver.zig").Version = .{ @@ -134,7 +134,7 @@ pub fn crash() noreturn { } const Global = @This(); -const string = @import("./global.zig").string; +const string = @import("bun").string; pub const BunInfo = struct { bun_version: string, diff --git a/src/allocators.zig b/src/allocators.zig index e5f990fef..4d300c0eb 100644 --- a/src/allocators.zig +++ b/src/allocators.zig @@ -4,8 +4,8 @@ const FeatureFlags = @import("./feature_flags.zig"); const Environment = @import("./env.zig"); const Wyhash = std.hash.Wyhash; const FixedBufferAllocator = std.heap.FixedBufferAllocator; -const constStrToU8 = @import("./global.zig").constStrToU8; -const bun = @import("./global.zig"); +const constStrToU8 = @import("bun").constStrToU8; +const bun = @import("bun"); pub fn isSliceInBuffer(slice: anytype, buffer: anytype) bool { return (@ptrToInt(&buffer) <= @ptrToInt(slice.ptr) and (@ptrToInt(slice.ptr) + slice.len) <= (@ptrToInt(buffer) + buffer.len)); } @@ -75,7 +75,7 @@ fn OverflowGroup(comptime Block: type) type { // ...right? const max = 4095; const UsedSize = std.math.IntFittingRange(0, max + 1); - const default_allocator = @import("./global.zig").default_allocator; + const default_allocator = @import("bun").default_allocator; used: UsedSize = 0, allocated: UsedSize = 0, ptrs: [max]*Block = undefined, diff --git a/src/analytics/analytics_thread.zig b/src/analytics/analytics_thread.zig index b57a1d8a4..21c09f2f3 100644 --- a/src/analytics/analytics_thread.zig +++ b/src/analytics/analytics_thread.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -12,13 +12,13 @@ const C = bun.C; const sync = @import("../sync.zig"); const std = @import("std"); -const HTTP = @import("http"); +const HTTP = @import("bun").HTTP; const NetworkThread = HTTP.NetworkThread; const URL = @import("../url.zig").URL; const Fs = @import("../fs.zig"); const Analytics = @import("./analytics_schema.zig").analytics; const Writer = @import("./analytics_schema.zig").Writer; -const Headers = @import("http").Headers; +const Headers = @import("bun").HTTP.Headers; const Futex = @import("../futex.zig"); const Semver = @import("../install/semver.zig"); @@ -465,7 +465,7 @@ pub const EventList = struct { var in_buffer = &this.in_buffer; var buffer_writer = in_buffer.writer(); var analytics_writer = AnalyticsWriter.init(&buffer_writer); - const Root = @import("root"); + const Root = @import("bun"); const start_time: i128 = if (@hasDecl(Root, "start_time")) Root.start_time else diff --git a/src/baby_list.zig b/src/baby_list.zig index 6b60b92c6..298727c0b 100644 --- a/src/baby_list.zig +++ b/src/baby_list.zig @@ -1,7 +1,7 @@ const std = @import("std"); const Environment = @import("./env.zig"); const strings = @import("./string_immutable.zig"); -const bun = @import("./global.zig"); +const bun = @import("bun"); // -- Failed Experiment -- // Delete this code later diff --git a/src/bench/string-handling.zig b/src/bench/string-handling.zig index b3dda0ca3..061bc3449 100644 --- a/src/bench/string-handling.zig +++ b/src/bench/string-handling.zig @@ -1,4 +1,4 @@ -const strings = @import("strings"); +const strings = @import("bun").strings; const std = @import("std"); pub fn main() anyerror!void { diff --git a/src/bindgen.zig b/src/bindgen.zig index 919ae4eaa..718d68cfe 100644 --- a/src/bindgen.zig +++ b/src/bindgen.zig @@ -3,3 +3,5 @@ pub const bindgen = true; pub const main = @import("./bun.js/bindings/bindings-generator.zig").main; pub export fn PLCrashReportHandler(_: ?*anyopaque) void {} pub export fn mkdirp(_: ?*anyopaque) void {} + +pub usingnamespace @import("./bun.zig"); diff --git a/src/blob.zig b/src/blob.zig index 092abf46b..80ccfe20d 100644 --- a/src/blob.zig +++ b/src/blob.zig @@ -1,6 +1,6 @@ const std = @import("std"); const Lock = @import("./lock.zig").Lock; -const bun = @import("./global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/boringssl.zig b/src/boringssl.zig index 248c1f152..3a33d2249 100644 --- a/src/boringssl.zig +++ b/src/boringssl.zig @@ -1,6 +1,7 @@ const boring = @import("./deps/boringssl.translated.zig"); pub usingnamespace boring; const std = @import("std"); +const bun = @import("bun"); const builtin = @import("builtin"); var loaded = false; @@ -53,20 +54,17 @@ pub fn initClient() *boring.SSL { // may result in deadlocks, crashes, or memory corruption. export fn OPENSSL_memory_alloc(size: usize) ?*anyopaque { - const global = @import("./global.zig"); - return global.Mimalloc.mi_malloc(size); + return bun.Mimalloc.mi_malloc(size); } // BoringSSL always expects memory to be zero'd export fn OPENSSL_memory_free(ptr: *anyopaque) void { - const global = @import("./global.zig"); - @memset(@ptrCast([*]u8, ptr), 0, global.Mimalloc.mi_usable_size(ptr)); - global.Mimalloc.mi_free(ptr); + @memset(@ptrCast([*]u8, ptr), 0, bun.Mimalloc.mi_usable_size(ptr)); + bun.Mimalloc.mi_free(ptr); } export fn OPENSSL_memory_get_size(ptr: ?*const anyopaque) usize { - const global = @import("./global.zig"); - return global.Mimalloc.mi_usable_size(ptr); + return bun.Mimalloc.mi_usable_size(ptr); } test "load" { diff --git a/src/builder.zig b/src/builder.zig index a25acf554..10c81aaf8 100644 --- a/src/builder.zig +++ b/src/builder.zig @@ -1,7 +1,7 @@ const Allocator = @import("std").mem.Allocator; const assert = @import("std").debug.assert; const copy = @import("std").mem.copy; -const io = @import("io"); +const io = @import("bun").AsyncIO; pub fn Builder(comptime Type: type) type { return struct { const This = @This(); diff --git a/src/bun.js/api/bun.zig b/src/bun.js/api/bun.zig index f993bc86e..087d35250 100644 --- a/src/bun.js/api/bun.zig +++ b/src/bun.js/api/bun.zig @@ -1,13 +1,13 @@ const Bun = @This(); -const default_allocator = @import("../../global.zig").default_allocator; -const bun = @import("../../global.zig"); +const default_allocator = @import("bun").default_allocator; +const bun = @import("bun"); const Environment = bun.Environment; -const NetworkThread = @import("http").NetworkThread; +const NetworkThread = @import("bun").HTTP.NetworkThread; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("../../global.zig").Output; -const MutableString = @import("../../global.zig").MutableString; +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; const IdentityContext = @import("../../identity_context.zig").IdentityContext; @@ -16,7 +16,7 @@ const Resolver = @import("../../resolver/resolver.zig"); const ast = @import("../../import_record.zig"); const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle; const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint; -const logger = @import("../../logger.zig"); +const logger = @import("bun").logger; const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = @import("../../bundler.zig").Bundler; @@ -29,7 +29,7 @@ const http = @import("../../http.zig"); const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../../analytics/analytics_thread.zig"); -const ZigString = @import("../../jsc.zig").ZigString; +const ZigString = @import("bun").JSC.ZigString; const Runtime = @import("../../runtime.zig"); const Router = @import("./filesystem_router.zig"); const ImportRecord = ast.ImportRecord; @@ -37,39 +37,39 @@ const DotEnv = @import("../../env_loader.zig"); const ParseResult = @import("../../bundler.zig").ParseResult; const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../../resolver/package_json.zig").MacroMap; -const WebCore = @import("../../jsc.zig").WebCore; +const WebCore = @import("bun").JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; -const js = @import("../../jsc.zig").C; -const JSC = @import("../../jsc.zig"); +const js = @import("bun").JSC.C; +const JSC = @import("bun").JSC; const JSError = @import("../base.zig").JSError; const d = @import("../base.zig").d; const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer; const getAllocator = @import("../base.zig").getAllocator; -const JSValue = @import("../../jsc.zig").JSValue; +const JSValue = @import("bun").JSC.JSValue; const NewClass = @import("../base.zig").NewClass; -const Microtask = @import("../../jsc.zig").Microtask; -const JSGlobalObject = @import("../../jsc.zig").JSGlobalObject; -const ExceptionValueRef = @import("../../jsc.zig").ExceptionValueRef; -const JSPrivateDataPtr = @import("../../jsc.zig").JSPrivateDataPtr; -const ZigConsoleClient = @import("../../jsc.zig").ZigConsoleClient; -const Node = @import("../../jsc.zig").Node; -const ZigException = @import("../../jsc.zig").ZigException; -const ZigStackTrace = @import("../../jsc.zig").ZigStackTrace; -const ErrorableResolvedSource = @import("../../jsc.zig").ErrorableResolvedSource; -const ResolvedSource = @import("../../jsc.zig").ResolvedSource; -const JSPromise = @import("../../jsc.zig").JSPromise; -const JSInternalPromise = @import("../../jsc.zig").JSInternalPromise; -const JSModuleLoader = @import("../../jsc.zig").JSModuleLoader; -const JSPromiseRejectionOperation = @import("../../jsc.zig").JSPromiseRejectionOperation; -const Exception = @import("../../jsc.zig").Exception; -const ErrorableZigString = @import("../../jsc.zig").ErrorableZigString; -const ZigGlobalObject = @import("../../jsc.zig").ZigGlobalObject; -const VM = @import("../../jsc.zig").VM; -const JSFunction = @import("../../jsc.zig").JSFunction; +const Microtask = @import("bun").JSC.Microtask; +const JSGlobalObject = @import("bun").JSC.JSGlobalObject; +const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef; +const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr; +const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient; +const Node = @import("bun").JSC.Node; +const ZigException = @import("bun").JSC.ZigException; +const ZigStackTrace = @import("bun").JSC.ZigStackTrace; +const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource; +const ResolvedSource = @import("bun").JSC.ResolvedSource; +const JSPromise = @import("bun").JSC.JSPromise; +const JSInternalPromise = @import("bun").JSC.JSInternalPromise; +const JSModuleLoader = @import("bun").JSC.JSModuleLoader; +const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation; +const Exception = @import("bun").JSC.Exception; +const ErrorableZigString = @import("bun").JSC.ErrorableZigString; +const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject; +const VM = @import("bun").JSC.VM; +const JSFunction = @import("bun").JSC.JSFunction; const Config = @import("../config.zig"); const URL = @import("../../url.zig").URL; const Transpiler = @import("./transpiler.zig"); @@ -2270,7 +2270,7 @@ pub const Timer = struct { return VirtualMachine.vm.timer.last_id; } - const uws = @import("uws"); + const uws = @import("bun").uws; // TODO: reference count to avoid multiple Strong references to the same // object in setInterval diff --git a/src/bun.js/api/bun/socket.zig b/src/bun.js/api/bun/socket.zig index 2405996cf..78829f428 100644 --- a/src/bun.js/api/bun/socket.zig +++ b/src/bun.js/api/bun/socket.zig @@ -1,19 +1,19 @@ -const default_allocator = @import("../../../global.zig").default_allocator; -const bun = @import("../../../global.zig"); +const default_allocator = @import("bun").default_allocator; +const bun = @import("bun"); const Environment = bun.Environment; -const NetworkThread = @import("http").NetworkThread; +const NetworkThread = @import("bun").HTTP.NetworkThread; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("../../../global.zig").Output; -const MutableString = @import("../../../global.zig").MutableString; +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const Which = @import("../../../which.zig"); -const uws = @import("uws"); +const uws = @import("bun").uws; const ZigString = JSC.ZigString; // const Corker = struct { // ptr: ?*[16384]u8 = null, diff --git a/src/bun.js/api/bun/spawn.zig b/src/bun.js/api/bun/spawn.zig index afcc5509b..7ed36cf34 100644 --- a/src/bun.js/api/bun/spawn.zig +++ b/src/bun.js/api/bun/spawn.zig @@ -1,5 +1,5 @@ -const JSC = @import("javascript_core"); -const bun = @import("../../../global.zig"); +const JSC = @import("bun").JSC; +const bun = @import("bun"); const string = bun.string; const std = @import("std"); diff --git a/src/bun.js/api/bun/subprocess.zig b/src/bun.js/api/bun/subprocess.zig index d4fc06e2d..0f70a763c 100644 --- a/src/bun.js/api/bun/subprocess.zig +++ b/src/bun.js/api/bun/subprocess.zig @@ -1,16 +1,16 @@ const Bun = @This(); -const default_allocator = @import("../../../global.zig").default_allocator; -const bun = @import("../../../global.zig"); +const default_allocator = @import("bun").default_allocator; +const bun = @import("bun"); const Environment = bun.Environment; -const NetworkThread = @import("http").NetworkThread; +const NetworkThread = @import("bun").HTTP.NetworkThread; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("../../../global.zig").Output; -const MutableString = @import("../../../global.zig").MutableString; +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; const Which = @import("../../../which.zig"); diff --git a/src/bun.js/api/ffi.zig b/src/bun.js/api/ffi.zig index a1d0640b2..042ac37fa 100644 --- a/src/bun.js/api/ffi.zig +++ b/src/bun.js/api/ffi.zig @@ -1,13 +1,13 @@ const Bun = @This(); -const default_allocator = @import("../../global.zig").default_allocator; -const bun = @import("../../global.zig"); +const default_allocator = @import("bun").default_allocator; +const bun = @import("bun"); const Environment = bun.Environment; -const NetworkThread = @import("http").NetworkThread; +const NetworkThread = @import("bun").HTTP.NetworkThread; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("../../global.zig").Output; -const MutableString = @import("../../global.zig").MutableString; +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; const IdentityContext = @import("../../identity_context.zig").IdentityContext; @@ -16,7 +16,7 @@ const Resolver = @import("../../resolver/resolver.zig"); const ast = @import("../../import_record.zig"); const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle; const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint; -const logger = @import("../../logger.zig"); +const logger = @import("bun").logger; const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = @import("../../bundler.zig").Bundler; @@ -29,46 +29,46 @@ const http = @import("../../http.zig"); const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../../analytics/analytics_thread.zig"); -const ZigString = @import("../../jsc.zig").ZigString; +const ZigString = @import("bun").JSC.ZigString; const Runtime = @import("../../runtime.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../../env_loader.zig"); const ParseResult = @import("../../bundler.zig").ParseResult; const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../../resolver/package_json.zig").MacroMap; -const WebCore = @import("../../jsc.zig").WebCore; +const WebCore = @import("bun").JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; -const js = @import("../../jsc.zig").C; -const JSC = @import("../../jsc.zig"); +const js = @import("bun").JSC.C; +const JSC = @import("bun").JSC; const JSError = @import("../base.zig").JSError; const d = @import("../base.zig").d; const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer; const getAllocator = @import("../base.zig").getAllocator; -const JSValue = @import("../../jsc.zig").JSValue; +const JSValue = @import("bun").JSC.JSValue; const NewClass = @import("../base.zig").NewClass; -const Microtask = @import("../../jsc.zig").Microtask; -const JSGlobalObject = @import("../../jsc.zig").JSGlobalObject; -const ExceptionValueRef = @import("../../jsc.zig").ExceptionValueRef; -const JSPrivateDataPtr = @import("../../jsc.zig").JSPrivateDataPtr; -const ZigConsoleClient = @import("../../jsc.zig").ZigConsoleClient; -const Node = @import("../../jsc.zig").Node; -const ZigException = @import("../../jsc.zig").ZigException; -const ZigStackTrace = @import("../../jsc.zig").ZigStackTrace; -const ErrorableResolvedSource = @import("../../jsc.zig").ErrorableResolvedSource; -const ResolvedSource = @import("../../jsc.zig").ResolvedSource; -const JSPromise = @import("../../jsc.zig").JSPromise; -const JSInternalPromise = @import("../../jsc.zig").JSInternalPromise; -const JSModuleLoader = @import("../../jsc.zig").JSModuleLoader; -const JSPromiseRejectionOperation = @import("../../jsc.zig").JSPromiseRejectionOperation; -const Exception = @import("../../jsc.zig").Exception; -const ErrorableZigString = @import("../../jsc.zig").ErrorableZigString; -const ZigGlobalObject = @import("../../jsc.zig").ZigGlobalObject; -const VM = @import("../../jsc.zig").VM; -const JSFunction = @import("../../jsc.zig").JSFunction; +const Microtask = @import("bun").JSC.Microtask; +const JSGlobalObject = @import("bun").JSC.JSGlobalObject; +const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef; +const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr; +const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient; +const Node = @import("bun").JSC.Node; +const ZigException = @import("bun").JSC.ZigException; +const ZigStackTrace = @import("bun").JSC.ZigStackTrace; +const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource; +const ResolvedSource = @import("bun").JSC.ResolvedSource; +const JSPromise = @import("bun").JSC.JSPromise; +const JSInternalPromise = @import("bun").JSC.JSInternalPromise; +const JSModuleLoader = @import("bun").JSC.JSModuleLoader; +const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation; +const Exception = @import("bun").JSC.Exception; +const ErrorableZigString = @import("bun").JSC.ErrorableZigString; +const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject; +const VM = @import("bun").JSC.VM; +const JSFunction = @import("bun").JSC.JSFunction; const Config = @import("../config.zig"); const URL = @import("../../url.zig").URL; const Transpiler = @import("./transpiler.zig"); diff --git a/src/bun.js/api/filesystem_router.zig b/src/bun.js/api/filesystem_router.zig index 859831234..d1cec699e 100644 --- a/src/bun.js/api/filesystem_router.zig +++ b/src/bun.js/api/filesystem_router.zig @@ -4,9 +4,9 @@ const http = @import("../../http.zig"); const JavaScript = @import("../javascript.zig"); const QueryStringMap = @import("../../url.zig").QueryStringMap; const CombinedScanner = @import("../../url.zig").CombinedScanner; -const bun = @import("../../global.zig"); +const bun = @import("bun"); const string = bun.string; -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const js = JSC.C; const WebCore = @import("../webcore/response.zig"); const Bundler = @import("../../bundler.zig"); @@ -20,7 +20,7 @@ const JSObject = JSC.JSObject; const JSError = Base.JSError; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; -const strings = @import("strings"); +const strings = @import("bun").strings; const NewClass = Base.NewClass; const To = Base.To; const Request = WebCore.Request; @@ -28,7 +28,7 @@ const d = Base.d; const FetchEvent = WebCore.FetchEvent; const URLPath = @import("../../http/url_path.zig"); const URL = @import("../../url.zig").URL; -const Log = @import("../../logger.zig"); +const Log = @import("bun").logger; const Resolver = @import("../../resolver/resolver.zig").Resolver; const Router = @import("../../router.zig"); diff --git a/src/bun.js/api/html_rewriter.zig b/src/bun.js/api/html_rewriter.zig index e99e49f07..a5e6a5708 100644 --- a/src/bun.js/api/html_rewriter.zig +++ b/src/bun.js/api/html_rewriter.zig @@ -4,9 +4,9 @@ const http = @import("../../http.zig"); const JavaScript = @import("../javascript.zig"); const QueryStringMap = @import("../../url.zig").QueryStringMap; const CombinedScanner = @import("../../url.zig").CombinedScanner; -const bun = @import("../../global.zig"); +const bun = @import("bun"); const string = bun.string; -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const js = JSC.C; const WebCore = @import("../webcore/response.zig"); const Router = @This(); @@ -21,14 +21,14 @@ const JSObject = JSC.JSObject; const JSError = Base.JSError; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; -const strings = @import("strings"); +const strings = @import("bun").strings; const NewClass = Base.NewClass; const To = Base.To; const Request = WebCore.Request; const d = Base.d; const FetchEvent = WebCore.FetchEvent; const Response = WebCore.Response; -const LOLHTML = @import("lolhtml"); +const LOLHTML = @import("bun").LOLHTML; const SelectorMap = std.ArrayListUnmanaged(*LOLHTML.HTMLSelector); pub const LOLHTMLContext = struct { diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig index ebe27f6e1..fb991481f 100644 --- a/src/bun.js/api/server.zig +++ b/src/bun.js/api/server.zig @@ -1,13 +1,13 @@ const Bun = @This(); -const default_allocator = @import("../../global.zig").default_allocator; -const bun = @import("../../global.zig"); +const default_allocator = @import("bun").default_allocator; +const bun = @import("bun"); const Environment = bun.Environment; -const NetworkThread = @import("http").NetworkThread; +const NetworkThread = @import("bun").HTTP.NetworkThread; const Global = bun.Global; const strings = bun.strings; const string = bun.string; -const Output = @import("../../global.zig").Output; -const MutableString = @import("../../global.zig").MutableString; +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; const std = @import("std"); const Allocator = std.mem.Allocator; const IdentityContext = @import("../../identity_context.zig").IdentityContext; @@ -16,7 +16,7 @@ const Resolver = @import("../../resolver/resolver.zig"); const ast = @import("../../import_record.zig"); const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle; const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint; -const logger = @import("../../logger.zig"); +const logger = @import("bun").logger; const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = @import("../../bundler.zig").Bundler; @@ -29,57 +29,57 @@ const http = @import("../../http.zig"); const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../../analytics/analytics_thread.zig"); -const ZigString = @import("javascript_core").ZigString; +const ZigString = @import("bun").JSC.ZigString; const Runtime = @import("../../runtime.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../../env_loader.zig"); const ParseResult = @import("../../bundler.zig").ParseResult; const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../../resolver/package_json.zig").MacroMap; -const WebCore = @import("javascript_core").WebCore; +const WebCore = @import("bun").JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; -const HTTP = @import("http"); +const HTTP = @import("bun").HTTP; const FetchEvent = WebCore.FetchEvent; -const js = @import("javascript_core").C; -const JSC = @import("javascript_core"); +const js = @import("bun").JSC.C; +const JSC = @import("bun").JSC; const JSError = @import("../base.zig").JSError; const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer; const getAllocator = @import("../base.zig").getAllocator; -const JSValue = @import("javascript_core").JSValue; +const JSValue = @import("bun").JSC.JSValue; const NewClass = @import("../base.zig").NewClass; -const Microtask = @import("javascript_core").Microtask; -const JSGlobalObject = @import("javascript_core").JSGlobalObject; -const ExceptionValueRef = @import("javascript_core").ExceptionValueRef; -const JSPrivateDataPtr = @import("javascript_core").JSPrivateDataPtr; -const ZigConsoleClient = @import("javascript_core").ZigConsoleClient; -const Node = @import("javascript_core").Node; -const ZigException = @import("javascript_core").ZigException; -const ZigStackTrace = @import("javascript_core").ZigStackTrace; -const ErrorableResolvedSource = @import("javascript_core").ErrorableResolvedSource; -const ResolvedSource = @import("javascript_core").ResolvedSource; -const JSPromise = @import("javascript_core").JSPromise; -const JSInternalPromise = @import("javascript_core").JSInternalPromise; -const JSModuleLoader = @import("javascript_core").JSModuleLoader; -const JSPromiseRejectionOperation = @import("javascript_core").JSPromiseRejectionOperation; -const Exception = @import("javascript_core").Exception; -const ErrorableZigString = @import("javascript_core").ErrorableZigString; -const ZigGlobalObject = @import("javascript_core").ZigGlobalObject; -const VM = @import("javascript_core").VM; -const JSFunction = @import("javascript_core").JSFunction; +const Microtask = @import("bun").JSC.Microtask; +const JSGlobalObject = @import("bun").JSC.JSGlobalObject; +const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef; +const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr; +const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient; +const Node = @import("bun").JSC.Node; +const ZigException = @import("bun").JSC.ZigException; +const ZigStackTrace = @import("bun").JSC.ZigStackTrace; +const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource; +const ResolvedSource = @import("bun").JSC.ResolvedSource; +const JSPromise = @import("bun").JSC.JSPromise; +const JSInternalPromise = @import("bun").JSC.JSInternalPromise; +const JSModuleLoader = @import("bun").JSC.JSModuleLoader; +const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation; +const Exception = @import("bun").JSC.Exception; +const ErrorableZigString = @import("bun").JSC.ErrorableZigString; +const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject; +const VM = @import("bun").JSC.VM; +const JSFunction = @import("bun").JSC.JSFunction; const Config = @import("../config.zig"); const URL = @import("../../url.zig").URL; const Transpiler = @import("./transpiler.zig"); const VirtualMachine = @import("../javascript.zig").VirtualMachine; const IOTask = JSC.IOTask; const is_bindgen = JSC.is_bindgen; -const uws = @import("uws"); +const uws = @import("bun").uws; const Fallback = Runtime.Fallback; const MimeType = HTTP.MimeType; const Blob = JSC.WebCore.Blob; -const BoringSSL = @import("boringssl"); +const BoringSSL = @import("bun").BoringSSL; const Arena = @import("../../mimalloc_arena.zig").Arena; const SendfileContext = struct { fd: i32, @@ -90,7 +90,7 @@ const SendfileContext = struct { has_set_on_writable: bool = false, auto_close: bool = false, }; -const DateTime = @import("datetime"); +const DateTime = bun.DateTime; const linux = std.os.linux; pub const ServerConfig = struct { diff --git a/src/bun.js/api/transpiler.zig b/src/bun.js/api/transpiler.zig index cd47e1997..0bd525fde 100644 --- a/src/bun.js/api/transpiler.zig +++ b/src/bun.js/api/transpiler.zig @@ -4,9 +4,9 @@ const http = @import("../../http.zig"); const JavaScript = @import("../javascript.zig"); const QueryStringMap = @import("../../url.zig").QueryStringMap; const CombinedScanner = @import("../../url.zig").CombinedScanner; -const bun = @import("../../global.zig"); +const bun = @import("bun"); const string = bun.string; -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const js = JSC.C; const WebCore = @import("../webcore/response.zig"); const Bundler = @import("../../bundler.zig"); @@ -21,7 +21,7 @@ const JSObject = JSC.JSObject; const JSError = Base.JSError; const JSValue = JSC.JSValue; const JSGlobalObject = JSC.JSGlobalObject; -const strings = @import("strings"); +const strings = @import("bun").strings; const NewClass = Base.NewClass; const To = Base.To; const Request = WebCore.Request; @@ -30,7 +30,7 @@ const FetchEvent = WebCore.FetchEvent; const MacroMap = @import("../../resolver/package_json.zig").MacroMap; const TSConfigJSON = @import("../../resolver/tsconfig_json.zig").TSConfigJSON; const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON; -const logger = @import("../../logger.zig"); +const logger = @import("bun").logger; const Loader = options.Loader; const Platform = options.Platform; const JSAst = @import("../../js_ast.zig"); diff --git a/src/bun.js/base.zig b/src/bun.js/base.zig index 87ace2c54..6ca9e1084 100644 --- a/src/bun.js/base.zig +++ b/src/bun.js/base.zig @@ -1,6 +1,6 @@ -pub const js = @import("../jsc.zig").C; +pub const js = @import("bun").JSC.C; const std = @import("std"); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -13,7 +13,7 @@ const C = bun.C; const JavaScript = @import("./javascript.zig"); const ResolveError = JavaScript.ResolveError; const BuildError = JavaScript.BuildError; -const JSC = @import("../jsc.zig"); +const JSC = @import("bun").JSC; const WebCore = @import("./webcore.zig"); const Test = @import("./test/jest.zig"); const Fetch = WebCore.Fetch; @@ -22,7 +22,7 @@ const Request = WebCore.Request; const Router = @import("./api/filesystem_router.zig"); const FetchEvent = WebCore.FetchEvent; const IdentityContext = @import("../identity_context.zig").IdentityContext; -const uws = @import("uws"); +const uws = @import("bun").uws; const Body = WebCore.Body; const TaggedPointerTypes = @import("../tagged_pointer.zig"); const TaggedPointerUnion = TaggedPointerTypes.TaggedPointerUnion; diff --git a/src/bun.js/bindings/bindings-generator.zig b/src/bun.js/bindings/bindings-generator.zig index 5e7bd3e9b..893e808d4 100644 --- a/src/bun.js/bindings/bindings-generator.zig +++ b/src/bun.js/bindings/bindings-generator.zig @@ -15,7 +15,7 @@ const Allocator = std.mem.Allocator; pub const bindgen = true; -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const Classes = JSC.GlobalClasses; diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig index 3fada34c4..eae673343 100644 --- a/src/bun.js/bindings/bindings.zig +++ b/src/bun.js/bindings/bindings.zig @@ -1,9 +1,9 @@ const std = @import("std"); -const bun = @import("../../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const hasRef = std.meta.trait.hasField("ref"); -const C_API = @import("../../jsc.zig").C; +const C_API = @import("bun").JSC.C; const StringPointer = @import("../../api/schema.zig").Api.StringPointer; const Exports = @import("./exports.zig"); const strings = bun.strings; @@ -13,7 +13,7 @@ const ZigException = Exports.ZigException; const ZigStackTrace = Exports.ZigStackTrace; const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; const ArrayBuffer = @import("../base.zig").ArrayBuffer; -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const Shimmer = JSC.Shimmer; const FFI = @import("./FFI.zig"); const NullableAllocator = @import("../../nullable_allocator.zig").NullableAllocator; @@ -599,7 +599,7 @@ pub const ZigString = extern struct { } pub fn toJSStringRef(this: *const ZigString) C_API.JSStringRef { - if (comptime @hasDecl(@import("root"), "bindgen")) { + if (comptime @hasDecl(@import("bun"), "bindgen")) { return undefined; } diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig index 92f269752..1842e52e5 100644 --- a/src/bun.js/bindings/exports.zig +++ b/src/bun.js/bindings/exports.zig @@ -1,14 +1,14 @@ -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const Fs = @import("../../fs.zig"); const CAPI = JSC.C; const JS = @import("../javascript.zig"); const JSBase = @import("../base.zig"); const ZigURL = @import("../../url.zig").URL; const Api = @import("../../api/schema.zig").Api; -const bun = @import("../../global.zig"); +const bun = @import("bun"); const std = @import("std"); const Shimmer = @import("./shimmer.zig").Shimmer; -const strings = @import("strings"); +const strings = @import("bun").strings; const default_allocator = bun.default_allocator; const NewGlobalObject = JSC.NewGlobalObject; const JSGlobalObject = JSC.JSGlobalObject; diff --git a/src/bun.js/bindings/generated_classes.zig b/src/bun.js/bindings/generated_classes.zig index 52e99fb82..7689dc4bb 100644 --- a/src/bun.js/bindings/generated_classes.zig +++ b/src/bun.js/bindings/generated_classes.zig @@ -1,4 +1,4 @@ -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const Classes = @import("./generated_classes_list.zig").Classes; const Environment = @import("../../env.zig"); const std = @import("std"); diff --git a/src/bun.js/bindings/generated_classes_list.zig b/src/bun.js/bindings/generated_classes_list.zig index 1dae06a3b..1c7dfc5ad 100644 --- a/src/bun.js/bindings/generated_classes_list.zig +++ b/src/bun.js/bindings/generated_classes_list.zig @@ -1,4 +1,4 @@ -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; pub const Classes = struct { pub const Request = JSC.WebCore.Request; diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h index 216a45292..f5e8576d6 100644 --- a/src/bun.js/bindings/headers-cpp.h +++ b/src/bun.js/bindings/headers-cpp.h @@ -1,4 +1,4 @@ -//-- AUTOGENERATED FILE -- 1669539205 +//-- AUTOGENERATED FILE -- 1669718575 // clang-format off #pragma once diff --git a/src/bun.js/bindings/headers-replacements.zig b/src/bun.js/bindings/headers-replacements.zig index 5f304b850..f586bd028 100644 --- a/src/bun.js/bindings/headers-replacements.zig +++ b/src/bun.js/bindings/headers-replacements.zig @@ -1,4 +1,4 @@ -const bindings = @import("../../jsc.zig"); +const bindings = @import("bun").JSC; pub const struct_JSC__CallFrame = bindings.CallFrame; pub const struct_JSC__StringPrototype = bindings.StringPrototype; pub const struct_JSC__SetIteratorPrototype = bindings.SetIteratorPrototype; diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h index 346cfa50e..663f4eadb 100644 --- a/src/bun.js/bindings/headers.h +++ b/src/bun.js/bindings/headers.h @@ -1,5 +1,5 @@ // clang-format off -//-- AUTOGENERATED FILE -- 1669680738 +//-- AUTOGENERATED FILE -- 1669718575 #pragma once #include <stddef.h> diff --git a/src/bun.js/bindings/headers.zig b/src/bun.js/bindings/headers.zig index 55e947f02..8c83ed100 100644 --- a/src/bun.js/bindings/headers.zig +++ b/src/bun.js/bindings/headers.zig @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -const bindings = @import("../../jsc.zig"); +const bindings = @import("bun").JSC; pub const struct_JSC__CallFrame = bindings.CallFrame; pub const struct_JSC__StringPrototype = bindings.StringPrototype; pub const struct_JSC__SetIteratorPrototype = bindings.SetIteratorPrototype; diff --git a/src/bun.js/config.zig b/src/bun.js/config.zig index 8ec9238f6..78f76d9a4 100644 --- a/src/bun.js/config.zig +++ b/src/bun.js/config.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -14,7 +14,7 @@ const Fs = @import("../fs.zig"); const resolver = @import("../resolver/resolver.zig"); const ast = @import("../import_record.zig"); const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle; -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const Api = @import("../api/schema.zig").Api; const options = @import("../options.zig"); const Bundler = @import("../bundler.zig").ServeBundler; diff --git a/src/bun.js/event_loop.zig b/src/bun.js/event_loop.zig index d83bd3575..f9f11c943 100644 --- a/src/bun.js/event_loop.zig +++ b/src/bun.js/event_loop.zig @@ -1,10 +1,10 @@ const std = @import("std"); -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const JSGlobalObject = JSC.JSGlobalObject; const VirtualMachine = JSC.VirtualMachine; const Lock = @import("../lock.zig").Lock; const Microtask = JSC.Microtask; -const bun = @import("../global.zig"); +const bun = @import("bun"); const Environment = bun.Environment; const Fetch = JSC.WebCore.Fetch; const WebCore = JSC.WebCore; @@ -21,8 +21,8 @@ const JSValue = JSC.JSValue; const js = JSC.C; pub const WorkPool = @import("../work_pool.zig").WorkPool; pub const WorkPoolTask = @import("../work_pool.zig").Task; -const NetworkThread = @import("http").NetworkThread; -const uws = @import("uws"); +const NetworkThread = @import("bun").HTTP.NetworkThread; +const uws = @import("bun").uws; pub fn ConcurrentPromiseTask(comptime Context: type) type { return struct { @@ -209,7 +209,7 @@ pub const ConcurrentTask = struct { } }; -const AsyncIO = @import("io"); +const AsyncIO = @import("bun").AsyncIO; pub const EventLoop = struct { tasks: Queue = undefined, diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig index 900f42ea1..6f966df2b 100644 --- a/src/bun.js/javascript.zig +++ b/src/bun.js/javascript.zig @@ -2,7 +2,7 @@ const std = @import("std"); const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; const StaticExport = @import("./bindings/static_export.zig"); const c_char = StaticExport.c_char; -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -14,8 +14,8 @@ const default_allocator = bun.default_allocator; const StoredFileDescriptorType = bun.StoredFileDescriptorType; const Arena = @import("../mimalloc_arena.zig").Arena; const C = bun.C; -const NetworkThread = @import("http").NetworkThread; -const IO = @import("io"); +const NetworkThread = @import("bun").HTTP.NetworkThread; +const IO = @import("bun").AsyncIO; const Allocator = std.mem.Allocator; const IdentityContext = @import("../identity_context.zig").IdentityContext; const Fs = @import("../fs.zig"); @@ -24,7 +24,7 @@ const ast = @import("../import_record.zig"); const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle; const MacroEntryPoint = @import("../bundler.zig").MacroEntryPoint; const ParseResult = @import("../bundler.zig").ParseResult; -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const Api = @import("../api/schema.zig").Api; const options = @import("../options.zig"); const Bundler = @import("../bundler.zig").Bundler; @@ -38,46 +38,46 @@ const http = @import("../http.zig"); const NodeFallbackModules = @import("../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../analytics/analytics_thread.zig"); -const ZigString = @import("../jsc.zig").ZigString; +const ZigString = @import("bun").JSC.ZigString; const Runtime = @import("../runtime.zig"); const Router = @import("./api/filesystem_router.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../env_loader.zig"); const PackageJSON = @import("../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../resolver/package_json.zig").MacroMap; -const WebCore = @import("../jsc.zig").WebCore; +const WebCore = @import("bun").JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; -const js = @import("../jsc.zig").C; -const JSC = @import("../jsc.zig"); +const js = @import("bun").JSC.C; +const JSC = @import("bun").JSC; const JSError = @import("./base.zig").JSError; const d = @import("./base.zig").d; const MarkedArrayBuffer = @import("./base.zig").MarkedArrayBuffer; const getAllocator = @import("./base.zig").getAllocator; -const JSValue = @import("../jsc.zig").JSValue; +const JSValue = @import("bun").JSC.JSValue; const NewClass = @import("./base.zig").NewClass; -const Microtask = @import("../jsc.zig").Microtask; -const JSGlobalObject = @import("../jsc.zig").JSGlobalObject; -const ExceptionValueRef = @import("../jsc.zig").ExceptionValueRef; -const JSPrivateDataPtr = @import("../jsc.zig").JSPrivateDataPtr; -const ZigConsoleClient = @import("../jsc.zig").ZigConsoleClient; -const Node = @import("../jsc.zig").Node; -const ZigException = @import("../jsc.zig").ZigException; -const ZigStackTrace = @import("../jsc.zig").ZigStackTrace; -const ErrorableResolvedSource = @import("../jsc.zig").ErrorableResolvedSource; -const ResolvedSource = @import("../jsc.zig").ResolvedSource; -const JSPromise = @import("../jsc.zig").JSPromise; -const JSInternalPromise = @import("../jsc.zig").JSInternalPromise; -const JSModuleLoader = @import("../jsc.zig").JSModuleLoader; -const JSPromiseRejectionOperation = @import("../jsc.zig").JSPromiseRejectionOperation; -const Exception = @import("../jsc.zig").Exception; -const ErrorableZigString = @import("../jsc.zig").ErrorableZigString; -const ZigGlobalObject = @import("../jsc.zig").ZigGlobalObject; -const VM = @import("../jsc.zig").VM; -const JSFunction = @import("../jsc.zig").JSFunction; +const Microtask = @import("bun").JSC.Microtask; +const JSGlobalObject = @import("bun").JSC.JSGlobalObject; +const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef; +const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr; +const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient; +const Node = @import("bun").JSC.Node; +const ZigException = @import("bun").JSC.ZigException; +const ZigStackTrace = @import("bun").JSC.ZigStackTrace; +const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource; +const ResolvedSource = @import("bun").JSC.ResolvedSource; +const JSPromise = @import("bun").JSC.JSPromise; +const JSInternalPromise = @import("bun").JSC.JSInternalPromise; +const JSModuleLoader = @import("bun").JSC.JSModuleLoader; +const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation; +const Exception = @import("bun").JSC.Exception; +const ErrorableZigString = @import("bun").JSC.ErrorableZigString; +const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject; +const VM = @import("bun").JSC.VM; +const JSFunction = @import("bun").JSC.JSFunction; const Config = @import("./config.zig"); const URL = @import("../url.zig").URL; const Transpiler = @import("./api/transpiler.zig"); @@ -244,7 +244,7 @@ pub const SavedSourceMap = struct { return SourceMap.Mapping.find(mappings, line, column); } }; -const uws = @import("uws"); +const uws = @import("bun").uws; pub export fn Bun__getDefaultGlobal() *JSGlobalObject { return JSC.VirtualMachine.vm.global; diff --git a/src/bun.js/javascript_core_c_api.zig b/src/bun.js/javascript_core_c_api.zig index d3df574ab..13e96f22a 100644 --- a/src/bun.js/javascript_core_c_api.zig +++ b/src/bun.js/javascript_core_c_api.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const std = @import("std"); const cpp = @import("./bindings/bindings.zig"); const generic = opaque { @@ -6,7 +6,7 @@ const generic = opaque { return @bitCast(cpp.JSValue.Type, @ptrToInt(this)); } - pub inline fn bunVM(this: *@This()) *@import("javascript_core").VirtualMachine { + pub inline fn bunVM(this: *@This()) *@import("bun").JSC.VirtualMachine { return this.ptr().bunVM(); } }; @@ -174,13 +174,13 @@ pub extern fn JSValueToNumber(ctx: JSContextRef, value: JSValueRef, exception: E pub extern fn JSValueToStringCopy(ctx: JSContextRef, value: JSValueRef, exception: ExceptionRef) JSStringRef; pub extern fn JSValueToObject(ctx: JSContextRef, value: JSValueRef, exception: ExceptionRef) JSObjectRef; -const log_protection = @import("../global.zig").Environment.allow_assert and false; +const log_protection = @import("bun").Environment.allow_assert and false; pub inline fn JSValueUnprotect(ctx: JSContextRef, value: JSValueRef) void { const Wrapped = struct { pub extern fn JSValueUnprotect(ctx: JSContextRef, value: JSValueRef) void; }; if (comptime log_protection) { - const Output = @import("../global.zig").Output; + const Output = @import("bun").Output; Output.debug("[unprotect] {d}\n", .{@ptrToInt(value)}); } // wrapper exists to make it easier to set a breakpoint @@ -192,7 +192,7 @@ pub inline fn JSValueProtect(ctx: JSContextRef, value: JSValueRef) void { pub extern fn JSValueProtect(ctx: JSContextRef, value: JSValueRef) void; }; if (comptime log_protection) { - const Output = @import("../global.zig").Output; + const Output = @import("bun").Output; Output.debug("[protect] {d}\n", .{@ptrToInt(value)}); } // wrapper exists to make it easier to set a breakpoint diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig index 01dbbe1a3..fa938f1ab 100644 --- a/src/bun.js/module_loader.zig +++ b/src/bun.js/module_loader.zig @@ -2,7 +2,7 @@ const std = @import("std"); const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; const StaticExport = @import("./bindings/static_export.zig"); const c_char = StaticExport.c_char; -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -14,8 +14,8 @@ const default_allocator = bun.default_allocator; const StoredFileDescriptorType = bun.StoredFileDescriptorType; const Arena = @import("../mimalloc_arena.zig").Arena; const C = bun.C; -const NetworkThread = @import("http").NetworkThread; -const IO = @import("io"); +const NetworkThread = @import("bun").HTTP.NetworkThread; +const IO = @import("bun").AsyncIO; const Allocator = std.mem.Allocator; const IdentityContext = @import("../identity_context.zig").IdentityContext; const Fs = @import("../fs.zig"); @@ -24,7 +24,7 @@ const ast = @import("../import_record.zig"); const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle; const MacroEntryPoint = @import("../bundler.zig").MacroEntryPoint; const ParseResult = @import("../bundler.zig").ParseResult; -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const Api = @import("../api/schema.zig").Api; const options = @import("../options.zig"); const Bundler = @import("../bundler.zig").Bundler; @@ -38,46 +38,46 @@ const http = @import("../http.zig"); const NodeFallbackModules = @import("../node_fallbacks.zig"); const ImportKind = ast.ImportKind; const Analytics = @import("../analytics/analytics_thread.zig"); -const ZigString = @import("../jsc.zig").ZigString; +const ZigString = @import("bun").JSC.ZigString; const Runtime = @import("../runtime.zig"); const Router = @import("./api/filesystem_router.zig"); const ImportRecord = ast.ImportRecord; const DotEnv = @import("../env_loader.zig"); const PackageJSON = @import("../resolver/package_json.zig").PackageJSON; const MacroRemap = @import("../resolver/package_json.zig").MacroMap; -const WebCore = @import("../jsc.zig").WebCore; +const WebCore = @import("bun").JSC.WebCore; const Request = WebCore.Request; const Response = WebCore.Response; const Headers = WebCore.Headers; const Fetch = WebCore.Fetch; const FetchEvent = WebCore.FetchEvent; -const js = @import("../jsc.zig").C; -const JSC = @import("../jsc.zig"); +const js = @import("bun").JSC.C; +const JSC = @import("bun").JSC; const JSError = @import("./base.zig").JSError; const d = @import("./base.zig").d; const MarkedArrayBuffer = @import("./base.zig").MarkedArrayBuffer; const getAllocator = @import("./base.zig").getAllocator; -const JSValue = @import("../jsc.zig").JSValue; +const JSValue = @import("bun").JSC.JSValue; const NewClass = @import("./base.zig").NewClass; -const Microtask = @import("../jsc.zig").Microtask; -const JSGlobalObject = @import("../jsc.zig").JSGlobalObject; -const ExceptionValueRef = @import("../jsc.zig").ExceptionValueRef; -const JSPrivateDataPtr = @import("../jsc.zig").JSPrivateDataPtr; -const ZigConsoleClient = @import("../jsc.zig").ZigConsoleClient; -const Node = @import("../jsc.zig").Node; -const ZigException = @import("../jsc.zig").ZigException; -const ZigStackTrace = @import("../jsc.zig").ZigStackTrace; -const ErrorableResolvedSource = @import("../jsc.zig").ErrorableResolvedSource; -const ResolvedSource = @import("../jsc.zig").ResolvedSource; -const JSPromise = @import("../jsc.zig").JSPromise; -const JSInternalPromise = @import("../jsc.zig").JSInternalPromise; -const JSModuleLoader = @import("../jsc.zig").JSModuleLoader; -const JSPromiseRejectionOperation = @import("../jsc.zig").JSPromiseRejectionOperation; -const Exception = @import("../jsc.zig").Exception; -const ErrorableZigString = @import("../jsc.zig").ErrorableZigString; -const ZigGlobalObject = @import("../jsc.zig").ZigGlobalObject; -const VM = @import("../jsc.zig").VM; -const JSFunction = @import("../jsc.zig").JSFunction; +const Microtask = @import("bun").JSC.Microtask; +const JSGlobalObject = @import("bun").JSC.JSGlobalObject; +const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef; +const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr; +const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient; +const Node = @import("bun").JSC.Node; +const ZigException = @import("bun").JSC.ZigException; +const ZigStackTrace = @import("bun").JSC.ZigStackTrace; +const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource; +const ResolvedSource = @import("bun").JSC.ResolvedSource; +const JSPromise = @import("bun").JSC.JSPromise; +const JSInternalPromise = @import("bun").JSC.JSInternalPromise; +const JSModuleLoader = @import("bun").JSC.JSModuleLoader; +const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation; +const Exception = @import("bun").JSC.Exception; +const ErrorableZigString = @import("bun").JSC.ErrorableZigString; +const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject; +const VM = @import("bun").JSC.VM; +const JSFunction = @import("bun").JSC.JSFunction; const Config = @import("./config.zig"); const URL = @import("../url.zig").URL; const Transpiler = @import("./api/transpiler.zig"); diff --git a/src/bun.js/node/buffer.zig b/src/bun.js/node/buffer.zig index 541079a0b..b796109e3 100644 --- a/src/bun.js/node/buffer.zig +++ b/src/bun.js/node/buffer.zig @@ -1,9 +1,9 @@ const std = @import("std"); -const bun = @import("../../global.zig"); +const bun = @import("bun"); const strings = bun.strings; const string = bun.string; -const AsyncIO = @import("io"); -const JSC = @import("../../jsc.zig"); +const AsyncIO = @import("bun").AsyncIO; +const JSC = @import("bun").JSC; const PathString = JSC.PathString; const Environment = bun.Environment; const C = bun.C; diff --git a/src/bun.js/node/dir_iterator.zig b/src/bun.js/node/dir_iterator.zig index 19db4177d..c309e0d67 100644 --- a/src/bun.js/node/dir_iterator.zig +++ b/src/bun.js/node/dir_iterator.zig @@ -9,12 +9,12 @@ const std = @import("std"); const os = std.os; const Dir = std.fs.Dir; -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const PathString = JSC.PathString; const IteratorError = error{ AccessDenied, SystemResources } || os.UnexpectedError; const mem = std.mem; -const strings = @import("../../global.zig").strings; +const strings = @import("bun").strings; const Maybe = JSC.Maybe; const File = std.fs.File; const Result = Maybe(?Entry); diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig index 394e705db..dd11d40bf 100644 --- a/src/bun.js/node/node_fs.zig +++ b/src/bun.js/node/node_fs.zig @@ -2,11 +2,11 @@ // for interacting with the filesystem from JavaScript. // The top-level functions assume the arguments are already validated const std = @import("std"); -const bun = @import("../../global.zig"); +const bun = @import("bun"); const strings = bun.strings; const string = bun.string; -const AsyncIO = @import("io"); -const JSC = @import("../../jsc.zig"); +const AsyncIO = @import("bun").AsyncIO; +const JSC = @import("bun").JSC; const PathString = JSC.PathString; const Environment = bun.Environment; const C = bun.C; diff --git a/src/bun.js/node/node_fs_binding.zig b/src/bun.js/node/node_fs_binding.zig index a76c83637..e88e0cbf7 100644 --- a/src/bun.js/node/node_fs_binding.zig +++ b/src/bun.js/node/node_fs_binding.zig @@ -1,11 +1,11 @@ -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const std = @import("std"); const Flavor = JSC.Node.Flavor; const ArgumentsSlice = JSC.Node.ArgumentsSlice; const system = std.os.system; const Maybe = JSC.Maybe; const Encoding = JSC.Node.Encoding; -const FeatureFlags = @import("../../global.zig").FeatureFlags; +const FeatureFlags = @import("bun").FeatureFlags; const Args = JSC.Node.NodeFS.Arguments; const d = JSC.d; diff --git a/src/bun.js/node/node_fs_constant.zig b/src/bun.js/node/node_fs_constant.zig index 72e752184..6491664db 100644 --- a/src/bun.js/node/node_fs_constant.zig +++ b/src/bun.js/node/node_fs_constant.zig @@ -1,4 +1,4 @@ -const bun = @import("../../global.zig"); +const bun = @import("bun"); const Environment = bun.Environment; const std = @import("std"); diff --git a/src/bun.js/node/node_os.zig b/src/bun.js/node/node_os.zig index fb5ce0879..bcaffaf17 100644 --- a/src/bun.js/node/node_os.zig +++ b/src/bun.js/node/node_os.zig @@ -1,10 +1,10 @@ const std = @import("std"); const builtin = @import("builtin"); -const bun = @import("../../global.zig"); +const bun = @import("bun"); const C = bun.C; const string = bun.string; const strings = bun.strings; -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const Environment = bun.Environment; const Global = bun.Global; const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false; diff --git a/src/bun.js/node/os/constants.zig b/src/bun.js/node/os/constants.zig index 6a217c32e..2d441b793 100644 --- a/src/bun.js/node/os/constants.zig +++ b/src/bun.js/node/os/constants.zig @@ -1,8 +1,8 @@ const std = @import("std"); -const bun = @import("../../../global.zig"); +const bun = @import("bun"); const string = bun.string; const Environment = bun.Environment; -const JSC = @import("../../../jsc.zig"); +const JSC = @import("bun").JSC; const ConstantType = enum { ERRNO, ERRNO_WIN, SIG, DLOPEN, OTHER }; diff --git a/src/bun.js/node/syscall.zig b/src/bun.js/node/syscall.zig index cb423c2f5..50ba6e33f 100644 --- a/src/bun.js/node/syscall.zig +++ b/src/bun.js/node/syscall.zig @@ -5,14 +5,14 @@ const os = std.os; const builtin = @import("builtin"); const Syscall = @This(); -const Environment = @import("../../global.zig").Environment; -const default_allocator = @import("../../global.zig").default_allocator; -const JSC = @import("../../jsc.zig"); +const Environment = @import("bun").Environment; +const default_allocator = @import("bun").default_allocator; +const JSC = @import("bun").JSC; const SystemError = JSC.SystemError; -const bun = @import("../../global.zig"); +const bun = @import("bun"); const MAX_PATH_BYTES = bun.MAX_PATH_BYTES; const fd_t = bun.FileDescriptor; -const C = @import("../../global.zig").C; +const C = @import("bun").C; const linux = os.linux; const Maybe = JSC.Maybe; @@ -21,7 +21,7 @@ pub const syslog = log; // On Linux AARCh64, zig is missing stat & lstat syscalls const use_libc = (Environment.isLinux and Environment.isAarch64) or Environment.isMac; -pub const system = if (Environment.isLinux) linux else @import("io").darwin; +pub const system = if (Environment.isLinux) linux else @import("bun").AsyncIO.darwin; pub const S = struct { pub usingnamespace if (Environment.isLinux) linux.S else std.os.S; }; @@ -107,7 +107,7 @@ pub const Tag = enum(u8) { posix_spawn, pub var strings = std.EnumMap(Tag, JSC.C.JSStringRef).initFull(null); }; -const PathString = @import("../../global.zig").PathString; +const PathString = @import("bun").PathString; const mode_t = os.mode_t; diff --git a/src/bun.js/node/types.zig b/src/bun.js/node/types.zig index 020fd5f2d..a7443875f 100644 --- a/src/bun.js/node/types.zig +++ b/src/bun.js/node/types.zig @@ -1,10 +1,10 @@ const std = @import("std"); const builtin = @import("builtin"); -const bun = @import("../../global.zig"); +const bun = @import("bun"); const strings = bun.strings; const string = bun.string; -const AsyncIO = @import("io"); -const JSC = @import("../../jsc.zig"); +const AsyncIO = @import("bun").AsyncIO; +const JSC = @import("bun").JSC; const PathString = JSC.PathString; const Environment = bun.Environment; const C = bun.C; @@ -12,7 +12,7 @@ const Syscall = @import("./syscall.zig"); const os = std.os; const Buffer = JSC.MarkedArrayBuffer; const IdentityContext = @import("../../identity_context.zig").IdentityContext; -const logger = @import("../../logger.zig"); +const logger = @import("bun").logger; const Fs = @import("../../fs.zig"); const URL = @import("../../url.zig").URL; const Shimmer = @import("../bindings/shimmer.zig").Shimmer; diff --git a/src/bun.js/rare_data.zig b/src/bun.js/rare_data.zig index 895dac40f..bb52e5bea 100644 --- a/src/bun.js/rare_data.zig +++ b/src/bun.js/rare_data.zig @@ -1,13 +1,13 @@ const EditorContext = @import("../open.zig").EditorContext; const Blob = @import("./webcore/response.zig").Blob; -const default_allocator = @import("../global.zig").default_allocator; -const Output = @import("../global.zig").Output; +const default_allocator = @import("bun").default_allocator; +const Output = @import("bun").Output; const RareData = @This(); const Syscall = @import("./node/syscall.zig"); -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const std = @import("std"); -const BoringSSL = @import("boringssl"); -const bun = @import("../global.zig"); +const BoringSSL = @import("bun").BoringSSL; +const bun = @import("bun"); const WebSocketClientMask = @import("../http/websocket_http_client.zig").Mask; boring_ssl_engine: ?*BoringSSL.ENGINE = null, diff --git a/src/bun.js/script_execution_context.zig b/src/bun.js/script_execution_context.zig index 551614ccc..0f1bfb20b 100644 --- a/src/bun.js/script_execution_context.zig +++ b/src/bun.js/script_execution_context.zig @@ -1,4 +1,4 @@ -const JSC = @import("../jsc.zig"); +const JSC = @import("bun").JSC; pub const ScriptExecutionContext = extern struct { main_file_path: JSC.ZigString, diff --git a/src/bun.js/scripts/generate-classes.ts b/src/bun.js/scripts/generate-classes.ts index 05b092656..b08e573b4 100644 --- a/src/bun.js/scripts/generate-classes.ts +++ b/src/bun.js/scripts/generate-classes.ts @@ -1743,7 +1743,7 @@ void GlobalObject::visitGeneratedLazyClasses(GlobalObject *thisObject, Visitor& } const ZIG_GENERATED_CLASSES_HEADER = ` -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const Classes = @import("./generated_classes_list.zig").Classes; const Environment = @import("../../env.zig"); const std = @import("std"); diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig index 34265789f..abde377db 100644 --- a/src/bun.js/test/jest.zig +++ b/src/bun.js/test/jest.zig @@ -1,27 +1,27 @@ const std = @import("std"); -const bun = @import("../../global.zig"); +const bun = @import("bun"); const Api = @import("../../api/schema.zig").Api; const RequestContext = @import("../../http.zig").RequestContext; const MimeType = @import("../../http.zig").MimeType; const ZigURL = @import("../../url.zig").URL; -const HTTPClient = @import("http"); +const HTTPClient = @import("bun").HTTP; const NetworkThread = HTTPClient.NetworkThread; const Environment = @import("../../env.zig"); -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const js = JSC.C; -const logger = @import("../../logger.zig"); +const logger = @import("bun").logger; const Method = @import("../../http/method.zig").Method; const ObjectPool = @import("../../pool.zig").ObjectPool; -const Output = @import("../../global.zig").Output; -const MutableString = @import("../../global.zig").MutableString; -const strings = @import("../../global.zig").strings; -const string = @import("../../global.zig").string; -const default_allocator = @import("../../global.zig").default_allocator; -const FeatureFlags = @import("../../global.zig").FeatureFlags; +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; +const strings = @import("bun").strings; +const string = @import("bun").string; +const default_allocator = @import("bun").default_allocator; +const FeatureFlags = @import("bun").FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; const NewClass = @import("../base.zig").NewClass; diff --git a/src/bun.js/uuid.zig b/src/bun.js/uuid.zig index fa59520c2..affd07a32 100644 --- a/src/bun.js/uuid.zig +++ b/src/bun.js/uuid.zig @@ -3,7 +3,7 @@ const std = @import("std"); const crypto = std.crypto; const fmt = std.fmt; const testing = std.testing; -const bun = @import("../global.zig"); +const bun = @import("bun"); pub const Error = error{InvalidUUID}; const UUID = @This(); diff --git a/src/bun.js/webcore.zig b/src/bun.js/webcore.zig index c8bf7545d..21751ce5a 100644 --- a/src/bun.js/webcore.zig +++ b/src/bun.js/webcore.zig @@ -2,9 +2,9 @@ pub usingnamespace @import("./webcore/response.zig"); pub usingnamespace @import("./webcore/encoding.zig"); pub usingnamespace @import("./webcore/streams.zig"); -const JSC = @import("../jsc.zig"); +const JSC = @import("bun").JSC; const std = @import("std"); -const bun = @import("../global.zig"); +const bun = @import("bun"); pub const Lifetime = enum { clone, @@ -358,7 +358,7 @@ pub const Prompt = struct { pub const Crypto = struct { const UUID = @import("./uuid.zig"); - const BoringSSL = @import("boringssl"); + const BoringSSL = @import("bun").BoringSSL; pub const Class = JSC.NewClass( void, .{ .name = "crypto" }, diff --git a/src/bun.js/webcore/encoding.zig b/src/bun.js/webcore/encoding.zig index 297f3cc0a..a3b350899 100644 --- a/src/bun.js/webcore/encoding.zig +++ b/src/bun.js/webcore/encoding.zig @@ -3,22 +3,22 @@ const Api = @import("../../api/schema.zig").Api; const RequestContext = @import("../../http.zig").RequestContext; const MimeType = @import("../../http.zig").MimeType; const ZigURL = @import("../../url.zig").URL; -const HTTPClient = @import("http"); +const HTTPClient = @import("bun").HTTP; const NetworkThread = HTTPClient.NetworkThread; -const JSC = @import("../../jsc.zig"); +const JSC = @import("bun").JSC; const js = JSC.C; const Method = @import("../../http/method.zig").Method; const ObjectPool = @import("../../pool.zig").ObjectPool; -const bun = @import("../../global.zig"); -const Output = @import("../../global.zig").Output; -const MutableString = @import("../../global.zig").MutableString; -const strings = @import("../../global.zig").strings; -const string = @import("../../global.zig").string; -const default_allocator = @import("../../global.zig").default_allocator; -const FeatureFlags = @import("../../global.zig").FeatureFlags; +const bun = @import("bun"); +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; +const strings = @import("bun").strings; +const string = @import("bun").string; +const default_allocator = @import("bun").default_allocator; +const FeatureFlags = @import("bun").FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; const NewClass = @import("../base.zig").NewClass; @@ -38,7 +38,7 @@ const JSGlobalObject = JSC.JSGlobalObject; const VirtualMachine = @import("../javascript.zig").VirtualMachine; const Task = @import("../javascript.zig").Task; -const picohttp = @import("picohttp"); +const picohttp = @import("bun").picohttp; pub const TextEncoder = struct { filler: u32 = 0, diff --git a/src/bun.js/webcore/response.zig b/src/bun.js/webcore/response.zig index 936a5e464..6744df60f 100644 --- a/src/bun.js/webcore/response.zig +++ b/src/bun.js/webcore/response.zig @@ -1,25 +1,25 @@ const std = @import("std"); const Api = @import("../../api/schema.zig").Api; -const bun = @import("../../global.zig"); +const bun = @import("bun"); const RequestContext = @import("../../http.zig").RequestContext; const MimeType = @import("../../http.zig").MimeType; const ZigURL = @import("../../url.zig").URL; -const HTTPClient = @import("http"); +const HTTPClient = @import("bun").HTTP; const NetworkThread = HTTPClient.NetworkThread; const AsyncIO = NetworkThread.AsyncIO; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const js = JSC.C; const Method = @import("../../http/method.zig").Method; const FetchHeaders = JSC.FetchHeaders; const ObjectPool = @import("../../pool.zig").ObjectPool; const SystemError = JSC.SystemError; -const Output = @import("../../global.zig").Output; -const MutableString = @import("../../global.zig").MutableString; -const strings = @import("../../global.zig").strings; -const string = @import("../../global.zig").string; -const default_allocator = @import("../../global.zig").default_allocator; -const FeatureFlags = @import("../../global.zig").FeatureFlags; +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; +const strings = @import("bun").strings; +const string = @import("bun").string; +const default_allocator = @import("bun").default_allocator; +const FeatureFlags = @import("bun").FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; const NewClass = @import("../base.zig").NewClass; @@ -40,9 +40,9 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca const VirtualMachine = @import("../javascript.zig").VirtualMachine; const Task = JSC.Task; const JSPrinter = @import("../../js_printer.zig"); -const picohttp = @import("picohttp"); +const picohttp = @import("bun").picohttp; const StringJoiner = @import("../../string_joiner.zig"); -const uws = @import("uws"); +const uws = @import("bun").uws; pub const Response = struct { pub usingnamespace JSC.Codegen.JSResponse; diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig index 263525ab8..0cd35a3ee 100644 --- a/src/bun.js/webcore/streams.zig +++ b/src/bun.js/webcore/streams.zig @@ -1,25 +1,25 @@ const std = @import("std"); const Api = @import("../../api/schema.zig").Api; -const bun = @import("../../global.zig"); +const bun = @import("bun"); const RequestContext = @import("../../http.zig").RequestContext; const MimeType = @import("../../http.zig").MimeType; const ZigURL = @import("../../url.zig").URL; -const HTTPClient = @import("http"); +const HTTPClient = @import("bun").HTTP; const NetworkThread = HTTPClient.NetworkThread; const AsyncIO = NetworkThread.AsyncIO; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const js = JSC.C; const Method = @import("../../http/method.zig").Method; const FetchHeaders = JSC.FetchHeaders; const ObjectPool = @import("../../pool.zig").ObjectPool; const SystemError = JSC.SystemError; -const Output = @import("../../global.zig").Output; -const MutableString = @import("../../global.zig").MutableString; -const strings = @import("../../global.zig").strings; -const string = @import("../../global.zig").string; -const default_allocator = @import("../../global.zig").default_allocator; -const FeatureFlags = @import("../../global.zig").FeatureFlags; +const Output = @import("bun").Output; +const MutableString = @import("bun").MutableString; +const strings = @import("bun").strings; +const string = @import("bun").string; +const default_allocator = @import("bun").default_allocator; +const FeatureFlags = @import("bun").FeatureFlags; const ArrayBuffer = @import("../base.zig").ArrayBuffer; const Properties = @import("../base.zig").Properties; const NewClass = @import("../base.zig").NewClass; @@ -40,9 +40,9 @@ const JSGlobalObject = JSC.JSGlobalObject; const VirtualMachine = @import("../javascript.zig").VirtualMachine; const Task = JSC.Task; const JSPrinter = @import("../../js_printer.zig"); -const picohttp = @import("picohttp"); +const picohttp = @import("bun").picohttp; const StringJoiner = @import("../../string_joiner.zig"); -const uws = @import("uws"); +const uws = @import("bun").uws; const Blob = JSC.WebCore.Blob; const Response = JSC.WebCore.Response; const Request = JSC.WebCore.Request; diff --git a/src/global.zig b/src/bun.zig index 1fe401d72..6443c6923 100644 --- a/src/global.zig +++ b/src/bun.zig @@ -23,7 +23,6 @@ pub const huge_allocator_threshold: comptime_int = @import("./memory_allocator.z pub const C = @import("c.zig"); pub const FeatureFlags = @import("feature_flags.zig"); -const root = @import("root"); pub const meta = @import("./meta.zig"); pub const ComptimeStringMap = @import("./comptime_string_map.zig").ComptimeStringMap; pub const base64 = @import("./base64/base64.zig"); @@ -362,7 +361,6 @@ pub fn hash(content: []const u8) u64 { pub const HiveArray = @import("./hive_array.zig").HiveArray; pub fn rand(bytes: []u8) void { - const BoringSSL = @import("boringssl"); _ = BoringSSL.RAND_bytes(bytes.ptr, bytes.len); } @@ -486,3 +484,17 @@ pub const invalid_fd = std.math.maxInt(FileDescriptor); pub const simdutf = @import("./bun.js/bindings/bun-simdutf.zig"); pub const JSC = @import("javascript_core"); +pub const AsyncIO = @import("async_io"); + +pub const logger = @import("./logger.zig"); +pub const HTTP = @import("./http_client_async.zig"); +pub const ThreadPool = @import("./thread_pool.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.zig"); +pub const DateTime = @import("./deps/zig-datetime/src/datetime.zig"); + +pub var start_time: i128 = 0; diff --git a/src/bun_js.zig b/src/bun_js.zig index 07d7e4adf..d3d59a662 100644 --- a/src/bun_js.zig +++ b/src/bun_js.zig @@ -1,4 +1,4 @@ -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,14 +11,14 @@ const C = bun.C; const std = @import("std"); const lex = @import("js_lexer.zig"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const options = @import("options.zig"); const js_parser = @import("js_parser.zig"); const json_parser = @import("json_parser.zig"); const js_printer = @import("js_printer.zig"); const js_ast = @import("js_ast.zig"); const linker = @import("linker.zig"); -const panicky = @import("panic_handler.zig"); + const sync = @import("./sync.zig"); const Api = @import("api/schema.zig").Api; const resolve_path = @import("./resolver/resolve_path.zig"); @@ -28,8 +28,8 @@ const bundler = @import("bundler.zig"); const NodeModuleBundle = @import("node_module_bundle.zig").NodeModuleBundle; const DotEnv = @import("env_loader.zig"); const which = @import("which.zig").which; -const JSC = @import("javascript_core"); -const AsyncHTTP = @import("http").AsyncHTTP; +const JSC = @import("bun").JSC; +const AsyncHTTP = @import("bun").HTTP.AsyncHTTP; const Arena = @import("./mimalloc_arena.zig").Arena; const OpaqueWrap = JSC.OpaqueWrap; diff --git a/src/bun_redirect.zig b/src/bun_redirect.zig new file mode 100644 index 000000000..99eeb8d73 --- /dev/null +++ b/src/bun_redirect.zig @@ -0,0 +1 @@ +pub usingnamespace @import("./bun.zig"); diff --git a/src/bundler.zig b/src/bundler.zig index 8c9cdb769..84783cd70 100644 --- a/src/bundler.zig +++ b/src/bundler.zig @@ -1,4 +1,4 @@ -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -12,7 +12,7 @@ const FeatureFlags = bun.FeatureFlags; const C = bun.C; const std = @import("std"); const lex = @import("js_lexer.zig"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const options = @import("options.zig"); const js_parser = @import("js_parser.zig"); const json_parser = @import("json_parser.zig"); @@ -24,7 +24,6 @@ const Define = @import("defines.zig").Define; const DebugOptions = @import("./cli.zig").Command.DebugOptions; const ThreadPoolLib = @import("./thread_pool.zig"); -const panicky = @import("panic_handler.zig"); const Fs = @import("fs.zig"); const schema = @import("api/schema.zig"); const Api = schema.Api; @@ -53,7 +52,7 @@ const Report = @import("./report.zig"); const Linker = linker.Linker; const Resolver = _resolver.Resolver; const TOML = @import("./toml/toml_parser.zig").TOML; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const PackageManager = @import("./install/install.zig").PackageManager; pub fn MacroJSValueType_() type { diff --git a/src/bundler/entry_points.zig b/src/bundler/entry_points.zig index 3f61af983..d06bee964 100644 --- a/src/bundler/entry_points.zig +++ b/src/bundler/entry_points.zig @@ -1,6 +1,6 @@ -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const std = @import("std"); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Fs = @import("../fs.zig"); const js_ast = @import("../js_ast.zig"); diff --git a/src/bundler/generate_node_modules_bundle.zig b/src/bundler/generate_node_modules_bundle.zig index a27dc0af3..b1a8d5b40 100644 --- a/src/bundler/generate_node_modules_bundle.zig +++ b/src/bundler/generate_node_modules_bundle.zig @@ -1,6 +1,6 @@ const Bundler = @import("../bundler.zig").Bundler; const GenerateNodeModulesBundle = @This(); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -14,7 +14,7 @@ const FeatureFlags = bun.FeatureFlags; const C = bun.C; const std = @import("std"); const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const options = @import("../options.zig"); const js_parser = @import("../js_parser.zig"); const json_parser = @import("../json_parser.zig"); @@ -26,7 +26,6 @@ const Define = @import("../defines.zig").Define; const DebugOptions = @import("../cli.zig").Command.DebugOptions; const ThreadPoolLib = @import("../thread_pool.zig"); -const panicky = @import("../panic_handler.zig"); const Fs = @import("../fs.zig"); const schema = @import("../api/schema.zig"); const Api = schema.Api; @@ -57,7 +56,7 @@ const EntryPoints = @import("./entry_points.zig"); const BunQueue = sync.Channel(PendingImports, .Dynamic); const GenerateNodeModuleBundle = @This(); const ThisBundler = @import("../bundler.zig").Bundler; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; pub const ThreadPool = struct { pool: ThreadPoolLib = undefined, // Hardcode 512 as max number of threads for now. diff --git a/src/bunfig.zig b/src/bunfig.zig index d2ca86380..f29533a7e 100644 --- a/src/bunfig.zig +++ b/src/bunfig.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const bun = @import("./global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,7 +11,7 @@ const default_allocator = bun.default_allocator; const URL = @import("./url.zig").URL; const C = bun.C; const options = @import("./options.zig"); -const logger = @import("./logger.zig"); +const logger = @import("bun").logger; const js_ast = @import("./js_ast.zig"); const js_lexer = @import("./js_lexer.zig"); const Defines = @import("./defines.zig"); diff --git a/src/cache.zig b/src/cache.zig index 2ff1ce896..e59e473e6 100644 --- a/src/cache.zig +++ b/src/cache.zig @@ -1,4 +1,4 @@ -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const StoredFileDescriptorType = bun.StoredFileDescriptorType; @@ -12,7 +12,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const js_ast = @import("./js_ast.zig"); -const logger = @import("./logger.zig"); +const logger = @import("bun").logger; const js_parser = @import("./js_parser.zig"); const json_parser = @import("./json_parser.zig"); const options = @import("./options.zig"); diff --git a/src/cli.zig b/src/cli.zig index 0e79b1e21..e2236291c 100644 --- a/src/cli.zig +++ b/src/cli.zig @@ -1,4 +1,4 @@ -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -13,19 +13,19 @@ const C = bun.C; const std = @import("std"); const lex = @import("js_lexer.zig"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const options = @import("options.zig"); const js_parser = @import("js_parser.zig"); const json_parser = @import("json_parser.zig"); const js_printer = @import("js_printer.zig"); const js_ast = @import("js_ast.zig"); const linker = @import("linker.zig"); -const panicky = @import("panic_handler.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 clap = @import("clap"); +const clap = @import("bun").clap; const BunJS = @import("./bun_js.zig"); const Install = @import("./install/install.zig"); const bundler = @import("bundler.zig"); diff --git a/src/cli/build_command.zig b/src/cli/build_command.zig index fc63f10a7..2deae1a1e 100644 --- a/src/cli/build_command.zig +++ b/src/cli/build_command.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -12,13 +12,13 @@ const C = bun.C; const std = @import("std"); const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const options = @import("../options.zig"); const js_parser = @import("../js_parser.zig"); const js_ast = @import("../js_ast.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const allocators = @import("../allocators.zig"); const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; diff --git a/src/cli/bun_command.zig b/src/cli/bun_command.zig index 77e639f18..30a1531b6 100644 --- a/src/cli/bun_command.zig +++ b/src/cli/bun_command.zig @@ -1,6 +1,6 @@ const std = @import("std"); const Command = @import("../cli.zig").Command; -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -12,7 +12,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const options = @import("../options.zig"); const js_parser = @import("../js_parser.zig"); @@ -20,7 +20,7 @@ const json_parser = @import("../json_parser.zig"); const js_printer = @import("../js_printer.zig"); const js_ast = @import("../js_ast.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; const resolve_path = @import("../resolver/resolve_path.zig"); diff --git a/src/cli/colon_list_type.zig b/src/cli/colon_list_type.zig index 9aa4aaa96..9b54c4381 100644 --- a/src/cli/colon_list_type.zig +++ b/src/cli/colon_list_type.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/cli/create_command.zig b/src/cli/create_command.zig index 27531e4ad..fe4de3adc 100644 --- a/src/cli/create_command.zig +++ b/src/cli/create_command.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const constStrToU8 = bun.constStrToU8; const Output = bun.Output; @@ -12,13 +12,13 @@ const C = bun.C; const std = @import("std"); const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const options = @import("../options.zig"); const js_parser = @import("../js_parser.zig"); const js_ast = @import("../js_ast.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const allocators = @import("../allocators.zig"); const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; @@ -29,7 +29,7 @@ const bundler = @import("../bundler.zig"); const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle; const fs = @import("../fs.zig"); const URL = @import("../url.zig").URL; -const HTTP = @import("http"); +const HTTP = @import("bun").HTTP; const NetworkThread = HTTP.NetworkThread; const ParseJSON = @import("../json_parser.zig").ParseJSONUTF8; const Archive = @import("../libarchive/libarchive.zig").Archive; @@ -38,9 +38,9 @@ const JSPrinter = @import("../js_printer.zig"); const DotEnv = @import("../env_loader.zig"); const NPMClient = @import("../which_npm_client.zig").NPMClient; const which = @import("../which.zig").which; -const clap = @import("clap"); +const clap = @import("bun").clap; const Lock = @import("../lock.zig").Lock; -const Headers = @import("http").Headers; +const Headers = @import("bun").HTTP.Headers; const CopyFile = @import("../copy_file.zig"); var bun_path_buf: [bun.MAX_PATH_BYTES]u8 = undefined; const Futex = @import("../futex.zig"); @@ -1671,7 +1671,7 @@ const Commands = .{ &[_]string{""}, &[_]string{""}, }; -const picohttp = @import("picohttp"); +const picohttp = @import("bun").picohttp; pub const DownloadedExample = struct { tarball_bytes: MutableString, diff --git a/src/cli/dev_command.zig b/src/cli/dev_command.zig index 46c4a0e3c..77f974e05 100644 --- a/src/cli/dev_command.zig +++ b/src/cli/dev_command.zig @@ -1,6 +1,6 @@ const Server = @import("../http.zig").Server; const Command = @import("../cli.zig").Command; -const Global = @import("../global.zig").Global; +const Global = @import("bun").Global; pub const DevCommand = struct { pub fn exec(ctx: Command.Context) !void { Global.configureAllocator(.{ .long_running = true }); diff --git a/src/cli/discord_command.zig b/src/cli/discord_command.zig index b5af28345..0f260c20b 100644 --- a/src/cli/discord_command.zig +++ b/src/cli/discord_command.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/cli/init_command.zig b/src/cli/init_command.zig index 13d15ce15..774bede2d 100644 --- a/src/cli/init_command.zig +++ b/src/cli/init_command.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -19,7 +19,7 @@ const linker = @import("../linker.zig"); const options = @import("../options.zig"); const initializeStore = @import("./create_command.zig").initializeStore; const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const JSPrinter = @import("../js_printer.zig"); fn exists(path: anytype) bool { diff --git a/src/cli/install_completions_command.zig b/src/cli/install_completions_command.zig index 3cb992b2d..961a15d2d 100644 --- a/src/cli/install_completions_command.zig +++ b/src/cli/install_completions_command.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,13 +11,13 @@ const C = bun.C; const std = @import("std"); const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const options = @import("../options.zig"); const js_parser = @import("../js_parser.zig"); const js_ast = @import("../js_ast.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const allocators = @import("../allocators.zig"); const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; @@ -35,9 +35,9 @@ const JSPrinter = @import("../js_printer.zig"); const DotEnv = @import("../env_loader.zig"); const NPMClient = @import("../which_npm_client.zig").NPMClient; const which = @import("../which.zig").which; -const clap = @import("clap"); +const clap = @import("bun").clap; const Lock = @import("../lock.zig").Lock; -const Headers = @import("http").Headers; +const Headers = @import("bun").HTTP.Headers; const CopyFile = @import("../copy_file.zig"); const ShellCompletions = @import("./shell_completions.zig"); diff --git a/src/cli/package_manager_command.zig b/src/cli/package_manager_command.zig index 3537c75a7..824470fd8 100644 --- a/src/cli/package_manager_command.zig +++ b/src/cli/package_manager_command.zig @@ -2,12 +2,12 @@ const Command = @import("../cli.zig").Command; const PackageManager = @import("../install/install.zig").PackageManager; const ComamndLineArguments = PackageManager.CommandLineArguments; const std = @import("std"); -const strings = @import("strings"); -const Global = @import("../global.zig").Global; -const Output = @import("../global.zig").Output; +const strings = @import("bun").strings; +const Global = @import("bun").Global; +const Output = @import("bun").Output; const Fs = @import("../fs.zig"); const Path = @import("../resolver/resolve_path.zig"); -const bun = @import("../global.zig"); +const bun = @import("bun"); pub const PackageManagerCommand = struct { pub fn printHelp(_: std.mem.Allocator) void {} pub fn printHash(ctx: Command.Context, lockfile_: []const u8) !void { diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig index 8a9ecd01c..80002dbe4 100644 --- a/src/cli/run_command.zig +++ b/src/cli/run_command.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const options = @import("../options.zig"); const js_parser = @import("../js_parser.zig"); @@ -19,7 +19,7 @@ const json_parser = @import("../json_parser.zig"); const js_printer = @import("../js_printer.zig"); const js_ast = @import("../js_ast.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; const resolve_path = @import("../resolver/resolve_path.zig"); diff --git a/src/cli/shell_completions.zig b/src/cli/shell_completions.zig index 30d987da0..900363261 100644 --- a/src/cli/shell_completions.zig +++ b/src/cli/shell_completions.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/cli/test_command.zig b/src/cli/test_command.zig index 549c4bc71..a8e028d75 100644 --- a/src/cli/test_command.zig +++ b/src/cli/test_command.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const FileSystem = @import("../fs.zig").FileSystem; const PathName = @import("../fs.zig").PathName; @@ -21,7 +21,7 @@ const json_parser = @import("../json_parser.zig"); const js_printer = @import("../js_printer.zig"); const js_ast = @import("../js_ast.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; const resolve_path = @import("../resolver/resolve_path.zig"); @@ -36,14 +36,14 @@ var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined; var path_buf2: [bun.MAX_PATH_BYTES]u8 = undefined; const PathString = bun.PathString; const is_bindgen = std.meta.globalOption("bindgen", bool) orelse false; -const HTTPThread = @import("http").HTTPThread; +const HTTPThread = @import("bun").HTTP.HTTPThread; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const Jest = JSC.Jest; const TestRunner = JSC.Jest.TestRunner; const Test = TestRunner.Test; -const NetworkThread = @import("http").NetworkThread; -const uws = @import("uws"); +const NetworkThread = @import("bun").HTTP.NetworkThread; +const uws = @import("bun").uws; pub const CommandLineReporter = struct { jest: TestRunner, callback: TestRunner.Callback, diff --git a/src/cli/upgrade_command.zig b/src/cli/upgrade_command.zig index fdae2f0a0..2cb5dcc93 100644 --- a/src/cli/upgrade_command.zig +++ b/src/cli/upgrade_command.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,13 +11,13 @@ const C = bun.C; const std = @import("std"); const lex = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const options = @import("../options.zig"); const js_parser = @import("../js_parser.zig"); const js_ast = @import("../js_ast.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const allocators = @import("../allocators.zig"); const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; @@ -28,16 +28,16 @@ const bundler = @import("../bundler.zig"); const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle; const fs = @import("../fs.zig"); const URL = @import("../url.zig").URL; -const HTTP = @import("http"); +const HTTP = @import("bun").HTTP; const ParseJSON = @import("../json_parser.zig").ParseJSONUTF8; const Archive = @import("../libarchive/libarchive.zig").Archive; const Zlib = @import("../zlib.zig"); const JSPrinter = @import("../js_printer.zig"); const DotEnv = @import("../env_loader.zig"); const which = @import("../which.zig").which; -const clap = @import("clap"); +const clap = @import("bun").clap; const Lock = @import("../lock.zig").Lock; -const Headers = @import("http").Headers; +const Headers = @import("bun").HTTP.Headers; const CopyFile = @import("../copy_file.zig"); const NetworkThread = HTTP.NetworkThread; diff --git a/src/crash_reporter.zig b/src/crash_reporter.zig index 0126c7f5e..3f2dadf1e 100644 --- a/src/crash_reporter.zig +++ b/src/crash_reporter.zig @@ -28,7 +28,7 @@ noinline fn sigaction_handler(sig: i32, info: *const std.os.siginfo_t, _: ?*cons } noinline fn sigpipe_handler(_: i32, _: *const std.os.siginfo_t, _: ?*const anyopaque) callconv(.C) void { - const bun = @import("./global.zig"); + const bun = @import("bun"); bun.Output.debug("SIGPIPE received\n", .{}); } diff --git a/src/css_scanner.zig b/src/css_scanner.zig index c48a54441..380c604e6 100644 --- a/src/css_scanner.zig +++ b/src/css_scanner.zig @@ -1,6 +1,6 @@ const Fs = @import("fs.zig"); const std = @import("std"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -15,7 +15,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const options = @import("./options.zig"); const import_record = @import("import_record.zig"); -const logger = @import("./logger.zig"); +const logger = @import("bun").logger; const Options = options; const resolver = @import("./resolver/resolver.zig"); const _linker = @import("./linker.zig"); diff --git a/src/defines-table.zig b/src/defines-table.zig index 1bd419a32..4c458006f 100644 --- a/src/defines-table.zig +++ b/src/defines-table.zig @@ -1,4 +1,4 @@ -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/defines.zig b/src/defines.zig index a0c885f34..978b81df3 100644 --- a/src/defines.zig +++ b/src/defines.zig @@ -1,10 +1,10 @@ const std = @import("std"); const js_ast = @import("./js_ast.zig"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const js_lexer = @import("js_lexer.zig"); const json_parser = @import("json_parser.zig"); const fs = @import("fs.zig"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/deps/boringssl.translated.zig b/src/deps/boringssl.translated.zig index 267fb639c..24d54aa1f 100644 --- a/src/deps/boringssl.translated.zig +++ b/src/deps/boringssl.translated.zig @@ -18801,8 +18801,8 @@ pub const SSL = opaque { }; } - const Output = @import("../global.zig").Output; - const Environment = @import("../global.zig").Environment; + const Output = @import("bun").Output; + const Environment = @import("bun").Environment; pub fn read(this: *SSL, buf: []u8) Error!usize { const rc = SSL_read(this, buf.ptr, @intCast(c_int, buf.len)); diff --git a/src/deps/lol-html.zig b/src/deps/lol-html.zig index a7fa335fa..2b8f72272 100644 --- a/src/deps/lol-html.zig +++ b/src/deps/lol-html.zig @@ -7,7 +7,7 @@ pub const MemorySettings = extern struct { }; inline fn auto_disable() void { - if (comptime @import("../feature_flags.zig").disable_lolhtml) + if (comptime @import("bun").FeatureFlags.disable_lolhtml) unreachable; } diff --git a/src/deps/picohttp.zig b/src/deps/picohttp.zig index 4a6848749..141871f26 100644 --- a/src/deps/picohttp.zig +++ b/src/deps/picohttp.zig @@ -1,14 +1,14 @@ const std = @import("std"); const c = @import("picohttpparser.zig"); -const ExactSizeMatcher = @import("../exact_size_matcher.zig").ExactSizeMatcher; +const ExactSizeMatcher = @import("bun").ExactSizeMatcher; const Match = ExactSizeMatcher(2); -const Output = @import("../global.zig").Output; -const Environment = @import("../global.zig").Environment; +const Output = @import("bun").Output; +const Environment = @import("bun").Environment; +const StringBuilder = @import("bun").StringBuilder; const fmt = std.fmt; const assert = std.debug.assert; -const StringBuilder = @import("../string_builder.zig"); pub const Header = struct { name: []const u8, diff --git a/src/deps/uws.zig b/src/deps/uws.zig index e69b096b4..20640948a 100644 --- a/src/deps/uws.zig +++ b/src/deps/uws.zig @@ -1,7 +1,8 @@ pub const is_bindgen = @import("std").meta.globalOption("bindgen", bool) orelse false; -const Api = @import("../api/schema.zig").Api; +const bun = @import("bun"); +const Api = bun.ApiSchema; const std = @import("std"); -const Environment = @import("../env.zig"); +const Environment = bun.Environment; pub const u_int8_t = u8; pub const u_int16_t = c_ushort; pub const u_int32_t = c_uint; @@ -9,10 +10,10 @@ pub const u_int64_t = c_ulonglong; pub const LIBUS_LISTEN_DEFAULT: i32 = 0; pub const LIBUS_LISTEN_EXCLUSIVE_PORT: i32 = 1; pub const Socket = opaque {}; -const bun = @import("../global.zig"); + const uws = @This(); -const BoringSSL = @import("boringssl"); +const BoringSSL = @import("bun").BoringSSL; fn NativeSocketHandleType(comptime ssl: bool) type { if (ssl) { return BoringSSL.SSL; diff --git a/src/deps/zig-clap/clap/comptime.zig b/src/deps/zig-clap/clap/comptime.zig index e3b3a8cdc..cfabd7cf4 100644 --- a/src/deps/zig-clap/clap/comptime.zig +++ b/src/deps/zig-clap/clap/comptime.zig @@ -76,7 +76,7 @@ pub fn ComptimeClap( if (param.names.long == null and param.names.short == null) { try pos.append(arg.value.?); if (opt.stop_after_positional_at > 0 and pos.items.len >= opt.stop_after_positional_at) { - const bun = @import("../../../global.zig"); + const bun = @import("bun"); if (comptime bun.Environment.isWindows) @compileError( "TODO: implement stop_after_positional_at on windows", ); diff --git a/src/env_loader.zig b/src/env_loader.zig index ca8da0652..fec4d3faf 100644 --- a/src/env_loader.zig +++ b/src/env_loader.zig @@ -1,6 +1,6 @@ const std = @import("std"); -const logger = @import("./logger.zig"); -const bun = @import("./global.zig"); +const logger = @import("bun").logger; +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/feature_flags.zig b/src/feature_flags.zig index 735295ee3..f626b725b 100644 --- a/src/feature_flags.zig +++ b/src/feature_flags.zig @@ -112,4 +112,4 @@ pub const hardcode_localhost_to_127_0_0_1 = true; /// so we just disable it pub const support_jsxs_in_jsx_transform = false; -pub const use_simdutf = !@import("./global.zig").JSC.is_bindgen; +pub const use_simdutf = !@import("bun").JSC.is_bindgen; diff --git a/src/fs.zig b/src/fs.zig index dfc7bfe10..ab03d9c1d 100644 --- a/src/fs.zig +++ b/src/fs.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/http.zig b/src/http.zig index fedb30a65..82fa5734b 100644 --- a/src/http.zig +++ b/src/http.zig @@ -1,6 +1,6 @@ // const c = @import("./c.zig"); const std = @import("std"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -19,7 +19,7 @@ const ByteApiWriter = @import("./api/schema.zig").ByteWriter; const NewApiWriter = @import("./api/schema.zig").Writer; const js_ast = @import("./js_ast.zig"); const bundler = @import("bundler.zig"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const Fs = @import("./fs.zig"); const Options = @import("./options.zig"); const Fallback = @import("./runtime.zig").Fallback; @@ -37,8 +37,8 @@ const Analytics = @import("./analytics/analytics_thread.zig"); const Arena = std.heap.ArenaAllocator; const ThreadlocalArena = @import("./mimalloc_arena.zig").Arena; const JSON = @import("./json_parser.zig"); -const DateTime = @import("datetime"); -const ThreadPool = @import("thread_pool"); +const DateTime = bun.DateTime; +const ThreadPool = @import("bun").ThreadPool; const SourceMap = @import("./sourcemap/sourcemap.zig"); const ObjectPool = @import("./pool.zig").ObjectPool; const Lock = @import("./lock.zig").Lock; @@ -58,7 +58,7 @@ const IPv6 = std.x.os.IPv6; const Socket = std.x.os.Socket; const os = std.os; -const picohttp = @import("picohttp"); +const picohttp = @import("bun").picohttp; const Header = picohttp.Header; const Request = picohttp.Request; const Response = picohttp.Response; @@ -71,7 +71,7 @@ const watcher = @import("./watcher.zig"); threadlocal var req_headers_buf: [100]picohttp.Header = undefined; threadlocal var res_headers_buf: [100]picohttp.Header = undefined; const sync = @import("./sync.zig"); -const JavaScript = @import("javascript_core"); +const JavaScript = @import("bun").JSC; const JavaScriptCore = JavaScriptCore.C; const Syscall = JavaScript.Node.Syscall; const Router = @import("./router.zig"); @@ -673,7 +673,7 @@ pub const RequestContext = struct { _ = try ctx.writeSocket(writer.getWritten(), SOCKET_FLAGS); } - const AsyncIO = @import("io"); + const AsyncIO = @import("bun").AsyncIO; pub fn writeSocket(ctx: *RequestContext, buf_: anytype, _: anytype) !usize { var total: usize = 0; var buf: []const u8 = buf_; diff --git a/src/http/header_builder.zig b/src/http/header_builder.zig index deefecbf7..9e53455d1 100644 --- a/src/http/header_builder.zig +++ b/src/http/header_builder.zig @@ -1,7 +1,7 @@ const HeaderBuilder = @This(); const StringBuilder = @import("../string_builder.zig"); const Headers = @import("./headers.zig"); -const string = @import("../global.zig").string; +const string = @import("bun").string; const HTTPClient = @import("../http_client_async.zig"); const Api = @import("../api/schema.zig").Api; const std = @import("std"); diff --git a/src/http/method.zig b/src/http/method.zig index 35017e6af..01d2daa87 100644 --- a/src/http/method.zig +++ b/src/http/method.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/http/mime_type.zig b/src/http/mime_type.zig index 294fc18d8..157733767 100644 --- a/src/http/mime_type.zig +++ b/src/http/mime_type.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/http/url_path.zig b/src/http/url_path.zig index 973e80878..e262777da 100644 --- a/src/http/url_path.zig +++ b/src/http/url_path.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const toMutable = bun.constStrToU8; diff --git a/src/http/websocket.zig b/src/http/websocket.zig index 12348f83c..9221ccaac 100644 --- a/src/http/websocket.zig +++ b/src/http/websocket.zig @@ -10,7 +10,7 @@ const IPv4 = std.x.os.IPv4; const IPv6 = std.x.os.IPv6; const Socket = std.x.os.Socket; const os = std.os; -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/http/websocket_http_client.zig b/src/http/websocket_http_client.zig index 66592ea34..2dd06cef1 100644 --- a/src/http/websocket_http_client.zig +++ b/src/http/websocket_http_client.zig @@ -3,7 +3,7 @@ const std = @import("std"); const native_endian = @import("builtin").target.cpu.arch.endian(); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -14,9 +14,9 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; -const uws = @import("uws"); -const JSC = @import("javascript_core"); -const PicoHTTP = @import("picohttp"); +const uws = @import("bun").uws; +const JSC = @import("bun").JSC; +const PicoHTTP = @import("bun").picohttp; const ObjectPool = @import("../pool.zig").ObjectPool; const WebsocketHeader = @import("./websocket.zig").WebsocketHeader; const WebsocketDataFrame = @import("./websocket.zig").WebsocketDataFrame; diff --git a/src/http/zlib.zig b/src/http/zlib.zig index 0e48be608..13db13646 100644 --- a/src/http/zlib.zig +++ b/src/http/zlib.zig @@ -1,10 +1,10 @@ const Lock = @import("../lock.zig").Lock; const std = @import("std"); -const MutableString = @import("../global.zig").MutableString; +const MutableString = @import("bun").MutableString; const getAllocator = @import("../http_client_async.zig").getAllocator; const ZlibPool = @This(); const Zlib = @import("../zlib.zig"); -const bun = @import("../global.zig"); +const bun = @import("bun"); fn initMutableString(allocator: std.mem.Allocator) anyerror!MutableString { return MutableString.initEmpty(allocator); diff --git a/src/http_client_async.zig b/src/http_client_async.zig index 3c18b9552..5f6c68cf0 100644 --- a/src/http_client_async.zig +++ b/src/http_client_async.zig @@ -1,5 +1,5 @@ -const picohttp = @import("picohttp"); -const bun = @import("./global.zig"); +const picohttp = @import("bun").picohttp; +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -17,16 +17,16 @@ const Lock = @import("./lock.zig").Lock; const HTTPClient = @This(); const Zlib = @import("./zlib.zig"); const StringBuilder = @import("./string_builder.zig"); -const AsyncIO = @import("io"); -const ThreadPool = @import("thread_pool"); -const BoringSSL = @import("boringssl"); +const AsyncIO = @import("bun").AsyncIO; +const ThreadPool = @import("bun").ThreadPool; +const BoringSSL = @import("bun").BoringSSL; pub const NetworkThread = @import("./network_thread.zig"); const ObjectPool = @import("./pool.zig").ObjectPool; const SOCK = os.SOCK; const Arena = @import("./mimalloc_arena.zig").Arena; const ZlibPool = @import("./http/zlib.zig"); const URLBufferPool = ObjectPool([4096]u8, null, false, 10); -const uws = @import("uws"); +const uws = @import("bun").uws; pub const MimeType = @import("./http/mime_type.zig"); pub const URLPath = @import("./http/url_path.zig"); // This becomes Arena.allocator diff --git a/src/import_record.zig b/src/import_record.zig index fcf5b1c46..c2db96b09 100644 --- a/src/import_record.zig +++ b/src/import_record.zig @@ -1,5 +1,5 @@ const fs = @import("fs.zig"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const std = @import("std"); const Ref = @import("ast/base.zig").Ref; const Api = @import("./api/schema.zig").Api; diff --git a/src/install/bin.zig b/src/install/bin.zig index 8c7175e30..fd2220abc 100644 --- a/src/install/bin.zig +++ b/src/install/bin.zig @@ -3,14 +3,14 @@ const Semver = @import("./semver.zig"); const ExternalString = Semver.ExternalString; const String = Semver.String; const std = @import("std"); -const strings = @import("strings"); +const strings = @import("bun").strings; const Environment = @import("../env.zig"); const Path = @import("../resolver/resolve_path.zig"); const C = @import("../c.zig"); const Fs = @import("../fs.zig"); -const stringZ = @import("../global.zig").stringZ; +const stringZ = @import("bun").stringZ; const Resolution = @import("./resolution.zig").Resolution; -const bun = @import("../global.zig"); +const bun = @import("bun"); /// Normalized `bin` field in [package.json](https://docs.npmjs.com/cli/v8/configuring-npm/package-json#bin) /// Can be a: /// - file path (relative to the package root) diff --git a/src/install/dependency.zig b/src/install/dependency.zig index e97cc92f9..0c81edfad 100644 --- a/src/install/dependency.zig +++ b/src/install/dependency.zig @@ -7,11 +7,11 @@ const SlicedString = Semver.SlicedString; const PackageNameHash = @import("./install.zig").PackageNameHash; const Features = @import("./install.zig").Features; const Install = @import("./install.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const Dependency = @This(); const string = @import("../string_types.zig").string; const strings = @import("../string_immutable.zig"); -const bun = @import("../global.zig"); +const bun = @import("bun"); pub const Pair = struct { resolution_id: Install.PackageID = Install.invalid_package_id, diff --git a/src/install/extract_tarball.zig b/src/install/extract_tarball.zig index c74c0fb29..3b5271d48 100644 --- a/src/install/extract_tarball.zig +++ b/src/install/extract_tarball.zig @@ -1,4 +1,4 @@ -const Output = @import("../global.zig").Output; +const Output = @import("bun").Output; const strings = @import("../string_immutable.zig"); const string = @import("../string_types.zig").string; const Resolution = @import("./resolution.zig").Resolution; @@ -10,9 +10,9 @@ const PackageManager = @import("./install.zig").PackageManager; const std = @import("std"); const Npm = @import("./npm.zig"); const ExtractTarball = @This(); -const default_allocator = @import("../global.zig").default_allocator; -const Global = @import("../global.zig").Global; -const bun = @import("../global.zig"); +const default_allocator = @import("bun").default_allocator; +const Global = @import("bun").Global; +const bun = @import("bun"); name: strings.StringOrTinyString, resolution: Resolution, registry: string, diff --git a/src/install/install.zig b/src/install/install.zig index edfb4da42..85372fed3 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,14 +11,14 @@ const C = bun.C; const std = @import("std"); const JSLexer = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const js_parser = @import("../js_parser.zig"); const json_parser = @import("../json_parser.zig"); const JSPrinter = @import("../js_printer.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; const Path = @import("../resolver/resolve_path.zig"); @@ -30,25 +30,25 @@ const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle; const DotEnv = @import("../env_loader.zig"); const which = @import("../which.zig").which; const Run = @import("../bun_js.zig").Run; -const HeaderBuilder = @import("http").HeaderBuilder; +const HeaderBuilder = @import("bun").HTTP.HeaderBuilder; const Fs = @import("../fs.zig"); const FileSystem = Fs.FileSystem; const Lock = @import("../lock.zig").Lock; var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined; var path_buf2: [bun.MAX_PATH_BYTES]u8 = undefined; const URL = @import("../url.zig").URL; -const AsyncHTTP = @import("http").AsyncHTTP; -const HTTPChannel = @import("http").HTTPChannel; -const NetworkThread = @import("http").NetworkThread; -const HTTP = @import("http"); +const AsyncHTTP = @import("bun").HTTP.AsyncHTTP; +const HTTPChannel = @import("bun").HTTP.HTTPChannel; +const NetworkThread = @import("bun").HTTP.NetworkThread; +const HTTP = @import("bun").HTTP; const Integrity = @import("./integrity.zig").Integrity; -const clap = @import("clap"); +const clap = @import("bun").clap; const ExtractTarball = @import("./extract_tarball.zig"); const Npm = @import("./npm.zig"); const Bitset = @import("./bit_set.zig").DynamicBitSetUnmanaged; const z_allocator = @import("../memory_allocator.zig").z_allocator; -const Syscall = @import("javascript_core").Node.Syscall; +const Syscall = @import("bun").JSC.Node.Syscall; const RunCommand = @import("../cli/run_command.zig").RunCommand; threadlocal var initialized_store = false; const Futex = @import("../futex.zig"); @@ -1423,7 +1423,7 @@ const TaskCallbackList = std.ArrayListUnmanaged(TaskCallbackContext); const TaskDependencyQueue = std.HashMapUnmanaged(u64, TaskCallbackList, IdentityContext(u64), 80); const TaskChannel = sync.Channel(Task, .{ .Static = 4096 }); const NetworkChannel = sync.Channel(*NetworkTask, .{ .Static = 8192 }); -const ThreadPool = @import("thread_pool"); +const ThreadPool = @import("bun").ThreadPool; const PackageManifestMap = std.HashMapUnmanaged(PackageNameHash, Npm.PackageManifest, IdentityContext(PackageNameHash), 80); pub const CacheLevel = struct { @@ -1431,7 +1431,7 @@ pub const CacheLevel = struct { use_etag: bool, use_last_modified: bool, }; -const AsyncIO = @import("io"); +const AsyncIO = @import("bun").AsyncIO; const Waker = AsyncIO.Waker; // We can't know all the packages we need until we've downloaded all the packages diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig index c3555491e..5948ef2c8 100644 --- a/src/install/lockfile.zig +++ b/src/install/lockfile.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,7 +11,7 @@ const C = bun.C; const std = @import("std"); const JSLexer = @import("../js_lexer.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const js_parser = @import("../js_parser.zig"); const Expr = @import("../js_ast.zig").Expr; @@ -19,7 +19,7 @@ const json_parser = @import("../json_parser.zig"); const JSPrinter = @import("../js_printer.zig"); const linker = @import("../linker.zig"); -const panicky = @import("../panic_handler.zig"); + const sync = @import("../sync.zig"); const Api = @import("../api/schema.zig").Api; const Path = @import("../resolver/resolve_path.zig"); @@ -31,19 +31,19 @@ const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle; const DotEnv = @import("../env_loader.zig"); const which = @import("../which.zig").which; const Run = @import("../bun_js.zig").Run; -const HeaderBuilder = @import("http").HeaderBuilder; +const HeaderBuilder = @import("bun").HTTP.HeaderBuilder; const Fs = @import("../fs.zig"); const FileSystem = Fs.FileSystem; const Lock = @import("../lock.zig").Lock; var path_buf: [bun.MAX_PATH_BYTES]u8 = undefined; var path_buf2: [bun.MAX_PATH_BYTES]u8 = undefined; const URL = @import("../url.zig").URL; -const AsyncHTTP = @import("http").AsyncHTTP; -const HTTPChannel = @import("http").HTTPChannel; -const NetworkThread = @import("http").NetworkThread; +const AsyncHTTP = @import("bun").HTTP.AsyncHTTP; +const HTTPChannel = @import("bun").HTTP.HTTPChannel; +const NetworkThread = @import("bun").HTTP.NetworkThread; const Integrity = @import("./integrity.zig").Integrity; -const clap = @import("clap"); +const clap = @import("bun").clap; const ExtractTarball = @import("./extract_tarball.zig"); const Npm = @import("./npm.zig"); const Bitset = @import("./bit_set.zig").DynamicBitSetUnmanaged; diff --git a/src/install/npm.zig b/src/install/npm.zig index 2be84624c..965157d50 100644 --- a/src/install/npm.zig +++ b/src/install/npm.zig @@ -11,15 +11,15 @@ const ExternalStringMap = @import("./install.zig").ExternalStringMap; const ExternalStringList = @import("./install.zig").ExternalStringList; const ExternalSlice = @import("./install.zig").ExternalSlice; const initializeStore = @import("./install.zig").initializeStore; -const logger = @import("../logger.zig"); -const Output = @import("../global.zig").Output; +const logger = @import("bun").logger; +const Output = @import("bun").Output; const Integrity = @import("./integrity.zig").Integrity; const Bin = @import("./bin.zig").Bin; -const Environment = @import("../global.zig").Environment; +const Environment = @import("bun").Environment; const Aligner = @import("./install.zig").Aligner; -const HTTPClient = @import("http"); +const HTTPClient = @import("bun").HTTP; const json_parser = @import("../json_parser.zig"); -const default_allocator = @import("../global.zig").default_allocator; +const default_allocator = @import("bun").default_allocator; const IdentityContext = @import("../identity_context.zig").IdentityContext; const ArrayIdentityContext = @import("../identity_context.zig").ArrayIdentityContext; const SlicedString = Semver.SlicedString; @@ -155,7 +155,7 @@ pub const Registry = struct { not_found: void, }; - const Pico = @import("picohttp"); + const Pico = @import("bun").picohttp; pub fn getPackageMetadata( allocator: std.mem.Allocator, response: Pico.Response, diff --git a/src/install/resolvers/folder_resolver.zig b/src/install/resolvers/folder_resolver.zig index b48600747..a102e22db 100644 --- a/src/install/resolvers/folder_resolver.zig +++ b/src/install/resolvers/folder_resolver.zig @@ -3,17 +3,17 @@ const PackageID = @import("../install.zig").PackageID; const Lockfile = @import("../install.zig").Lockfile; const PackageManager = @import("../install.zig").PackageManager; const Npm = @import("../npm.zig"); -const logger = @import("../../logger.zig"); +const logger = @import("bun").logger; const FileSystem = @import("../../fs.zig").FileSystem; const JSAst = @import("../../js_ast.zig"); const string = @import("../../string_types.zig").string; const Features = @import("../install.zig").Features; const IdentityContext = @import("../../identity_context.zig").IdentityContext; -const strings = @import("strings"); +const strings = @import("bun").strings; const Resolution = @import("../resolution.zig").Resolution; const String = @import("../semver.zig").String; const Semver = @import("../semver.zig"); -const bun = @import("../../global.zig"); +const bun = @import("bun"); const Dependency = @import("../dependency.zig"); pub const FolderResolution = union(Tag) { package_id: PackageID, diff --git a/src/install/semver.zig b/src/install/semver.zig index 37af5c7e2..f9699e214 100644 --- a/src/install/semver.zig +++ b/src/install/semver.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/io/io_darwin.zig b/src/io/io_darwin.zig index 77a4c5c4d..82570edd0 100644 --- a/src/io/io_darwin.zig +++ b/src/io/io_darwin.zig @@ -259,7 +259,7 @@ const fd_t = os.fd_t; const mem = std.mem; const assert = std.debug.assert; const c = std.c; -const bun = @import("../global.zig"); +const bun = @import("bun"); pub const darwin = struct { pub usingnamespace os.darwin; pub extern "c" fn @"recvfrom$NOCANCEL"(sockfd: c.fd_t, noalias buf: *anyopaque, len: usize, flags: u32, noalias src_addr: ?*c.sockaddr, noalias addrlen: ?*c.socklen_t) isize; diff --git a/src/io/io_linux.zig b/src/io/io_linux.zig index 323dd03f9..99a12a763 100644 --- a/src/io/io_linux.zig +++ b/src/io/io_linux.zig @@ -1,6 +1,6 @@ const std = @import("std"); const assert = std.debug.assert; -const Platform = @import("analytics").GenerateHeader.GeneratePlatform; +const Platform = @import("bun").analytics.GenerateHeader.GeneratePlatform; const os = struct { pub usingnamespace std.os; pub const EPERM = 1; diff --git a/src/js_ast.zig b/src/js_ast.zig index b7f4bc3d5..f6a7ac879 100644 --- a/src/js_ast.zig +++ b/src/js_ast.zig @@ -1,8 +1,8 @@ const std = @import("std"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const JSXRuntime = @import("options.zig").JSX.Runtime; const Runtime = @import("runtime.zig").Runtime; -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -17,8 +17,8 @@ const RefHashCtx = @import("ast/base.zig").RefHashCtx; const ObjectPool = @import("./pool.zig").ObjectPool; const ImportRecord = @import("import_record.zig").ImportRecord; const allocators = @import("allocators.zig"); -const JSC = @import("javascript_core"); -const HTTP = @import("http"); +const JSC = @import("bun").JSC; +const HTTP = @import("bun").HTTP; const RefCtx = @import("./ast/base.zig").RefCtx; const _hash_map = @import("hash_map.zig"); const JSONParser = @import("./json_parser.zig"); @@ -4797,7 +4797,7 @@ pub const BunPlugin = struct { }; pub const Macro = struct { - const JavaScript = @import("javascript_core"); + const JavaScript = @import("bun").JSC; const JSCBase = @import("./bun.js/base.zig"); const Resolver = @import("./resolver/resolver.zig").Resolver; const isPackagePath = @import("./resolver/resolver.zig").isPackagePath; diff --git a/src/js_lexer.zig b/src/js_lexer.zig index c41159612..6ac8be968 100644 --- a/src/js_lexer.zig +++ b/src/js_lexer.zig @@ -1,10 +1,10 @@ const std = @import("std"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const tables = @import("js_lexer_tables.zig"); const build_options = @import("build_options"); const js_ast = @import("js_ast.zig"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/js_lexer_tables.zig b/src/js_lexer_tables.zig index 39d5fb259..b9ad473f8 100644 --- a/src/js_lexer_tables.zig +++ b/src/js_lexer_tables.zig @@ -1,9 +1,9 @@ const std = @import("std"); const expectString = std.testing.expectEqualStrings; const expect = std.testing.expect; -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const unicode = std.unicode; -const default_allocator = @import("./global.zig").default_allocator; +const default_allocator = @import("bun").default_allocator; const string = @import("string_types.zig").string; const CodePoint = @import("string_types.zig").CodePoint; const ComptimeStringMap = @import("./comptime_string_map.zig").ComptimeStringMap; diff --git a/src/js_parser.zig b/src/js_parser.zig index 3a7707d67..decc92029 100644 --- a/src/js_parser.zig +++ b/src/js_parser.zig @@ -1,5 +1,5 @@ pub const std = @import("std"); -pub const logger = @import("./logger.zig"); +pub const logger = @import("bun").logger; pub const js_lexer = @import("./js_lexer.zig"); pub const importRecord = @import("./import_record.zig"); pub const js_ast = @import("./js_ast.zig"); @@ -12,7 +12,7 @@ pub const RuntimeFeatures = _runtime.Runtime.Features; pub const RuntimeNames = _runtime.Runtime.Names; pub const fs = @import("./fs.zig"); const _hash_map = @import("./hash_map.zig"); -const bun = @import("./global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -39,7 +39,7 @@ pub const ExprNodeList = js_ast.ExprNodeList; pub const StmtNodeList = js_ast.StmtNodeList; pub const BindingNodeList = js_ast.BindingNodeList; const ComptimeStringMap = @import("./comptime_string_map.zig").ComptimeStringMap; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; fn _disabledAssert(_: bool) void { if (!Environment.allow_assert) @compileLog("assert is missing an if (Environment.allow_assert)"); diff --git a/src/js_printer.zig b/src/js_printer.zig index 33f20b557..618eba09e 100644 --- a/src/js_printer.zig +++ b/src/js_printer.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const js_lexer = @import("js_lexer.zig"); const importRecord = @import("import_record.zig"); const js_ast = @import("js_ast.zig"); @@ -9,7 +9,7 @@ const runtime = @import("runtime.zig"); const Lock = @import("./lock.zig").Lock; const Api = @import("./api/schema.zig").Api; const fs = @import("fs.zig"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/json_parser.zig b/src/json_parser.zig index 79c07257e..de9203893 100644 --- a/src/json_parser.zig +++ b/src/json_parser.zig @@ -1,12 +1,12 @@ const std = @import("std"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const js_lexer = @import("js_lexer.zig"); const importRecord = @import("import_record.zig"); const js_ast = @import("js_ast.zig"); const options = @import("options.zig"); const fs = @import("fs.zig"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/libarchive/libarchive.zig b/src/libarchive/libarchive.zig index ed475be20..d53aec0d4 100644 --- a/src/libarchive/libarchive.zig +++ b/src/libarchive/libarchive.zig @@ -1,7 +1,7 @@ // @link "../deps/libarchive.a" const lib = @import("./libarchive-bindings.zig"); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -14,7 +14,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); const struct_archive = lib.struct_archive; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; pub const Seek = enum(c_int) { set = std.os.SEEK_SET, current = std.os.SEEK_CUR, diff --git a/src/linear_fifo.zig b/src/linear_fifo.zig index 9ce8881ea..faa631958 100644 --- a/src/linear_fifo.zig +++ b/src/linear_fifo.zig @@ -11,7 +11,7 @@ const Allocator = mem.Allocator; const debug = std.debug; const assert = debug.assert; const testing = std.testing; -const bun = @import("./global.zig"); +const bun = @import("bun"); pub const LinearFifoBufferType = union(enum) { /// The buffer is internal to the fifo; it is of the specified size. diff --git a/src/linker.zig b/src/linker.zig index 3ab654bb3..f41fd1a3c 100644 --- a/src/linker.zig +++ b/src/linker.zig @@ -1,4 +1,4 @@ -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -13,13 +13,13 @@ const Ref = @import("./ast/base.zig").Ref; const std = @import("std"); const lex = @import("js_lexer.zig"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const Options = @import("options.zig"); const js_parser = @import("js_parser.zig"); const json_parser = @import("json_parser.zig"); const js_printer = @import("js_printer.zig"); const js_ast = @import("js_ast.zig"); -const panicky = @import("panic_handler.zig"); + const Fs = @import("fs.zig"); const Api = @import("api/schema.zig").Api; const Resolver = @import("./resolver/resolver.zig"); @@ -37,7 +37,7 @@ const ResolverType = Resolver.Resolver; const ESModule = @import("./resolver/package_json.zig").ESModule; const Runtime = @import("./runtime.zig").Runtime; const URL = @import("url.zig").URL; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const PluginRunner = @import("./bundler.zig").PluginRunner; pub const CSSResolveError = error{ResolveError}; diff --git a/src/logger.zig b/src/logger.zig index 439b27707..b0351294e 100644 --- a/src/logger.zig +++ b/src/logger.zig @@ -1,8 +1,8 @@ const std = @import("std"); const Api = @import("./api/schema.zig").Api; -const js = @import("javascript_core"); +const js = @import("bun").JSC; const ImportKind = @import("./import_record.zig").ImportKind; -const bun = @import("./global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -12,7 +12,7 @@ const MutableString = bun.MutableString; const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const fs = @import("fs.zig"); const unicode = std.unicode; diff --git a/src/main.zig b/src/main.zig index fe5fc7234..8e2edccec 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,43 +1,27 @@ const std = @import("std"); -const lex = @import("js_lexer.zig"); -const logger = @import("logger.zig"); -const options = @import("options.zig"); -const js_parser = @import("js_parser.zig"); -const json_parser = @import("json_parser.zig"); -const js_printer = @import("js_printer.zig"); -const js_ast = @import("js_ast.zig"); -const linker = @import("linker.zig"); -const bun = @import("global.zig"); -const string = bun.string; -const Output = bun.Output; -const Global = bun.Global; -const Environment = bun.Environment; -const strings = bun.strings; -const MutableString = bun.MutableString; -const stringZ = bun.stringZ; -pub const JSC = @import("javascript_core"); -const default_allocator = bun.default_allocator; -const C = bun.C; -const panicky = @import("panic_handler.zig"); -const cli = @import("cli.zig"); -pub const MainPanicHandler = panicky.NewPanicHandler(std.builtin.default_panic); -const js = @import("bun.js/bindings/bindings.zig"); -const JavaScript = @import("bun.js/javascript.zig"); + +const panicky = @import("./panic_handler.zig"); +const MainPanicHandler = panicky.NewPanicHandler(std.builtin.default_panic); + pub const io_mode = .blocking; -pub const bindgen = if (@import("builtin").is_test) undefined else @import("build_options").bindgen; -const Report = @import("./report.zig"); + pub fn panic(msg: []const u8, error_return_trace: ?*std.builtin.StackTrace) noreturn { MainPanicHandler.handle_panic(msg, error_return_trace); } const CrashReporter = @import("./crash_reporter.zig"); -pub var start_time: i128 = 0; pub fn main() void { + const bun = @import("bun"); + const Output = bun.Output; + const Environment = bun.Environment; + + const cli = @import("cli.zig"); + if (comptime Environment.isRelease) CrashReporter.start() catch unreachable; - start_time = std.time.nanoTimestamp(); + bun.start_time = std.time.nanoTimestamp(); // The memory allocator makes a massive difference. // std.heap.raw_c_allocator and default_allocator perform similarly. @@ -53,23 +37,11 @@ pub fn main() void { Output.Source.set(&output_source); defer Output.flush(); - cli.Cli.start(default_allocator, stdout, stderr, MainPanicHandler); - - std.mem.doNotOptimizeAway(JavaScriptVirtualMachine.fetch); - std.mem.doNotOptimizeAway(JavaScriptVirtualMachine.init); - std.mem.doNotOptimizeAway(JavaScriptVirtualMachine.resolve); -} - -pub const JavaScriptVirtualMachine = JavaScript.VirtualMachine; - -test "" { - @import("std").testing.refAllDecls(@This()); - - std.mem.doNotOptimizeAway(JavaScriptVirtualMachine.fetch); - std.mem.doNotOptimizeAway(JavaScriptVirtualMachine.init); - std.mem.doNotOptimizeAway(JavaScriptVirtualMachine.resolve); + cli.Cli.start(bun.default_allocator, stdout, stderr, MainPanicHandler); } test "panic" { panic("woah", null); } + +pub usingnamespace @import("./bun.zig"); diff --git a/src/main_wasm.zig b/src/main_wasm.zig index 5785a06d7..d5e665141 100644 --- a/src/main_wasm.zig +++ b/src/main_wasm.zig @@ -2,8 +2,8 @@ const JSParser = @import("./js_parser/js_parser.zig"); const JSPrinter = @import("./js_printer.zig"); const JSAst = @import("./js_ast.zig"); const Api = @import("./api/schema.zig").Api; -const Logger = @import("./logger.zig"); -const global = @import("./global.zig"); +const Logger = @import("bun").logger +const global = @import("bun"); const default_allocator = global.default_allocator; const std = @import("std"); const Define = @import("./defines.zig"); diff --git a/src/mdx/mdx_parser.zig b/src/mdx/mdx_parser.zig index 76a6ee8ef..dcaf11143 100644 --- a/src/mdx/mdx_parser.zig +++ b/src/mdx/mdx_parser.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const mdx_lexer = @import("./mdx_lexer.zig"); const Lexer = mdx_lexer.Lexer; const importRecord = @import("../import_record.zig"); @@ -10,7 +10,7 @@ const ParseStatementOptions = @import("../js_parser/js_parser.zig").ParseStateme const options = @import("../options.zig"); const fs = @import("../fs.zig"); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/mimalloc_arena.zig b/src/mimalloc_arena.zig index 6b5bc3fd8..02bb4c2d8 100644 --- a/src/mimalloc_arena.zig +++ b/src/mimalloc_arena.zig @@ -7,7 +7,7 @@ const Environment = @import("./env.zig"); const FeatureFlags = @import("./feature_flags.zig"); const Allocator = mem.Allocator; const assert = std.debug.assert; -const bun = @import("./global.zig"); +const bun = @import("bun"); pub const GlobalArena = struct { arena: Arena, diff --git a/src/napi/napi.zig b/src/napi/napi.zig index d7c7562b9..0f868fe43 100644 --- a/src/napi/napi.zig +++ b/src/napi/napi.zig @@ -1,7 +1,7 @@ const std = @import("std"); -const JSC = @import("javascript_core"); -const strings = @import("strings"); -const bun = @import("../global.zig"); +const JSC = @import("bun").JSC; +const strings = @import("bun").strings; +const bun = @import("bun"); const Lock = @import("../lock.zig").Lock; const JSValue = JSC.JSValue; const ZigString = JSC.ZigString; diff --git a/src/network_thread.zig b/src/network_thread.zig index f48e94e5a..5590dafa8 100644 --- a/src/network_thread.zig +++ b/src/network_thread.zig @@ -1,15 +1,15 @@ -const ThreadPool = @import("thread_pool"); +const ThreadPool = @import("bun").ThreadPool; pub const Batch = ThreadPool.Batch; pub const Task = ThreadPool.Task; const Node = ThreadPool.Node; pub const Completion = AsyncIO.Completion; const std = @import("std"); -pub const AsyncIO = @import("io"); -const Output = @import("./global.zig").Output; +pub const AsyncIO = @import("bun").AsyncIO; +const Output = @import("bun").Output; const IdentityContext = @import("./identity_context.zig").IdentityContext; const HTTP = @import("./http_client_async.zig"); const NetworkThread = @This(); -const Environment = @import("./global.zig").Environment; +const Environment = @import("bun").Environment; const Lock = @import("./lock.zig").Lock; const FIFO = @import("./io/fifo.zig").FIFO; @@ -26,9 +26,9 @@ pub var global: NetworkThread = undefined; pub var global_loaded: std.atomic.Atomic(u32) = std.atomic.Atomic(u32).init(0); const log = Output.scoped(.NetworkThread, true); -const Global = @import("./global.zig").Global; +const Global = @import("bun").Global; pub fn onStartIOThread(waker: AsyncIO.Waker) void { - NetworkThread.address_list_cached = NetworkThread.AddressListCache.init(@import("./global.zig").default_allocator); + NetworkThread.address_list_cached = NetworkThread.AddressListCache.init(@import("bun").default_allocator); AsyncIO.global = AsyncIO.init(1024, 0, waker) catch |err| { log: { if (comptime Environment.isLinux) { @@ -234,7 +234,7 @@ pub fn init() !void { const fd = try std.os.eventfd(0, std.os.linux.EFD.CLOEXEC | 0); global.waker = .{ .fd = fd }; } else if (comptime Environment.isMac) { - global.waker = try AsyncIO.Waker.init(@import("./global.zig").default_allocator); + global.waker = try AsyncIO.Waker.init(@import("bun").default_allocator); } else { @compileLog("TODO: Waker"); } diff --git a/src/node_fallbacks.zig b/src/node_fallbacks.zig index b08b24f57..e8e879fd4 100644 --- a/src/node_fallbacks.zig +++ b/src/node_fallbacks.zig @@ -1,7 +1,7 @@ const std = @import("std"); const string = @import("./string_types.zig").string; const PackageJSON = @import("./resolver/package_json.zig").PackageJSON; -const logger = @import("./logger.zig"); +const logger = @import("bun").logger; const Fs = @import("./fs.zig"); const ComptimeStringMap = @import("./comptime_string_map.zig").ComptimeStringMap; diff --git a/src/node_module_bundle.zig b/src/node_module_bundle.zig index 13d2334c2..5f9a38afd 100644 --- a/src/node_module_bundle.zig +++ b/src/node_module_bundle.zig @@ -2,7 +2,7 @@ const schema = @import("./api/schema.zig"); const Api = schema.Api; const std = @import("std"); const Fs = @import("./fs.zig"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/open.zig b/src/open.zig index 36c4a9a35..da99e134b 100644 --- a/src/open.zig +++ b/src/open.zig @@ -1,4 +1,4 @@ -const bun = @import("./global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/options.zig b/src/options.zig index 7aad92d39..2604f2ff4 100644 --- a/src/options.zig +++ b/src/options.zig @@ -1,7 +1,7 @@ /// This file is mostly the API schema but with all the options normalized. /// Normalization is necessary because most fields in the API schema are optional const std = @import("std"); -const logger = @import("logger.zig"); +const logger = @import("bun").logger; const Fs = @import("fs.zig"); const resolver = @import("./resolver/resolver.zig"); @@ -12,7 +12,7 @@ const resolve_path = @import("./resolver/resolve_path.zig"); const NodeModuleBundle = @import("./node_module_bundle.zig").NodeModuleBundle; const URL = @import("./url.zig").URL; const ConditionsMap = @import("./resolver/package_json.zig").ESModule.ConditionsMap; -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -24,7 +24,7 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; const StoredFileDescriptorType = bun.StoredFileDescriptorType; -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; const Runtime = @import("./runtime.zig").Runtime; const Analytics = @import("./analytics/analytics_thread.zig"); const MacroRemap = @import("./resolver/package_json.zig").MacroMap; diff --git a/src/output.zig b/src/output.zig index 55cd16677..9528c2d21 100644 --- a/src/output.zig +++ b/src/output.zig @@ -1,13 +1,13 @@ const Output = @This(); const std = @import("std"); const Environment = @import("./env.zig"); -const string = @import("./global.zig").string; -const root = @import("root"); -const strings = @import("./global.zig").strings; -const StringTypes = @import("./global.zig").StringTypes; -const Global = @import("./global.zig").Global; -const ComptimeStringMap = @import("./global.zig").ComptimeStringMap; -const use_mimalloc = @import("./global.zig").use_mimalloc; +const string = @import("bun").string; +const root = @import("bun"); +const strings = @import("bun").strings; +const StringTypes = @import("bun").StringTypes; +const Global = @import("bun").Global; +const ComptimeStringMap = @import("bun").ComptimeStringMap; +const use_mimalloc = @import("bun").use_mimalloc; const SystemTimer = @import("./system_timer.zig").Timer; @@ -619,7 +619,7 @@ pub fn printError(comptime fmt: string, args: anytype) void { } pub const DebugTimer = struct { - timer: @import("global.zig").DebugOnly(std.time.Timer) = undefined, + timer: @import("bun").DebugOnly(std.time.Timer) = undefined, pub fn start() DebugTimer { if (comptime Environment.isDebug) { diff --git a/src/panic_handler.zig b/src/panic_handler.zig index 2e2b2b451..1c3a76e53 100644 --- a/src/panic_handler.zig +++ b/src/panic_handler.zig @@ -1,7 +1,5 @@ const std = @import("std"); -const logger = @import("logger.zig"); -const root = @import("root"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -13,19 +11,19 @@ const default_allocator = bun.default_allocator; const C = bun.C; const CLI = @import("./cli.zig").Cli; const Features = @import("./analytics/analytics_thread.zig").Features; -const HTTP = @import("http").AsyncHTTP; +const HTTP = @import("bun").HTTP.AsyncHTTP; const Report = @import("./report.zig"); pub fn NewPanicHandler(comptime panic_func: fn handle_panic(msg: []const u8, error_return_type: ?*std.builtin.StackTrace) noreturn) type { return struct { panic_count: usize = 0, skip_next_panic: bool = false, - log: *logger.Log, + log: *bun.logger.Log, pub var Singleton: ?*Handler = null; const Handler = @This(); - pub fn init(log: *logger.Log) Handler { + pub fn init(log: *bun.logger.Log) Handler { return Handler{ .log = log, }; diff --git a/src/renamer.zig b/src/renamer.zig index 3c67e1f56..92b9e9d76 100644 --- a/src/renamer.zig +++ b/src/renamer.zig @@ -1,5 +1,5 @@ const js_ast = @import("js_ast.zig"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -11,7 +11,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); const Ref = @import("./ast/base.zig").Ref; -const logger = @import("logger.zig"); +const logger = @import("bun").logger; // This is...poorly named // It does not rename diff --git a/src/report.zig b/src/report.zig index b1ad68594..cf0f7f0ea 100644 --- a/src/report.zig +++ b/src/report.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const logger = @import("logger.zig"); -const root = @import("root"); -const bun = @import("global.zig"); +const logger = @import("bun").logger; +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -14,7 +13,7 @@ const C = bun.C; const CLI = @import("./cli.zig").Cli; const Features = @import("./analytics/analytics_thread.zig").Features; const Platform = @import("./analytics/analytics_thread.zig").GenerateHeader.GeneratePlatform; -const HTTP = @import("http").AsyncHTTP; +const HTTP = @import("bun").HTTP.AsyncHTTP; const CrashReporter = @import("./crash_reporter.zig"); const Report = @This(); @@ -230,7 +229,7 @@ pub fn fatal(err_: ?anyerror, msg_: ?string) void { // It only is a real crash report if it's not coming from Zig - if (comptime !@import("javascript_core").is_bindgen) { + if (comptime !@import("bun").JSC.is_bindgen) { std.mem.doNotOptimizeAway(&Bun__crashReportWrite); Bun__crashReportDumpStackTrace(&crash_report_writer); } @@ -274,7 +273,7 @@ pub noinline fn handleCrash(signal: i32, addr: usize) void { .{ @errorName(name), std.fmt.fmtSliceHexUpper(std.mem.asBytes(&addr)) }, ); printMetadata(); - if (comptime !@import("javascript_core").is_bindgen) { + if (comptime !@import("bun").JSC.is_bindgen) { std.mem.doNotOptimizeAway(&Bun__crashReportWrite); Bun__crashReportDumpStackTrace(&crash_report_writer); } diff --git a/src/resolver/data_url.zig b/src/resolver/data_url.zig index dff5ceb1f..5404b0591 100644 --- a/src/resolver/data_url.zig +++ b/src/resolver/data_url.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/resolver/dir_info.zig b/src/resolver/dir_info.zig index 0d1bac6a7..f81cd85c1 100644 --- a/src/resolver/dir_info.zig +++ b/src/resolver/dir_info.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const std = @import("std"); const string = bun.string; const Output = bun.Output; diff --git a/src/resolver/package_json.zig b/src/resolver/package_json.zig index 49b3ad227..af7e46470 100644 --- a/src/resolver/package_json.zig +++ b/src/resolver/package_json.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -13,7 +13,7 @@ const Api = @import("../api/schema.zig").Api; const std = @import("std"); const options = @import("../options.zig"); const cache = @import("../cache.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const js_ast = @import("../js_ast.zig"); const fs = @import("../fs.zig"); diff --git a/src/resolver/resolve_path.zig b/src/resolver/resolve_path.zig index 40e0a7788..93d36c82b 100644 --- a/src/resolver/resolve_path.zig +++ b/src/resolver/resolve_path.zig @@ -3,7 +3,7 @@ const std = @import("std"); const strings = @import("../string_immutable.zig"); const FeatureFlags = @import("../feature_flags.zig"); const default_allocator = @import("../memory_allocator.zig").c_allocator; -const bun = @import("../global.zig"); +const bun = @import("bun"); threadlocal var parser_join_input_buffer: [4096]u8 = undefined; threadlocal var parser_buffer: [1024]u8 = undefined; diff --git a/src/resolver/resolver.zig b/src/resolver/resolver.zig index bec9f6282..513a4e216 100644 --- a/src/resolver/resolver.zig +++ b/src/resolver/resolver.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -12,7 +12,7 @@ const default_allocator = bun.default_allocator; const StoredFileDescriptorType = bun.StoredFileDescriptorType; const C = bun.C; const ast = @import("../import_record.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const options = @import("../options.zig"); const Fs = @import("../fs.zig"); const std = @import("std"); diff --git a/src/resolver/tsconfig_json.zig b/src/resolver/tsconfig_json.zig index 97c12f551..a7f5d1148 100644 --- a/src/resolver/tsconfig_json.zig +++ b/src/resolver/tsconfig_json.zig @@ -1,4 +1,4 @@ -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -10,7 +10,7 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); const options = @import("../options.zig"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const cache = @import("../cache.zig"); const js_ast = @import("../js_ast.zig"); const js_lexer = @import("../js_lexer.zig"); diff --git a/src/router.zig b/src/router.zig index ee9d21d09..d96b32ee4 100644 --- a/src/router.zig +++ b/src/router.zig @@ -7,7 +7,7 @@ const Router = @This(); const Api = @import("./api/schema.zig").Api; const std = @import("std"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; @@ -919,7 +919,7 @@ const expect = std.testing.expect; const expectEqual = std.testing.expectEqual; const expectEqualStrings = std.testing.expectEqualStrings; const expectStr = std.testing.expectEqualStrings; -const Logger = @import("./logger.zig"); +const Logger = @import("bun").logger; pub const Test = struct { pub fn makeRoutes(comptime testName: string, data: anytype) !Routes { diff --git a/src/runtime.zig b/src/runtime.zig index 87daae829..112b388c7 100644 --- a/src/runtime.zig +++ b/src/runtime.zig @@ -1,5 +1,5 @@ const options = @import("./options.zig"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/sha.zig b/src/sha.zig index c6e0c5cdd..db5a2e79f 100644 --- a/src/sha.zig +++ b/src/sha.zig @@ -1,4 +1,4 @@ -const BoringSSL = @import("boringssl"); +const BoringSSL = @import("bun").BoringSSL; const std = @import("std"); fn NewHasher(comptime digest_size: comptime_int, comptime ContextType: type, comptime Full: anytype, comptime Init: anytype, comptime Update: anytype, comptime Final: anytype) type { @@ -237,3 +237,4 @@ pub fn main() anyerror!void { // std.crypto.hash.sha2.Sha256.hash(value, &hash2, .{}); // try std.testing.expectEqual(hash, hash2); // } + diff --git a/src/sourcemap/sourcemap.zig b/src/sourcemap/sourcemap.zig index aa914332d..e2d95c1ac 100644 --- a/src/sourcemap/sourcemap.zig +++ b/src/sourcemap/sourcemap.zig @@ -6,7 +6,7 @@ pub const VLQ_CONTINUATION_MASK: u32 = 1 << VLQ_CONTINUATION_BIT; const std = @import("std"); const JSAst = @import("../js_ast.zig"); const BabyList = JSAst.BabyList; -const Logger = @import("../logger.zig"); +const Logger = @import("bun").logger; const strings = @import("../string_immutable.zig"); const MutableString = @import("../string_mutable.zig").MutableString; const Joiner = @import("../string_joiner.zig"); diff --git a/src/string_builder.zig b/src/string_builder.zig index adb9e2ae0..23e83917b 100644 --- a/src/string_builder.zig +++ b/src/string_builder.zig @@ -3,7 +3,7 @@ const Allocator = @import("std").mem.Allocator; const assert = @import("std").debug.assert; const copy = @import("std").mem.copy; const Env = @import("./env.zig"); -const bun = @import("./global.zig"); +const bun = @import("bun"); const StringBuilder = @This(); const DebugHashTable = if (Env.allow_assert) std.AutoHashMapUnmanaged(u64, void) else void; diff --git a/src/string_immutable.zig b/src/string_immutable.zig index 3b6915201..f89e6d12f 100644 --- a/src/string_immutable.zig +++ b/src/string_immutable.zig @@ -4,7 +4,7 @@ const Environment = @import("./env.zig"); const string = @import("string_types.zig").string; const stringZ = @import("string_types.zig").stringZ; const CodePoint = @import("string_types.zig").CodePoint; -const bun = @import("global.zig"); +const bun = @import("bun"); pub const joiner = @import("./string_joiner.zig"); const assert = std.debug.assert; @@ -1598,7 +1598,7 @@ pub fn elementLengthLatin1IntoUTF8(comptime Type: type, latin1_: Type) usize { return latin1_.len + total_non_ascii_count; } -const JSC = @import("javascript_core"); +const JSC = @import("bun").JSC; pub fn copyLatin1IntoUTF16(comptime Buffer: type, buf_: Buffer, comptime Type: type, latin1_: Type) EncodeIntoResult { var buf = buf_; diff --git a/src/string_joiner.zig b/src/string_joiner.zig index 03d63364e..8359b58bb 100644 --- a/src/string_joiner.zig +++ b/src/string_joiner.zig @@ -8,7 +8,7 @@ const copy = @import("std").mem.copy; const Env = @import("./env.zig"); const ObjectPool = @import("./pool.zig").ObjectPool; -const default_allocator = @import("./global.zig").default_allocator; +const default_allocator = @import("bun").default_allocator; const Joinable = struct { offset: u31 = 0, diff --git a/src/string_mutable.zig b/src/string_mutable.zig index a9f528cc0..2a130672a 100644 --- a/src/string_mutable.zig +++ b/src/string_mutable.zig @@ -31,7 +31,7 @@ pub const MutableString = struct { } pub fn owns(this: *const MutableString, slice: []const u8) bool { - return @import("./global.zig").isSliceInBuffer(slice, this.list.items.ptr[0..this.list.capacity]); + return @import("bun").isSliceInBuffer(slice, this.list.items.ptr[0..this.list.capacity]); } pub fn growIfNeeded(self: *MutableString, amount: usize) !void { diff --git a/src/string_types.zig b/src/string_types.zig index d7e95b3f7..fb49e5f27 100644 --- a/src/string_types.zig +++ b/src/string_types.zig @@ -3,7 +3,7 @@ pub const string = []const u8; pub const stringZ = [:0]const u8; pub const stringMutable = []u8; pub const CodePoint = i32; -const bun = @import("./global.zig"); +const bun = @import("bun"); // macOS sets file path limit to 1024 // Since a pointer on x64 is 64 bits and only 46 bits are used // We can safely store the entire path slice in a single u64. @@ -15,7 +15,7 @@ pub const PathString = packed struct { ptr: PointerIntType = 0, len: PathInt = 0, - const JSC = @import("javascript_core"); + const JSC = @import("bun").JSC; pub fn fromJS(value: JSC.JSValue, global: *JSC.JSGlobalObject, exception: JSC.C.ExceptionRef) PathString { if (!value.jsType().isStringLike()) { JSC.JSError(JSC.getAllocator(global), "Only path strings are supported for now", .{}, global, exception); diff --git a/src/tagged_pointer.zig b/src/tagged_pointer.zig index 564569c7e..b17963a6d 100644 --- a/src/tagged_pointer.zig +++ b/src/tagged_pointer.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const bun = @import("./global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/thread_pool.zig b/src/thread_pool.zig index 3c56da4b1..3cfc02979 100644 --- a/src/thread_pool.zig +++ b/src/thread_pool.zig @@ -2,17 +2,15 @@ // https://github.com/kprotty/zap/blob/blog/src/thread_pool.zig const std = @import("std"); -const bun = @import("./global.zig"); +const bun = @import("bun"); const ThreadPool = @This(); const Futex = @import("./futex.zig"); -const AsyncIO = @import("io"); const Environment = bun.Environment; const assert = std.debug.assert; const Atomic = std.atomic.Atomic; pub const OnSpawnCallback = fn (ctx: ?*anyopaque) ?*anyopaque; -io: ?*AsyncIO = null, sleep_on_idle_network_thread: bool = true, /// executed on the thread on_thread_spawn: ?OnSpawnCallback = null, @@ -250,18 +248,8 @@ noinline fn wait(self: *ThreadPool, _is_waking: bool) error{Shutdown}!bool { .Acquire, .Monotonic, ) orelse { - if (self.io) |io| { - io.tick() catch {}; - } - return is_waking or (sync.state == .signaled); }); - - // No notification to consume. - // Mark this thread as idle before sleeping on the idle_event. - if (self.io) |io| { - io.tick() catch {}; - } } else if (!is_idle) { var new_sync = sync; new_sync.idle += 1; @@ -278,12 +266,6 @@ noinline fn wait(self: *ThreadPool, _is_waking: bool) error{Shutdown}!bool { is_idle = true; continue; }); - - // Wait for a signal by either notify() or shutdown() without wasting cpu cycles. - // TODO: Add I/O polling here. - if (self.io) |io| { - io.tick() catch {}; - } } else { self.idle_event.wait(); sync = @bitCast(Sync, self.sync.load(.Monotonic)); @@ -369,7 +351,7 @@ fn join(self: *ThreadPool) void { thread.join_event.notify(); } -const Output = @import("./global.zig").Output; +const Output = @import("bun").Output; pub const Thread = struct { next: ?*Thread = null, @@ -433,11 +415,6 @@ pub const Thread = struct { return stole; } - // TODO: add optimistic I/O polling here - if (thread_pool.io) |io| { - io.tick() catch {}; - } - // Then try work stealing from other threads var num_threads: u32 = @bitCast(Sync, thread_pool.sync.load(.Monotonic)).spawned; while (num_threads > 0) : (num_threads -= 1) { diff --git a/src/toml/toml_lexer.zig b/src/toml/toml_lexer.zig index 2ec11c72b..7377ff50a 100644 --- a/src/toml/toml_lexer.zig +++ b/src/toml/toml_lexer.zig @@ -1,8 +1,8 @@ const std = @import("std"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const js_ast = @import("../js_ast.zig"); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/toml/toml_parser.zig b/src/toml/toml_parser.zig index cdfd49f5a..4bb37da3b 100644 --- a/src/toml/toml_parser.zig +++ b/src/toml/toml_parser.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const logger = @import("../logger.zig"); +const logger = @import("bun").logger; const toml_lexer = @import("./toml_lexer.zig"); const Lexer = toml_lexer.Lexer; const importRecord = @import("../import_record.zig"); @@ -7,7 +7,7 @@ const js_ast = @import("../js_ast.zig"); const options = @import("../options.zig"); const fs = @import("../fs.zig"); -const bun = @import("../global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/url.zig b/src/url.zig index 26c606a4d..74b7a5ae4 100644 --- a/src/url.zig +++ b/src/url.zig @@ -1,7 +1,7 @@ const std = @import("std"); const Api = @import("./api/schema.zig").Api; const resolve_path = @import("./resolver/resolve_path.zig"); -const bun = @import("./global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/watcher.zig b/src/watcher.zig index 0663303bc..a1c65bb77 100644 --- a/src/watcher.zig +++ b/src/watcher.zig @@ -1,6 +1,6 @@ const Fs = @import("./fs.zig"); const std = @import("std"); -const bun = @import("global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/which.zig b/src/which.zig index 189bbce43..d59cea351 100644 --- a/src/which.zig +++ b/src/which.zig @@ -1,5 +1,5 @@ const std = @import("std"); -const bun = @import("./global.zig"); +const bun = @import("bun"); fn isValid(buf: *[bun.MAX_PATH_BYTES]u8, segment: []const u8, bin: []const u8) ?u16 { std.mem.copy(u8, buf, segment); buf[segment.len] = std.fs.path.sep; diff --git a/src/which_npm_client.zig b/src/which_npm_client.zig index b417dd165..d6791dcec 100644 --- a/src/which_npm_client.zig +++ b/src/which_npm_client.zig @@ -1,4 +1,4 @@ -const bun = @import("./global.zig"); +const bun = @import("bun"); const string = bun.string; const Output = bun.Output; const Global = bun.Global; diff --git a/src/work_pool.zig b/src/work_pool.zig index 9ddf106e9..00ea34f3a 100644 --- a/src/work_pool.zig +++ b/src/work_pool.zig @@ -1,4 +1,4 @@ -const ThreadPool = @import("thread_pool"); +const ThreadPool = @import("bun").ThreadPool; const std = @import("std"); pub const Batch = ThreadPool.Batch; |