Merge branch 'main' into dylan/import-file-path

* Implement JSON & TOML support in the bundler

* Fix failing to bind namespace imports

* Support namespace exports better

---------

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>

src/bun.js/module_loader.zig

@@ -1476,7 +1476,13 @@ pub const ModuleLoader = struct {
             &display_specifier,
         );
         const path = Fs.Path.init(specifier);
-        const loader = jsc_vm.bundler.options.loaders.get(path.name.ext) orelse options.Loader.js;
+        const loader = jsc_vm.bundler.options.loaders.get(path.name.ext) orelse brk: {
+            if (strings.eqlLong(specifier, jsc_vm.main, true)) {
+                break :brk options.Loader.js;
+            }
+
+            break :brk options.Loader.file;
+        };
         var promise: ?*JSC.JSInternalPromise = null;
         ret.* = ErrorableResolvedSource.ok(
             ModuleLoader.transpileSourceCode(

src/bun.js/test/jest.zig

@@ -1202,9 +1202,7 @@ pub const Expect = struct {
                 }
             }
         } else if (value.isString() and expected.isString()) {
-            const value_string = value.toString(globalObject).toSlice(globalObject, default_allocator).slice();
-            const expected_string = expected.toString(globalObject).toSlice(globalObject, default_allocator).slice();
-            if (strings.contains(value_string, expected_string)) {
+            if (value.stringIncludes(globalObject, expected)) {
                 pass = true;
             }
         } else {

src/bundler/bundle_v2.zig

@@ -333,7 +333,7 @@ pub const BundleV2 = struct {
         var result = resolve;
         var path = result.path() orelse return null;
 
-        const loader = this.bundler.options.loaders.get(path.name.ext) orelse .file;
+        const loader = path.loader(&this.bundler.options.loaders) orelse Loader.js;
         if (!loader.isJavaScriptLikeOrJSON()) return null;
 
         var entry = try this.graph.path_to_source_index_map.getOrPut(this.graph.allocator, hash orelse wyhash(0, path.text));

src/cli.zig

@@ -1331,18 +1331,9 @@ pub const Command = struct {
                 }
 
                 var was_js_like = false;
-                // If we start bun with:
-                // 1. `bun foo.js`, assume it's a JavaScript file.
-                // 2. `bun /absolute/path/to/bin/foo` assume its a JavaScript file.
-                //                                  ^ no file extension
-                //
-                // #!/usr/bin/env bun
-                // will pass us an absolute path to the script.
-                // This means a non-standard file extension will not work, but that is better than the current state
-                // which is file extension-less doesn't work
-                const default_loader = options.defaultLoaders.get(extension) orelse brk: {
+                const default_loader: options.Loader = options.defaultLoaders.get(extension) orelse brk: {
                     if (extension.len == 0 and ctx.args.entry_points.len > 0 and ctx.args.entry_points[0].len > 0 and std.fs.path.isAbsolute(ctx.args.entry_points[0])) {
-                        break :brk options.Loader.js;
+                        break :brk .js;
                     }
 
                     if (extension.len > 0) {
@@ -1351,22 +1342,20 @@ pub const Command = struct {
                         }
 
                         if (ctx.preloads.len > 0)
-                            break :brk options.Loader.js;
+                            break :brk .js;
                     }
 
-                    break :brk null;
+                    break :brk .js;
                 };
 
                 const force_using_bun = ctx.debug.run_in_bun;
                 var did_check = false;
-                if (default_loader) |loader| {
-                    if (loader.canBeRunByBun()) {
-                        was_js_like = true;
-                        if (maybeOpenWithBunJS(&ctx)) {
-                            return;
-                        }
-                        did_check = true;
+                if (default_loader.canBeRunByBun()) {
+                    was_js_like = true;
+                    if (maybeOpenWithBunJS(&ctx)) {
+                        return;
                     }
+                    did_check = true;
                 }
 
                 if (force_using_bun and !did_check) {

src/cli/build_command.zig

@@ -54,6 +54,12 @@ pub const BuildCommand = struct {
         this_bundler.options.code_splitting = ctx.bundler_options.code_splitting;
         this_bundler.resolver.opts.code_splitting = ctx.bundler_options.code_splitting;
 
+        if (this_bundler.options.entry_points.len > 1 and ctx.bundler_options.outdir.len == 0) {
+            Output.prettyErrorln("<red>error<r>: must use \"outdir\" when there are multiple input files", .{});
+            Global.exit(1);
+            return;
+        }
+
         this_bundler.configureLinker();
 
         // This step is optional

src/fs.zig

@@ -1142,7 +1142,7 @@ pub const PathName = struct {
     pub fn init(_path: string) PathName {
         var path = _path;
         var base = path;
-        var ext = path;
+        var ext: string = "";
         var dir = path;
         var is_absolute = true;
 

src/options.zig

@@ -826,6 +826,7 @@ pub const defaultLoaders = ComptimeStringMap(Loader, .{
     .{ ".jsx", Loader.jsx },
     .{ ".json", Loader.json },
     .{ ".js", Loader.jsx },
+    .{ "", Loader.js },
 
     .{ ".mjs", Loader.js },
     .{ ".cjs", Loader.js },
@@ -1143,6 +1144,9 @@ const default_loader_ext = [_]string{
     ".mts",  ".cts",
 
     ".toml", ".wasm",
+
+    // no extension will default to js
+    "",
 };
 
 pub fn loadersFromTransformOptions(allocator: std.mem.Allocator, _loaders: ?Api.LoaderMap, platform: Platform) !bun.StringArrayHashMap(Loader) {

test/js/bun/resolve/non-js/data.anything

@@ -0,0 +1 @@
+anything

test/js/bun/resolve/non-js/no-extension-js

@@ -0,0 +1,3 @@
+export default function js() {
+  return "success!";
+}

test/js/bun/resolve/non-js/non-js-import.test.js

@@ -0,0 +1,16 @@
+import { expect, test } from "bun:test";
+import { resolve, join } from "path";
+import MyPNG from "./test-png.png";
+import data from "./data.anything";
+import moreData from "../more-data.any";
+import js from "./no-extension-js";
+
+test("png import", () => {
+  expect(MyPNG).toBe(resolve(__dirname, "./test-png.png"));
+});
+
+test("random import", () => {
+  expect(data).toBe(join(import.meta.dir, "data.anything"));
+  expect(moreData).toBe(join(import.meta.dir, "../more-data.any"));
+  expect(js()).toBe("success!");
+});

test/js/bun/resolve/png/test-png-import.test.js

@@ -1,7 +0,0 @@
-import { expect, test } from "bun:test";
-import { resolve } from "path";
-import MyPNG from "./test-png.png";
-
-test("png import", () => {
-  expect(MyPNG).toBe(resolve(__dirname, "./test-png.png"));
-});

test/js/bun/test/test-test.test.ts

@@ -1774,6 +1774,8 @@ test("toContain()", () => {
   // expect("test").not.toContain("test");
   expect(["test", "es"]).toContain("es");
   expect("").toContain("");
+  expect("").not.toContain(" ");
+  expect(" ").toContain("");
   expect([""]).toContain("");
 
   expect(["lemon", "lime"]).not.toContain("orange");