diff options
author | 2023-02-07 08:24:34 +0200 | |
---|---|---|
committer | 2023-02-06 22:24:34 -0800 | |
commit | 5a19f8434bc1f1e1eb3cb7c79f15638b8cbcd64f (patch) | |
tree | dcbe6b2bd433caf524b6e9c444c531cb0652ac4c /test | |
parent | d5f3bb1c7402ed04fd60272c9c40d13a4fd22bca (diff) | |
download | bun-5a19f8434bc1f1e1eb3cb7c79f15638b8cbcd64f.tar.gz bun-5a19f8434bc1f1e1eb3cb7c79f15638b8cbcd64f.tar.zst bun-5a19f8434bc1f1e1eb3cb7c79f15638b8cbcd64f.zip |
[WIP] fix corner cases with aliases dependencies (#2000)
* fix corner cases with aliases dependencies
* in-memory convert legacy `bun.lockb`
Diffstat (limited to 'test')
-rw-r--r-- | test/bun.js/install/bun-add.test.ts | 8 | ||||
-rw-r--r-- | test/bun.js/install/bun-install.test.ts | 145 |
2 files changed, 150 insertions, 3 deletions
diff --git a/test/bun.js/install/bun-add.test.ts b/test/bun.js/install/bun-add.test.ts index 5be122bd0..7231943f8 100644 --- a/test/bun.js/install/bun-add.test.ts +++ b/test/bun.js/install/bun-add.test.ts @@ -62,8 +62,8 @@ it("should add existing package", async () => { expect(stdout).toBeDefined(); const out = await new Response(stdout).text(); expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([ - ` + foo@${add_path}`, "", + ` installed file:${add_path}@${add_path}`, "", "", " 1 packages installed", @@ -403,8 +403,9 @@ it("should add aliased dependency (npm)", async () => { expect(stdout).toBeDefined(); const out = await new Response(stdout).text(); expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([ - " + bar@0.0.3", "", + " installed bar@0.0.3 with binaries:", + " - baz-run", "", "", " 1 packages installed", @@ -457,8 +458,9 @@ it("should add aliased dependency (GitHub)", async () => { expect(stdout).toBeDefined(); const out = await new Response(stdout).text(); expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([ - " + uglify@github:mishoo/UglifyJS#e219a9a", "", + " installed uglify@github:mishoo/UglifyJS#e219a9a with binaries:", + " - uglifyjs", "", "", " 1 packages installed", diff --git a/test/bun.js/install/bun-install.test.ts b/test/bun.js/install/bun-install.test.ts index 18f47a12d..048c15c6f 100644 --- a/test/bun.js/install/bun-install.test.ts +++ b/test/bun.js/install/bun-install.test.ts @@ -1046,6 +1046,151 @@ it("should not reinstall aliased dependencies", async () => { await access(join(package_dir, "bun.lockb")); }); +it("should handle aliased & direct dependency references", async () => { + const urls = []; + setHandler( + dummyRegistry(urls, "0.0.3", { + bin: { + "baz-run": "index.js", + }, + }), + ); + await writeFile( + join(package_dir, "package.json"), + JSON.stringify({ + name: "foo", + version: "0.0.1", + dependencies: { + baz: "~0.0.2", + }, + workspaces: ["bar"], + }), + ); + await mkdir(join(package_dir, "bar")); + await writeFile( + join(package_dir, "bar", "package.json"), + JSON.stringify({ + name: "bar", + version: "0.0.4", + dependencies: { + moo: "npm:baz", + }, + }), + ); + const { stdout, stderr, exited } = spawn({ + cmd: [bunExe(), "install", "--config", import.meta.dir + "/basic.toml"], + cwd: package_dir, + stdout: null, + stdin: "pipe", + stderr: "pipe", + env, + }); + expect(stderr).toBeDefined(); + const err = await new Response(stderr).text(); + expect(err).toContain("Saved lockfile"); + expect(stdout).toBeDefined(); + const out = await new Response(stdout).text(); + expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([ + " + bar@workspace:bar", + " + baz@0.0.3", + "", + " 2 packages installed", + ]); + expect(await exited).toBe(0); + expect(urls).toEqual([`${root_url}/baz`, `${root_url}/baz.tgz`]); + expect(requested).toBe(2); + expect(await readdirSorted(join(package_dir, "node_modules"))).toEqual([".bin", ".cache", "bar", "baz"]); + expect(await readdirSorted(join(package_dir, "node_modules", ".bin"))).toEqual(["baz-run"]); + expect(await readlink(join(package_dir, "node_modules", ".bin", "baz-run"))).toBe(join("..", "baz", "index.js")); + expect(await readlink(join(package_dir, "node_modules", "bar"))).toBe(join("..", "bar")); + expect(await readdirSorted(join(package_dir, "node_modules", "baz"))).toEqual(["index.js", "package.json"]); + expect(await file(join(package_dir, "node_modules", "baz", "package.json")).json()).toEqual({ + name: "baz", + version: "0.0.3", + bin: { + "baz-run": "index.js", + }, + }); + expect(await readdirSorted(join(package_dir, "bar"))).toEqual(["node_modules", "package.json"]); + expect(await readdirSorted(join(package_dir, "bar", "node_modules"))).toEqual(["moo"]); + expect(await readdirSorted(join(package_dir, "bar", "node_modules", "moo"))).toEqual(["index.js", "package.json"]); + expect(await file(join(package_dir, "bar", "node_modules", "moo", "package.json")).json()).toEqual({ + name: "baz", + version: "0.0.3", + bin: { + "baz-run": "index.js", + }, + }); + await access(join(package_dir, "bun.lockb")); +}); + +it("should not hoist if name collides with alias", async () => { + const urls = []; + setHandler(dummyRegistry(urls)); + await writeFile( + join(package_dir, "package.json"), + JSON.stringify({ + name: "foo", + version: "0.0.1", + dependencies: { + bar: "npm:baz", + }, + workspaces: ["moo"], + }), + ); + await mkdir(join(package_dir, "moo")); + await writeFile( + join(package_dir, "moo", "package.json"), + JSON.stringify({ + name: "moo", + version: "0.0.4", + dependencies: { + bar: "*", + }, + }), + ); + const { stdout, stderr, exited } = spawn({ + cmd: [bunExe(), "install", "--config", import.meta.dir + "/basic.toml"], + cwd: package_dir, + stdout: null, + stdin: "pipe", + stderr: "pipe", + env, + }); + expect(stderr).toBeDefined(); + const err = await new Response(stderr).text(); + expect(err).toContain("Saved lockfile"); + expect(stdout).toBeDefined(); + const out = await new Response(stdout).text(); + expect(out.replace(/\s*\[[0-9\.]+m?s\]\s*$/, "").split(/\r?\n/)).toEqual([ + " + moo@workspace:moo", + " + bar@0.0.2", + "", + " 3 packages installed", + ]); + expect(await exited).toBe(0); + expect(urls).toEqual([`${root_url}/baz`, `${root_url}/bar`, `${root_url}/baz.tgz`, `${root_url}/bar.tgz`]); + expect(requested).toBe(4); + expect(await readdirSorted(join(package_dir, "node_modules"))).toEqual([".cache", "bar", "moo"]); + expect(await readdirSorted(join(package_dir, "node_modules", "bar"))).toEqual(["index.js", "package.json"]); + expect(await file(join(package_dir, "node_modules", "bar", "package.json")).json()).toEqual({ + name: "baz", + version: "0.0.3", + bin: { + "baz-run": "index.js", + }, + }); + expect(await readlink(join(package_dir, "node_modules", "moo"))).toBe(join("..", "moo")); + expect(await readdirSorted(join(package_dir, "moo"))).toEqual(["node_modules", "package.json"]); + expect(await readdirSorted(join(package_dir, "moo", "node_modules"))).toEqual(["bar"]); + expect(await readdirSorted(join(package_dir, "moo", "node_modules", "bar"))).toEqual(["package.json"]); + expect(await file(join(package_dir, "moo", "node_modules", "bar", "package.json")).json()).toEqual({ + name: "bar", + version: "0.0.2", + }); + await access(join(package_dir, "bun.lockb")); +}); + it("should handle GitHub URL in dependencies (user/repo)", async () => { const urls: string[] = []; setHandler(dummyRegistry(urls)); |