path: the dot will be added(path.format) if it is not specified in ext

PR-URL: https://github.com/nodejs/node/pull/44349
Fixes: https://github.com/nodejs/node/issues/44343
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
This commit is contained in:
theanarkh authored and GitHub committed 2022-10-10 15:12:08 +00:00
1 parent 76229fc216
commit 22c39b1ddd
3 files changed
+21 -1

No files matched your search

+12
View File
@@ -206,6 +206,10 @@ A [`TypeError`][] is thrown if `path` is not a string.
<!-- YAML
added: v0.11.15
changes:
- version: REPLACEME
pr-url: https://github.com/nodejs/node/pull/44349
description: The dot will be added if it is not specified in `ext`.
-->
* `pathObject` {Object} Any JavaScript object having the following properties:
@@ -255,6 +259,14 @@ path.format({
ext: '.txt'
});
// Returns: '/file.txt'
// The dot will be added if it is not specified in `ext`.
path.format({
root: '/',
name: 'file',
ext: 'txt'
});
// Returns: '/file.txt'
```
On Windows:
+5 -1
View File
@@ -127,6 +127,10 @@ function normalizeString(path, allowAboveRoot, separator, isPathSeparator) {
return res;
}
function formatExt(ext) {
return ext ? `${ext[0] === '.' ? '' : '.'}${ext}` : '';
}
/**
* @param {string} sep
* @param {{
@@ -142,7 +146,7 @@ function _format(sep, pathObject) {
validateObject(pathObject, 'pathObject');
const dir = pathObject.dir || pathObject.root;
const base = pathObject.base ||
`${pathObject.name || ''}${pathObject.ext || ''}`;
`${pathObject.name || ''}${formatExt(pathObject.ext)}`;
if (!dir) {
return base;
}
+4
View File
@@ -224,3 +224,7 @@ function checkFormat(path, testCases) {
});
});
}
// See https://github.com/nodejs/node/issues/44343
assert.strictEqual(path.format({ name: 'x', ext: 'png' }), 'x.png');
assert.strictEqual(path.format({ name: 'x', ext: '.png' }), 'x.png');