mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-16 13:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: crash in bun init by renaming string function to be more consistant (#7746)

Browse Source
This commit is contained in:
dave caruso
2023-12-20 13:44:53 -08:00
committed by GitHub
parent 00e745ec2c
commit 00955c712e
4 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/run_command.zig
View File

@@ -813,7 +813,7 @@ pub const RunCommand = struct {
if (!has_copied) {
bun.copy(u8, &path_buf, value.dir);
dir_slice = path_buf[0..value.dir.len];
if (!strings.endsWithChar(value.dir, std.fs.path.sep)) {
if (!strings.endsWithCharOrIsZeroLength(value.dir, std.fs.path.sep)) {
dir_slice = path_buf[0 .. value.dir.len + 1];
}
has_copied = true;

6
src/resolver/package_json.zig
View File

@@ -1753,7 +1753,7 @@ pub const ESModule = struct {
log.addNoteFmt("Substituted \"{s}\" for \"*\" in \".{s}\" to get \".{s}\" ", .{ subpath, resolved_target, result });
}
const status: Status = if (strings.endsWithChar(result, '*') and strings.indexOfChar(result, '*').? == result.len - 1)
const status: Status = if (strings.endsWithCharOrIsZeroLength(result, '*') and strings.indexOfChar(result, '*').? == result.len - 1)
.ExactEndsWithStar
else
.Exact;
@@ -1937,7 +1937,7 @@ pub const ESModule = struct {
if (match_obj.data != .map) return null;
const map = match_obj.data.map;
if (!strings.endsWithChar(query, "*")) {
if (!strings.endsWithCharOrIsZeroLength(query, "*")) {
var slices = map.list.slice();
const keys = slices.items(.key);
const values = slices.items(.value);
@@ -1949,7 +1949,7 @@ pub const ESModule = struct {
}
for (map.expansion_keys) |expansion| {
if (strings.endsWithChar(expansion.key, '*')) {
if (strings.endsWithCharOrIsZeroLength(expansion.key, '*')) {
if (r.resolveTargetReverse(query, expansion.key, expansion.value, .pattern)) |result| {
return result;
}

4
src/string_immutable.zig
View File

@@ -713,6 +713,10 @@ pub inline fn startsWithChar(self: string, char: u8) bool {
}
pub inline fn endsWithChar(self: string, char: u8) bool {
return self.len > 0 and self[self.len - 1] == char;
}
pub inline fn endsWithCharOrIsZeroLength(self: string, char: u8) bool {
return self.len == 0 or self[self.len - 1] == char;
}

41
test/cli/init/init.test.ts
View File

@@ -6,13 +6,52 @@ import { bunExe, bunEnv } from "harness";
test("bun init works", () => {
const temp = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "bun-init-X")));
Bun.spawnSync({
const out = Bun.spawnSync({
cmd: [bunExe(), "init", "-y"],
cwd: temp,
stdio: ["ignore", "inherit", "inherit"],
env: bunEnv,
});
expect(out.signal).toBe(undefined);
expect(out.exitCode).toBe(0);
const pkg = JSON.parse(fs.readFileSync(path.join(temp, "package.json"), "utf8"));
expect(pkg).toEqual({
"name": path.basename(temp).toLowerCase(),
"module": "index.ts",
"type": "module",
"devDependencies": {
"bun-types": "latest",
},
"peerDependencies": {
"typescript": "^5.0.0",
},
});
const readme = fs.readFileSync(path.join(temp, "README.md"), "utf8");
expect(readme).toStartWith("# " + path.basename(temp).toLowerCase() + "\n");
expect(readme).toInclude("v" + Bun.version.replaceAll("-debug", ""));
expect(readme).toInclude("index.ts");
expect(fs.existsSync(path.join(temp, "index.ts"))).toBe(true);
expect(fs.existsSync(path.join(temp, ".gitignore"))).toBe(true);
expect(fs.existsSync(path.join(temp, "node_modules"))).toBe(true);
expect(fs.existsSync(path.join(temp, "tsconfig.json"))).toBe(true);
}, 30_000);
test("bun init with piped cli", () => {
const temp = fs.realpathSync(fs.mkdtempSync(path.join(os.tmpdir(), "bun-init-X")));
const out = Bun.spawnSync({
cmd: [bunExe(), "init"],
cwd: temp,
stdio: [new Blob(["\n\n\n\n\n\n\n\n\n\n\n\n"]), "inherit", "inherit"],
env: bunEnv,
});
expect(out.signal).toBe(undefined);
expect(out.exitCode).toBe(0);
const pkg = JSON.parse(fs.readFileSync(path.join(temp, "package.json"), "utf8"));
expect(pkg).toEqual({
"name": path.basename(temp).toLowerCase(),