lib: refactor platform utility methods

Author: danielbayley

lib/internal/fs/glob.js

@@ -20,6 +20,8 @@ const { join, resolve, basename, isAbsolute } = require('path');
 
 const {
   kEmptyObject,
+  isWindows,
+  isMacOS,
 } = require('internal/util');
 const {
   validateFunction,
@@ -35,9 +37,6 @@ function lazyMicromatch() {
   return micromatch;
 }
 
-const isWindows = process.platform === 'win32';
-const isOSX = process.platform === 'darwin';
-
 async function getDirent(path) {
   return new DirentFromStats(basename(path), await lstat(path), path);
 }
@@ -203,7 +202,7 @@ class Glob {
       patterns = [pattern];
     }
     this.matchers = ArrayPrototypeMap(patterns, (pattern) => lazyMicromatch()(pattern, {
-      nocase: isWindows || isOSX,
+      nocase: isWindows || isMacOS,
       nonegate: true,
     }));
 

lib/internal/fs/utils.js

@@ -145,6 +145,7 @@ const kWriteFileMaxChunkSize = 512 * 1024;
 const kMaxUserId = 2 ** 32 - 1;
 
 const isWindows = process.platform === 'win32';
+const isMacOS = process.platform === 'darwin';
 
 let fs;
 function lazyLoadFs() {
@@ -970,6 +971,8 @@ module.exports = {
   getValidatedFd,
   getValidatedPath,
   handleErrorFromBinding,
+  isMacOS,
+  isWindows,
   preprocessSymlinkDestination,
   realpathCacheKey: Symbol('realpathCacheKey'),
   getStatFsFromBinding,

lib/path.js

@@ -50,12 +50,12 @@ const {
 const {
   getLazy,
   emitExperimentalWarning,
+  isWindows,
+  isMacOS,
 } = require('internal/util');
 
 const lazyMinimatch = getLazy(() => require('internal/deps/minimatch/index'));
 
-const platformIsWin32 = (process.platform === 'win32');
-const platformIsOSX = (process.platform === 'darwin');
 
 function isPathSeparator(code) {
   return code === CHAR_FORWARD_SLASH || code === CHAR_BACKWARD_SLASH;
@@ -167,7 +167,7 @@ function glob(path, pattern, windows) {
   validateString(pattern, 'pattern');
   return lazyMinimatch().minimatch(path, pattern, {
     __proto__: null,
-    nocase: platformIsOSX || platformIsWin32,
+    nocase: isWindows || isMacOS,
     windowsPathsNoEscape: true,
     nonegate: true,
     nocomment: true,
@@ -1100,7 +1100,7 @@ const win32 = {
 };
 
 const posixCwd = (() => {
-  if (platformIsWin32) {
+  if (isWindows) {
     // Converts Windows' backslash path separators to POSIX forward slashes
     // and truncates any drive indicator
     const regexp = /\\/g;
@@ -1575,4 +1575,4 @@ posix.posix = win32.posix = posix;
 win32._makeLong = win32.toNamespacedPath;
 posix._makeLong = posix.toNamespacedPath;
 
-module.exports = platformIsWin32 ? win32 : posix;
+module.exports = isWindows ? win32 : posix;