diff options
author | 2023-05-31 19:13:37 -0300 | |
---|---|---|
committer | 2023-05-31 15:13:37 -0700 | |
commit | 52c6609792a7fede177c931e482b878b3e806a93 (patch) | |
tree | da603f30229f92bf5440908843f912694139ac9f | |
parent | 7057cb1982782dcf95ae3f97331fdb9c6d283f76 (diff) | |
download | bun-52c6609792a7fede177c931e482b878b3e806a93.tar.gz bun-52c6609792a7fede177c931e482b878b3e806a93.tar.zst bun-52c6609792a7fede177c931e482b878b3e806a93.zip |
invert base/filename internally (#3141)
-rw-r--r-- | src/bun.js/node/types.zig | 6 | ||||
-rw-r--r-- | src/fs.zig | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/bun.js/node/types.zig b/src/bun.js/node/types.zig index 063e6bd8e..da0459866 100644 --- a/src/bun.js/node/types.zig +++ b/src/bun.js/node/types.zig @@ -1788,9 +1788,9 @@ pub const Path = struct { dir = root; } } - - var base = JSC.ZigString.init(path_name.base); - var name_ = JSC.ZigString.init(path_name.filename); + // we use filename as base, and base as name because node.js/internals compatibilty + var base = JSC.ZigString.init(path_name.filename); + var name_ = JSC.ZigString.init(path_name.base); var ext = JSC.ZigString.init(path_name.ext); dir.setOutputEncoding(); root.setOutputEncoding(); diff --git a/src/fs.zig b/src/fs.zig index 636f6a13e..e22b6b0b5 100644 --- a/src/fs.zig +++ b/src/fs.zig @@ -1290,16 +1290,16 @@ pub const PathName = struct { base = base[0 .. base.len - 1]; } - // filename is base without extension + // filename is base with extension var filename = base; - // if only one character ext = "" even if filename it's "." - if (filename.len > 1) { + // if only one character ext = "" even if base it's "." + if (base.len > 1) { // Strip off the extension - var _dot = strings.lastIndexOfChar(filename, '.'); + var _dot = strings.lastIndexOfChar(base, '.'); if (_dot) |dot| { - ext = filename[dot..]; - filename = filename[0..dot]; + ext = base[dot..]; + base = base[0..dot]; } } |