@@ -140,6 +140,18 @@ function normalizeStringPosix(path, allowAboveRoot) {
140
140
return res ;
141
141
}
142
142
143
+ function _format ( sep , pathObject ) {
144
+ const dir = pathObject . dir || pathObject . root ;
145
+ const base = pathObject . base ||
146
+ ( ( pathObject . name || '' ) + ( pathObject . ext || '' ) ) ;
147
+ if ( ! dir ) {
148
+ return base ;
149
+ }
150
+ if ( dir === pathObject . root ) {
151
+ return dir + base ;
152
+ }
153
+ return dir + sep + base ;
154
+ }
143
155
144
156
const win32 = {
145
157
// path.resolve([from ...], to)
@@ -970,20 +982,10 @@ const win32 = {
970
982
format : function format ( pathObject ) {
971
983
if ( pathObject === null || typeof pathObject !== 'object' ) {
972
984
throw new TypeError (
973
- ' Parameter "pathObject" must be an object, not ' + typeof pathObject
985
+ ` Parameter "pathObject" must be an object, not ${ typeof pathObject } `
974
986
) ;
975
987
}
976
-
977
- var dir = pathObject . dir || pathObject . root ;
978
- var base = pathObject . base ||
979
- ( ( pathObject . name || '' ) + ( pathObject . ext || '' ) ) ;
980
- if ( ! dir ) {
981
- return base ;
982
- }
983
- if ( dir === pathObject . root ) {
984
- return dir + base ;
985
- }
986
- return dir + win32 . sep + base ;
988
+ return _format ( '\\' , pathObject ) ;
987
989
} ,
988
990
989
991
@@ -1525,20 +1527,10 @@ const posix = {
1525
1527
format : function format ( pathObject ) {
1526
1528
if ( pathObject === null || typeof pathObject !== 'object' ) {
1527
1529
throw new TypeError (
1528
- ' Parameter "pathObject" must be an object, not ' + typeof pathObject
1530
+ ` Parameter "pathObject" must be an object, not ${ typeof pathObject } `
1529
1531
) ;
1530
1532
}
1531
-
1532
- var dir = pathObject . dir || pathObject . root ;
1533
- var base = pathObject . base ||
1534
- ( ( pathObject . name || '' ) + ( pathObject . ext || '' ) ) ;
1535
- if ( ! dir ) {
1536
- return base ;
1537
- }
1538
- if ( dir === pathObject . root ) {
1539
- return dir + base ;
1540
- }
1541
- return dir + posix . sep + base ;
1533
+ return _format ( '/' , pathObject ) ;
1542
1534
} ,
1543
1535
1544
1536
0 commit comments