diff options
56 files changed, 165 insertions, 159 deletions
diff --git a/src/__global.zig b/src/__global.zig index b11b1ac22..6bf87cdef 100644 --- a/src/__global.zig +++ b/src/__global.zig @@ -5,6 +5,7 @@ const Output = @import("output.zig"); const use_mimalloc = @import("bun").use_mimalloc; const StringTypes = @import("./string_types.zig"); const Mimalloc = @import("bun").Mimalloc; +const bun = @import("bun"); const BASE_VERSION = "0.4"; @@ -143,8 +144,8 @@ pub const BunInfo = struct { framework_version: string = "", const Analytics = @import("./analytics/analytics_thread.zig"); - const JSON = @import("./json_parser.zig"); - const JSAst = @import("./js_ast.zig"); + const JSON = bun.JSON; + const JSAst = bun.JSAst; pub fn generate(comptime Bundler: type, bundler: Bundler, allocator: std.mem.Allocator) !JSAst.Expr { var info = BunInfo{ .bun_version = Global.package_json_version, diff --git a/src/bun.js/api/bun.zig b/src/bun.js/api/bun.zig index 5d296927a..bf5b932fc 100644 --- a/src/bun.js/api/bun.zig +++ b/src/bun.js/api/bun.zig @@ -21,9 +21,9 @@ const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = bun.Bundler; const ServerEntryPoint = bun.bundler.ServerEntryPoint; -const js_printer = @import("../../js_printer.zig"); -const js_parser = @import("../../js_parser.zig"); -const js_ast = @import("../../js_ast.zig"); +const js_printer = bun.js_printer; +const js_parser = bun.js_parser; +const js_ast = bun.JSAst; const http = @import("../../http.zig"); const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; diff --git a/src/bun.js/api/ffi.zig b/src/bun.js/api/ffi.zig index 896ebf077..a6c4c8b8c 100644 --- a/src/bun.js/api/ffi.zig +++ b/src/bun.js/api/ffi.zig @@ -22,9 +22,9 @@ const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = bun.Bundler; const ServerEntryPoint = bun.bundler.ServerEntryPoint; -const js_printer = @import("../../js_printer.zig"); -const js_parser = @import("../../js_parser.zig"); -const js_ast = @import("../../js_ast.zig"); +const js_printer = bun.js_printer; +const js_parser = bun.js_parser; +const js_ast = bun.JSAst; const http = @import("../../http.zig"); const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig index 7821f795c..d99d7c9be 100644 --- a/src/bun.js/api/server.zig +++ b/src/bun.js/api/server.zig @@ -21,9 +21,9 @@ const Api = @import("../../api/schema.zig").Api; const options = @import("../../options.zig"); const Bundler = bun.Bundler; const ServerEntryPoint = bun.bundler.ServerEntryPoint; -const js_printer = @import("../../js_printer.zig"); -const js_parser = @import("../../js_parser.zig"); -const js_ast = @import("../../js_ast.zig"); +const js_printer = bun.js_printer; +const js_parser = bun.js_parser; +const js_ast = bun.JSAst; const http = @import("../../http.zig"); const NodeFallbackModules = @import("../../node_fallbacks.zig"); const ImportKind = ast.ImportKind; diff --git a/src/bun.js/api/transpiler.zig b/src/bun.js/api/transpiler.zig index 7772b16db..715c5137e 100644 --- a/src/bun.js/api/transpiler.zig +++ b/src/bun.js/api/transpiler.zig @@ -33,14 +33,14 @@ const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON; const logger = @import("bun").logger; const Loader = options.Loader; const Platform = options.Platform; -const JSAst = @import("../../js_ast.zig"); +const JSAst = bun.JSAst; const Transpiler = @This(); -const JSParser = @import("../../js_parser.zig"); -const JSPrinter = @import("../../js_printer.zig"); +const JSParser = bun.js_parser; +const JSPrinter = bun.js_printer; const ScanPassResult = JSParser.ScanPassResult; const Mimalloc = @import("../../mimalloc_arena.zig"); const Runtime = @import("../../runtime.zig").Runtime; -const JSLexer = @import("../../js_lexer.zig"); +const JSLexer = bun.js_lexer; const Expr = JSAst.Expr; bundler: Bundler.Bundler, diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig index debe1f734..d4956b1c4 100644 --- a/src/bun.js/bindings/exports.zig +++ b/src/bun.js/bindings/exports.zig @@ -26,8 +26,8 @@ const JSModuleLoader = JSC.JSModuleLoader; const Microtask = JSC.Microtask; const JSPrivateDataPtr = @import("../base.zig").JSPrivateDataPtr; const Backtrace = @import("../../crash_reporter.zig"); -const JSPrinter = @import("../../js_printer.zig"); -const JSLexer = @import("../../js_lexer.zig"); +const JSPrinter = bun.js_printer; +const JSLexer = bun.js_lexer; const typeBaseName = @import("../../meta.zig").typeBaseName; pub const ZigGlobalObject = extern struct { diff --git a/src/bun.js/config.zig b/src/bun.js/config.zig index e237064a6..d7f167c8f 100644 --- a/src/bun.js/config.zig +++ b/src/bun.js/config.zig @@ -18,7 +18,7 @@ const logger = @import("bun").logger; const Api = @import("../api/schema.zig").Api; const options = @import("../options.zig"); const Bundler = bun.bundler.ServeBundler; -const js_printer = @import("../js_printer.zig"); +const js_printer = bun.js_printer; const http = @import("../http.zig"); pub const DefaultBunDefines = struct { diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig index a6474799b..38677c03d 100644 --- a/src/bun.js/javascript.zig +++ b/src/bun.js/javascript.zig @@ -30,9 +30,9 @@ const options = @import("../options.zig"); const Bundler = bun.Bundler; const PluginRunner = bun.bundler.PluginRunner; const ServerEntryPoint = bun.bundler.ServerEntryPoint; -const js_printer = @import("../js_printer.zig"); -const js_parser = @import("../js_parser.zig"); -const js_ast = @import("../js_ast.zig"); +const js_printer = bun.js_printer; +const js_parser = bun.js_parser; +const js_ast = bun.JSAst; const http = @import("../http.zig"); const NodeFallbackModules = @import("../node_fallbacks.zig"); const ImportKind = ast.ImportKind; diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig index dc4b156f7..fc8b96325 100644 --- a/src/bun.js/module_loader.zig +++ b/src/bun.js/module_loader.zig @@ -30,9 +30,9 @@ const options = @import("../options.zig"); const Bundler = bun.Bundler; const PluginRunner = bun.bundler.PluginRunner; const ServerEntryPoint = bun.bundler.ServerEntryPoint; -const js_printer = @import("../js_printer.zig"); -const js_parser = @import("../js_parser.zig"); -const js_ast = @import("../js_ast.zig"); +const js_printer = bun.js_printer; +const js_parser = bun.js_parser; +const js_ast = bun.JSAst; const http = @import("../http.zig"); const NodeFallbackModules = @import("../node_fallbacks.zig"); const ImportKind = ast.ImportKind; diff --git a/src/bun.js/webcore/blob.zig b/src/bun.js/webcore/blob.zig index 1bd338c06..6eb0eb7c0 100644 --- a/src/bun.js/webcore/blob.zig +++ b/src/bun.js/webcore/blob.zig @@ -39,7 +39,7 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; -const JSPrinter = @import("../../js_printer.zig"); +const JSPrinter = bun.js_printer; const picohttp = @import("bun").picohttp; const StringJoiner = @import("../../string_joiner.zig"); const uws = @import("bun").uws; diff --git a/src/bun.js/webcore/body.zig b/src/bun.js/webcore/body.zig index e91de032f..fe8643062 100644 --- a/src/bun.js/webcore/body.zig +++ b/src/bun.js/webcore/body.zig @@ -39,7 +39,7 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; -const JSPrinter = @import("../../js_printer.zig"); +const JSPrinter = bun.js_printer; const picohttp = @import("bun").picohttp; const StringJoiner = @import("../../string_joiner.zig"); const uws = @import("bun").uws; diff --git a/src/bun.js/webcore/request.zig b/src/bun.js/webcore/request.zig index 2204a286a..7457b941f 100644 --- a/src/bun.js/webcore/request.zig +++ b/src/bun.js/webcore/request.zig @@ -39,7 +39,7 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; -const JSPrinter = @import("../../js_printer.zig"); +const JSPrinter = bun.js_printer; const picohttp = @import("bun").picohttp; const StringJoiner = @import("../../string_joiner.zig"); const uws = @import("bun").uws; diff --git a/src/bun.js/webcore/response.zig b/src/bun.js/webcore/response.zig index 917cdbb0a..047bdbb0c 100644 --- a/src/bun.js/webcore/response.zig +++ b/src/bun.js/webcore/response.zig @@ -39,7 +39,7 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; -const JSPrinter = @import("../../js_printer.zig"); +const JSPrinter = bun.js_printer; const picohttp = @import("bun").picohttp; const StringJoiner = @import("../../string_joiner.zig"); const uws = @import("bun").uws; diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig index 3ba0da101..ab859c31c 100644 --- a/src/bun.js/webcore/streams.zig +++ b/src/bun.js/webcore/streams.zig @@ -39,7 +39,7 @@ const JSGlobalObject = JSC.JSGlobalObject; const VirtualMachine = JSC.VirtualMachine; const Task = JSC.Task; -const JSPrinter = @import("../../js_printer.zig"); +const JSPrinter = bun.js_printer; const picohttp = @import("bun").picohttp; const StringJoiner = @import("../../string_joiner.zig"); const uws = @import("bun").uws; diff --git a/src/bun.zig b/src/bun.zig index b8ffba410..0f68e8bc8 100644 --- a/src/bun.zig +++ b/src/bun.zig @@ -732,8 +732,10 @@ pub const fs = @import("./fs.zig"); pub const Bundler = bundler.Bundler; pub const bundler = @import("./bundler.zig"); pub const which = @import("./which.zig").which; - -pub const json = @import("./json_parser.zig"); +pub const js_parser = @import("./js_parser.zig"); +pub const js_printer = @import("./js_printer.zig"); +pub const js_lexer = @import("./js_lexer.zig"); +pub const JSON = @import("./json_parser.zig"); pub const JSAst = @import("./js_ast.zig"); pub const bit_set = @import("./install/bit_set.zig"); diff --git a/src/bun_js.zig b/src/bun_js.zig index 061c03771..564a6a6c9 100644 --- a/src/bun_js.zig +++ b/src/bun_js.zig @@ -10,13 +10,13 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const lex = @import("js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const js_printer = bun.js_printer; +const js_ast = bun.JSAst; const linker = @import("linker.zig"); const sync = @import("./sync.zig"); diff --git a/src/bundler.zig b/src/bundler.zig index a70a87c8a..b7647852b 100644 --- a/src/bundler.zig +++ b/src/bundler.zig @@ -11,13 +11,13 @@ const StoredFileDescriptorType = bun.StoredFileDescriptorType; const FeatureFlags = bun.FeatureFlags; const C = bun.C; const std = @import("std"); -const lex = @import("js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const js_printer = bun.js_printer; +const js_ast = bun.JSAst; const linker = @import("linker.zig"); const Ref = @import("ast/base.zig").Ref; const Define = @import("defines.zig").Define; diff --git a/src/bundler/entry_points.zig b/src/bundler/entry_points.zig index 99ccb1372..9b52596f5 100644 --- a/src/bundler/entry_points.zig +++ b/src/bundler/entry_points.zig @@ -3,7 +3,7 @@ const std = @import("std"); const bun = @import("bun"); const string = bun.string; const Fs = @import("../fs.zig"); -const js_ast = @import("../js_ast.zig"); +const js_ast = bun.JSAst; const Bundler = bun.Bundler; const strings = bun.strings; pub const FallbackEntryPoint = struct { diff --git a/src/bundler/generate_node_modules_bundle.zig b/src/bundler/generate_node_modules_bundle.zig index 88c0b600e..23b3efa57 100644 --- a/src/bundler/generate_node_modules_bundle.zig +++ b/src/bundler/generate_node_modules_bundle.zig @@ -13,13 +13,13 @@ const StoredFileDescriptorType = bun.StoredFileDescriptorType; const FeatureFlags = bun.FeatureFlags; const C = bun.C; const std = @import("std"); -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const js_printer = bun.js_printer; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const Ref = @import("../ast/base.zig").Ref; const Define = @import("../defines.zig").Define; diff --git a/src/bunfig.zig b/src/bunfig.zig index 10a35edd4..5f9e1728c 100644 --- a/src/bunfig.zig +++ b/src/bunfig.zig @@ -12,8 +12,8 @@ const URL = @import("./url.zig").URL; const C = bun.C; const options = @import("./options.zig"); const logger = @import("bun").logger; -const js_ast = @import("./js_ast.zig"); -const js_lexer = @import("./js_lexer.zig"); +const js_ast = bun.JSAst; +const js_lexer = bun.js_lexer; const Defines = @import("./defines.zig"); const ConditionsMap = @import("./resolver/package_json.zig").ESModule.ConditionsMap; const Api = @import("./api/schema.zig").Api; @@ -25,7 +25,7 @@ pub const MacroMap = bun.StringArrayHashMapUnmanaged(MacroImportReplacementMap); pub const BundlePackageOverride = bun.StringArrayHashMapUnmanaged(options.BundleOverride); const LoaderMap = bun.StringArrayHashMapUnmanaged(options.Loader); const Analytics = @import("./analytics.zig"); -const JSONParser = @import("./json_parser.zig"); +const JSONParser = bun.JSON; const Command = @import("cli.zig").Command; const TOML = @import("./toml/toml_parser.zig").TOML; diff --git a/src/cache.zig b/src/cache.zig index e59e473e6..b1b934f94 100644 --- a/src/cache.zig +++ b/src/cache.zig @@ -11,10 +11,10 @@ const FeatureFlags = bun.FeatureFlags; const default_allocator = bun.default_allocator; const C = bun.C; -const js_ast = @import("./js_ast.zig"); +const js_ast = bun.JSAst; const logger = @import("bun").logger; -const js_parser = @import("./js_parser.zig"); -const json_parser = @import("./json_parser.zig"); +const js_parser = bun.js_parser; +const json_parser = bun.JSON; const options = @import("./options.zig"); const Define = @import("./defines.zig").Define; const std = @import("std"); diff --git a/src/cli.zig b/src/cli.zig index 95635fa87..6807cd66b 100644 --- a/src/cli.zig +++ b/src/cli.zig @@ -12,13 +12,13 @@ const FeatureFlags = bun.FeatureFlags; const C = bun.C; const root = @import("root"); const std = @import("std"); -const lex = @import("js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const js_printer = bun.js_printer; +const js_ast = bun.JSAst; const linker = @import("linker.zig"); const sync = @import("./sync.zig"); diff --git a/src/cli/build_command.zig b/src/cli/build_command.zig index d5663c127..233dd487f 100644 --- a/src/cli/build_command.zig +++ b/src/cli/build_command.zig @@ -11,12 +11,12 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const allocators = @import("../allocators.zig"); diff --git a/src/cli/bun_command.zig b/src/cli/bun_command.zig index a41490dda..0a8894905 100644 --- a/src/cli/bun_command.zig +++ b/src/cli/bun_command.zig @@ -11,14 +11,14 @@ const stringZ = bun.stringZ; const default_allocator = bun.default_allocator; const C = bun.C; -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const js_printer = bun.js_printer; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const sync = @import("../sync.zig"); diff --git a/src/cli/bunx_command.zig b/src/cli/bunx_command.zig index ce1f71fcd..9c83c00ba 100644 --- a/src/cli/bunx_command.zig +++ b/src/cli/bunx_command.zig @@ -26,7 +26,7 @@ pub const BunxCommand = struct { bun.JSAst.Expr.Data.Store.create(default_allocator); bun.JSAst.Stmt.Data.Store.create(default_allocator); - const expr = try bun.json.ParseJSONUTF8(&source, bundler.log, bundler.allocator); + const expr = try bun.JSON.ParseJSONUTF8(&source, bundler.log, bundler.allocator); // choose the first package that fits if (expr.get("bin")) |bin_expr| { diff --git a/src/cli/create_command.zig b/src/cli/create_command.zig index 364acb426..ba56b887c 100644 --- a/src/cli/create_command.zig +++ b/src/cli/create_command.zig @@ -11,12 +11,12 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const allocators = @import("../allocators.zig"); @@ -34,7 +34,7 @@ const NetworkThread = HTTP.NetworkThread; 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 JSPrinter = bun.js_printer; const DotEnv = @import("../env_loader.zig"); const NPMClient = @import("../which_npm_client.zig").NPMClient; const which = @import("../which.zig").which; diff --git a/src/cli/init_command.zig b/src/cli/init_command.zig index 6a1ff253d..9eb788dd0 100644 --- a/src/cli/init_command.zig +++ b/src/cli/init_command.zig @@ -13,14 +13,14 @@ const open = @import("../open.zig"); const CLI = @import("../cli.zig"); const Fs = @import("../fs.zig"); const ParseJSON = @import("../json_parser.zig").ParseJSONUTF8; -const js_parser = @import("../js_parser.zig"); -const js_ast = @import("../js_ast.zig"); +const js_parser = bun.js_parser; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const options = @import("../options.zig"); const initializeStore = @import("./create_command.zig").initializeStore; -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; const logger = @import("bun").logger; -const JSPrinter = @import("../js_printer.zig"); +const JSPrinter = bun.js_printer; fn exists(path: anytype) bool { if (@TypeOf(path) == [:0]const u8 or @TypeOf(path) == [:0]u8) { diff --git a/src/cli/install_completions_command.zig b/src/cli/install_completions_command.zig index 0048be6e9..99a1702a5 100644 --- a/src/cli/install_completions_command.zig +++ b/src/cli/install_completions_command.zig @@ -10,12 +10,12 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const allocators = @import("../allocators.zig"); @@ -31,7 +31,7 @@ const URL = @import("../url.zig").URL; const ParseJSON = @import("../json_parser.zig").ParseJSON; const Archive = @import("../libarchive/libarchive.zig").Archive; const Zlib = @import("../zlib.zig"); -const JSPrinter = @import("../js_printer.zig"); +const JSPrinter = bun.js_printer; const DotEnv = @import("../env_loader.zig"); const NPMClient = @import("../which_npm_client.zig").NPMClient; const which = @import("../which.zig").which; diff --git a/src/cli/run_command.zig b/src/cli/run_command.zig index b3cf3295a..c2d5f407a 100644 --- a/src/cli/run_command.zig +++ b/src/cli/run_command.zig @@ -10,14 +10,14 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const js_printer = bun.js_printer; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const sync = @import("../sync.zig"); diff --git a/src/cli/test_command.zig b/src/cli/test_command.zig index 696a6db65..e810cc0dc 100644 --- a/src/cli/test_command.zig +++ b/src/cli/test_command.zig @@ -10,16 +10,16 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; const logger = @import("bun").logger; const FileSystem = @import("../fs.zig").FileSystem; const PathName = @import("../fs.zig").PathName; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const js_printer = bun.js_printer; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const sync = @import("../sync.zig"); diff --git a/src/cli/upgrade_command.zig b/src/cli/upgrade_command.zig index 3e270be4b..6bab7c510 100644 --- a/src/cli/upgrade_command.zig +++ b/src/cli/upgrade_command.zig @@ -10,12 +10,12 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const lex = @import("../js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const js_ast = bun.JSAst; const linker = @import("../linker.zig"); const allocators = @import("../allocators.zig"); @@ -32,7 +32,7 @@ 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 JSPrinter = bun.js_printer; const DotEnv = @import("../env_loader.zig"); const which = @import("../which.zig").which; const clap = @import("bun").clap; diff --git a/src/defines.zig b/src/defines.zig index 911d8550c..c1026a7d2 100644 --- a/src/defines.zig +++ b/src/defines.zig @@ -1,8 +1,8 @@ const std = @import("std"); -const js_ast = @import("./js_ast.zig"); +const js_ast = bun.JSAst; const logger = @import("bun").logger; -const js_lexer = @import("js_lexer.zig"); -const json_parser = @import("json_parser.zig"); +const js_lexer = bun.js_lexer; +const json_parser = bun.JSON; const fs = @import("fs.zig"); const bun = @import("bun"); const string = bun.string; diff --git a/src/env_loader.zig b/src/env_loader.zig index 08d0a0a9d..3b8633c4f 100644 --- a/src/env_loader.zig +++ b/src/env_loader.zig @@ -525,7 +525,7 @@ pub const Loader = struct { if (key_buf_len > 0) { iter.reset(); key_buf = try allocator.alloc(u8, key_buf_len + key_count * "process.env.".len); - const js_ast = @import("./js_ast.zig"); + const js_ast = bun.JSAst; var e_strings = try allocator.alloc(js_ast.E.String, e_strings_to_allocate * 2); errdefer allocator.free(e_strings); diff --git a/src/http.zig b/src/http.zig index 83666f5b9..dfe2f9141 100644 --- a/src/http.zig +++ b/src/http.zig @@ -17,7 +17,7 @@ const ApiReader = @import("./api/schema.zig").Reader; const ApiWriter = @import("./api/schema.zig").Writer; const ByteApiWriter = @import("./api/schema.zig").ByteWriter; const NewApiWriter = @import("./api/schema.zig").Writer; -const js_ast = @import("./js_ast.zig"); +const js_ast = bun.JSAst; const bundler = bun.bundler; const logger = @import("bun").logger; const Fs = @import("./fs.zig"); @@ -36,7 +36,7 @@ const MacroMap = @import("./resolver/package_json.zig").MacroMap; 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 JSON = bun.JSON; const DateTime = bun.DateTime; const ThreadPool = @import("bun").ThreadPool; const SourceMap = @import("./sourcemap/sourcemap.zig"); @@ -60,7 +60,7 @@ pub const Headers = picohttp.Headers; pub const MimeType = @import("./http/mime_type.zig"); const Bundler = bundler.Bundler; const Websocket = @import("./http/websocket.zig"); -const JSPrinter = @import("./js_printer.zig"); +const JSPrinter = bun.js_printer; const watcher = @import("./watcher.zig"); threadlocal var req_headers_buf: [100]picohttp.Header = undefined; threadlocal var res_headers_buf: [100]picohttp.Header = undefined; diff --git a/src/install/install.zig b/src/install/install.zig index 0b77bb2db..a8b471058 100644 --- a/src/install/install.zig +++ b/src/install/install.zig @@ -10,12 +10,12 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const JSLexer = @import("../js_lexer.zig"); +const JSLexer = bun.js_lexer; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const JSPrinter = bun.js_printer; const linker = @import("../linker.zig"); @@ -60,7 +60,7 @@ pub const Lockfile = @import("./lockfile.zig"); // because why not pub const alignment_bytes_to_repeat_buffer = [_]u8{0} ** 144; -const JSAst = @import("../js_ast.zig"); +const JSAst = bun.JSAst; pub fn initializeStore() void { if (initialized_store) { diff --git a/src/install/lockfile.zig b/src/install/lockfile.zig index 8423e50ee..91b0d4c53 100644 --- a/src/install/lockfile.zig +++ b/src/install/lockfile.zig @@ -10,13 +10,13 @@ const default_allocator = bun.default_allocator; const C = bun.C; const std = @import("std"); -const JSLexer = @import("../js_lexer.zig"); +const JSLexer = bun.js_lexer; const logger = @import("bun").logger; -const js_parser = @import("../js_parser.zig"); +const js_parser = bun.js_parser; const Expr = @import("../js_ast.zig").Expr; -const json_parser = @import("../json_parser.zig"); -const JSPrinter = @import("../js_printer.zig"); +const json_parser = bun.JSON; +const JSPrinter = bun.js_printer; const linker = @import("../linker.zig"); @@ -76,7 +76,7 @@ const alignment_bytes_to_repeat_buffer = @import("./install.zig").alignment_byte const Resolution = @import("./resolution.zig").Resolution; const initializeStore = @import("./install.zig").initializeStore; const invalid_package_id = @import("./install.zig").invalid_package_id; -const JSAst = @import("../js_ast.zig"); +const JSAst = bun.JSAst; const Origin = @import("./install.zig").Origin; const PackageIDMultiple = @import("./install.zig").PackageIDMultiple; const Crypto = @import("../sha.zig").Hashers; diff --git a/src/install/npm.zig b/src/install/npm.zig index ca1472039..126352d5e 100644 --- a/src/install/npm.zig +++ b/src/install/npm.zig @@ -19,7 +19,7 @@ const Bin = @import("./bin.zig").Bin; const Environment = @import("bun").Environment; const Aligner = @import("./install.zig").Aligner; const HTTPClient = @import("bun").HTTP; -const json_parser = @import("../json_parser.zig"); +const json_parser = bun.JSON; const default_allocator = @import("bun").default_allocator; const IdentityContext = @import("../identity_context.zig").IdentityContext; const ArrayIdentityContext = @import("../identity_context.zig").ArrayIdentityContext; diff --git a/src/install/resolvers/folder_resolver.zig b/src/install/resolvers/folder_resolver.zig index b25623cfe..8140cffc4 100644 --- a/src/install/resolvers/folder_resolver.zig +++ b/src/install/resolvers/folder_resolver.zig @@ -5,7 +5,7 @@ const PackageManager = @import("../install.zig").PackageManager; const Npm = @import("../npm.zig"); const logger = @import("bun").logger; const FileSystem = @import("../../fs.zig").FileSystem; -const JSAst = @import("../../js_ast.zig"); +const JSAst = bun.JSAst; const string = @import("../../string_types.zig").string; const Features = @import("../install.zig").Features; const IdentityContext = @import("../../identity_context.zig").IdentityContext; diff --git a/src/js_ast.zig b/src/js_ast.zig index 7b581851f..f82eadf74 100644 --- a/src/js_ast.zig +++ b/src/js_ast.zig @@ -20,10 +20,10 @@ const allocators = @import("allocators.zig"); const JSC = @import("bun").JSC; const HTTP = @import("bun").HTTP; const RefCtx = @import("./ast/base.zig").RefCtx; -const JSONParser = @import("./json_parser.zig"); +const JSONParser = bun.JSON; const is_bindgen = std.meta.globalOption("bindgen", bool) orelse false; const ComptimeStringMap = bun.ComptimeStringMap; -const JSPrinter = @import("./js_printer.zig"); +const JSPrinter = bun.js_printer; pub fn NewBaseStore(comptime Union: anytype, comptime count: usize) type { var max_size = 0; var max_align = 1; @@ -7112,7 +7112,7 @@ pub const Macro = struct { return false; } - const JSLexer = @import("./js_lexer.zig"); + const JSLexer = bun.js_lexer; var array_iter = JSC.JSPropertyIterator(.{ .skip_empty_name = true, diff --git a/src/js_lexer.zig b/src/js_lexer.zig index 7764b0c4d..c009a01db 100644 --- a/src/js_lexer.zig +++ b/src/js_lexer.zig @@ -2,7 +2,7 @@ const std = @import("std"); 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 js_ast = bun.JSAst; const bun = @import("bun"); const string = bun.string; diff --git a/src/js_parser.zig b/src/js_parser.zig index 1dbf1ebf9..86dabc005 100644 --- a/src/js_parser.zig +++ b/src/js_parser.zig @@ -1,10 +1,10 @@ pub const std = @import("std"); pub const logger = @import("bun").logger; -pub const js_lexer = @import("./js_lexer.zig"); +pub const js_lexer = bun.js_lexer; pub const importRecord = @import("./import_record.zig"); -pub const js_ast = @import("./js_ast.zig"); +pub const js_ast = bun.JSAst; pub const options = @import("./options.zig"); -pub const js_printer = @import("./js_printer.zig"); +pub const js_printer = bun.js_printer; pub const renamer = @import("./renamer.zig"); const _runtime = @import("./runtime.zig"); pub const RuntimeImports = _runtime.Runtime.Imports; diff --git a/src/js_printer.zig b/src/js_printer.zig index c597b911b..c25ec9981 100644 --- a/src/js_printer.zig +++ b/src/js_printer.zig @@ -1,8 +1,8 @@ const std = @import("std"); const logger = @import("bun").logger; -const js_lexer = @import("js_lexer.zig"); +const js_lexer = bun.js_lexer; const importRecord = @import("import_record.zig"); -const js_ast = @import("js_ast.zig"); +const js_ast = bun.JSAst; const options = @import("options.zig"); const rename = @import("renamer.zig"); const runtime = @import("runtime.zig"); diff --git a/src/json_parser.zig b/src/json_parser.zig index d7b285a13..fb3b7dedf 100644 --- a/src/json_parser.zig +++ b/src/json_parser.zig @@ -1,8 +1,8 @@ const std = @import("std"); const logger = @import("bun").logger; -const js_lexer = @import("js_lexer.zig"); +const js_lexer = bun.js_lexer; const importRecord = @import("import_record.zig"); -const js_ast = @import("js_ast.zig"); +const js_ast = bun.JSAst; const options = @import("options.zig"); const fs = @import("fs.zig"); @@ -913,7 +913,7 @@ pub fn ParseTSConfig(source: *const logger.Source, log: *logger.Log, allocator: const duplicateKeyJson = "{ \"name\": \"valid\", \"name\": \"invalid\" }"; -const js_printer = @import("js_printer.zig"); +const js_printer = bun.js_printer; const renamer = @import("renamer.zig"); const SymbolList = [][]Symbol; diff --git a/src/linker.zig b/src/linker.zig index 6fe3c443d..072031863 100644 --- a/src/linker.zig +++ b/src/linker.zig @@ -12,13 +12,13 @@ const C = bun.C; const Ref = @import("./ast/base.zig").Ref; const std = @import("std"); -const lex = @import("js_lexer.zig"); +const lex = bun.js_lexer; 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 js_parser = bun.js_parser; +const json_parser = bun.JSON; +const js_printer = bun.js_printer; +const js_ast = bun.JSAst; const Fs = @import("fs.zig"); const Api = @import("api/schema.zig").Api; diff --git a/src/main_wasm.zig b/src/main_wasm.zig index 510e92b38..ae7339cf5 100644 --- a/src/main_wasm.zig +++ b/src/main_wasm.zig @@ -1,6 +1,6 @@ -const JSParser = @import("./js_parser/js_parser.zig"); -const JSPrinter = @import("./js_printer.zig"); -const JSAst = @import("./js_ast.zig"); +const JSParser = bun.js_parser; +const JSPrinter = bun.js_printer; +const JSAst = bun.JSAst; const Api = @import("./api/schema.zig").Api; const Logger = @import("bun").logger; const global = @import("bun"); diff --git a/src/mdx/mdx_parser.zig b/src/mdx/mdx_parser.zig index 3b2064c39..79ce04fbb 100644 --- a/src/mdx/mdx_parser.zig +++ b/src/mdx/mdx_parser.zig @@ -3,7 +3,7 @@ const logger = @import("bun").logger; const mdx_lexer = @import("./mdx_lexer.zig"); const Lexer = mdx_lexer.Lexer; const importRecord = @import("../import_record.zig"); -const js_ast = @import("../js_ast.zig"); +const js_ast = bun.JSAst; const JSParser = @import("../js_parser/js_parser.zig").MDXParser; const ParseStatementOptions = @import("../js_parser/js_parser.zig").ParseStatementOptions; @@ -24,7 +24,7 @@ const expect = std.testing.expect; const ImportKind = importRecord.ImportKind; const BindingNodeIndex = js_ast.BindingNodeIndex; const Define = @import("../defines.zig").Define; -const js_lexer = @import("../js_lexer.zig"); +const js_lexer = bun.js_lexer; const StmtNodeIndex = js_ast.StmtNodeIndex; const ExprNodeIndex = js_ast.ExprNodeIndex; const ExprNodeList = js_ast.ExprNodeList; diff --git a/src/renamer.zig b/src/renamer.zig index 92b9e9d76..bce2d3030 100644 --- a/src/renamer.zig +++ b/src/renamer.zig @@ -1,4 +1,4 @@ -const js_ast = @import("js_ast.zig"); +const js_ast = bun.JSAst; const bun = @import("bun"); const string = bun.string; const Output = bun.Output; diff --git a/src/resolver/package_json.zig b/src/resolver/package_json.zig index b71616ea1..8a787c854 100644 --- a/src/resolver/package_json.zig +++ b/src/resolver/package_json.zig @@ -14,11 +14,11 @@ const std = @import("std"); const options = @import("../options.zig"); const cache = @import("../cache.zig"); const logger = @import("bun").logger; -const js_ast = @import("../js_ast.zig"); +const js_ast = bun.JSAst; const fs = @import("../fs.zig"); const resolver = @import("./resolver.zig"); -const js_lexer = @import("../js_lexer.zig"); +const js_lexer = bun.js_lexer; const resolve_path = @import("./resolve_path.zig"); // Assume they're not going to have hundreds of main fields or browser map // so use an array-backed hash table instead of bucketed diff --git a/src/resolver/tsconfig_json.zig b/src/resolver/tsconfig_json.zig index 4787157b1..dbed959fd 100644 --- a/src/resolver/tsconfig_json.zig +++ b/src/resolver/tsconfig_json.zig @@ -12,8 +12,8 @@ const std = @import("std"); const options = @import("../options.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"); +const js_ast = bun.JSAst; +const js_lexer = bun.js_lexer; const ComptimeStringMap = @import("../comptime_string_map.zig").ComptimeStringMap; // Heuristic: you probably don't have 100 of these diff --git a/src/router.zig b/src/router.zig index 530824650..378c8b311 100644 --- a/src/router.zig +++ b/src/router.zig @@ -941,7 +941,7 @@ pub const Test = struct { pub fn makeRoutes(comptime testName: string, data: anytype) !Routes { Output.initTest(); try makeTest(testName, data); - const JSAst = @import("./js_ast.zig"); + const JSAst = bun.JSAst; JSAst.Expr.Data.Store.create(default_allocator); JSAst.Stmt.Data.Store.create(default_allocator); var fs = try FileSystem.init1(default_allocator, null); @@ -998,7 +998,7 @@ pub const Test = struct { pub fn make(comptime testName: string, data: anytype) !Router { std.testing.refAllDecls(@import("./bun.js/bindings/exports.zig")); try makeTest(testName, data); - const JSAst = @import("./js_ast.zig"); + const JSAst = bun.JSAst; JSAst.Expr.Data.Store.create(default_allocator); JSAst.Stmt.Data.Store.create(default_allocator); var fs = try FileSystem.init1WithForce(default_allocator, null, true); diff --git a/src/runtime.zig b/src/runtime.zig index 197dc4264..e72165653 100644 --- a/src/runtime.zig +++ b/src/runtime.zig @@ -14,7 +14,7 @@ const resolve_path = @import("./resolver/resolve_path.zig"); const Fs = @import("./fs.zig"); const Schema = @import("./api/schema.zig"); const Ref = @import("ast/base.zig").Ref; -const JSAst = @import("./js_ast.zig"); +const JSAst = bun.JSAst; const content = @import("root").content; // packages/bun-cli-*/bun const BUN_ROOT = "../../"; diff --git a/src/sourcemap/sourcemap.zig b/src/sourcemap/sourcemap.zig index 592df5d1d..54d58fbe7 100644 --- a/src/sourcemap/sourcemap.zig +++ b/src/sourcemap/sourcemap.zig @@ -4,15 +4,16 @@ pub const VLQ_BASE_MASK: u32 = VLQ_BASE - 1; pub const VLQ_CONTINUATION_BIT: u32 = VLQ_BASE; pub const VLQ_CONTINUATION_MASK: u32 = 1 << VLQ_CONTINUATION_BIT; const std = @import("std"); -const JSAst = @import("../js_ast.zig"); +const bun = @import("bun"); +const JSAst = bun.JSAst; const BabyList = JSAst.BabyList; const Logger = @import("bun").logger; -const strings = @import("../string_immutable.zig"); -const MutableString = @import("../string_mutable.zig").MutableString; +const strings = bun.strings; +const MutableString = bun.MutableString; const Joiner = @import("../string_joiner.zig"); -const JSPrinter = @import("../js_printer.zig"); -const URL = @import("../url.zig").URL; -const FileSystem = @import("../fs.zig").FileSystem; +const JSPrinter = bun.js_printer; +const URL = bun.URL; +const FileSystem = bun.fs.FileSystem; const SourceMap = @This(); diff --git a/src/string_immutable.zig b/src/string_immutable.zig index 29b692ffb..e4a92fb26 100644 --- a/src/string_immutable.zig +++ b/src/string_immutable.zig @@ -1,9 +1,9 @@ const std = @import("std"); const expect = std.testing.expect; 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 string = bun.string; +const stringZ = bun.stringZ; +const CodePoint = bun.CodePoint; const bun = @import("bun"); pub const joiner = @import("./string_joiner.zig"); const assert = std.debug.assert; diff --git a/src/string_mutable.zig b/src/string_mutable.zig index f0b64fa51..0d20fed6a 100644 --- a/src/string_mutable.zig +++ b/src/string_mutable.zig @@ -1,12 +1,14 @@ const std = @import("std"); const expect = std.testing.expect; -const strings = @import("string_immutable.zig"); -const js_lexer = @import("js_lexer.zig"); +const bun = @import("bun"); -const string = @import("string_types.zig").string; -const stringZ = @import("string_types.zig").stringZ; -const CodePoint = @import("string_types.zig").CodePoint; +const strings = bun.strings; +const js_lexer = bun.js_lexer; + +const string = bun.string; +const stringZ = bun.stringZ; +const CodePoint = bun.CodePoint; pub const MutableString = struct { allocator: std.mem.Allocator, @@ -299,7 +301,7 @@ pub const MutableString = struct { return pending.len; } - const E = @import("./js_ast.zig").E; + const E = bun.JSAst.E; /// Write a E.String to the buffer. /// This automatically encodes UTF-16 into UTF-8 using diff --git a/src/toml/toml_lexer.zig b/src/toml/toml_lexer.zig index 11d469c4f..bc62beeb7 100644 --- a/src/toml/toml_lexer.zig +++ b/src/toml/toml_lexer.zig @@ -1,6 +1,6 @@ const std = @import("std"); const logger = @import("bun").logger; -const js_ast = @import("../js_ast.zig"); +const js_ast = bun.JSAst; const bun = @import("bun"); const string = bun.string; diff --git a/src/toml/toml_parser.zig b/src/toml/toml_parser.zig index 4bb37da3b..b7553b04e 100644 --- a/src/toml/toml_parser.zig +++ b/src/toml/toml_parser.zig @@ -3,7 +3,7 @@ const logger = @import("bun").logger; const toml_lexer = @import("./toml_lexer.zig"); const Lexer = toml_lexer.Lexer; const importRecord = @import("../import_record.zig"); -const js_ast = @import("../js_ast.zig"); +const js_ast = bun.JSAst; const options = @import("../options.zig"); const fs = @import("../fs.zig"); |