feat: add convertToGlobbyPath

stylelint · Sep 10, 2019 · 884cda9 · 884cda9
1 parent 6eb31ba
commit 884cda9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 9 deletions.
diff --git a/lib/printConfig.js b/lib/printConfig.js
@@ -2,6 +2,7 @@
 "use strict";
 
 const _ = require("lodash");
+const convertToGlobbyPath = require("./utils/convertToGlobbyPath");
 const createStylelint = require("./createStylelint");
 const globby /*: Function*/ = require("globby");
 const path = require("path");
@@ -29,7 +30,7 @@ module.exports = function(
 
   const filePath = files[0];
 
-  if (globby.hasMagic(filePath.replace(/\\/g, "/"))) {
+  if (globby.hasMagic(convertToGlobbyPath(filePath))) {
     return Promise.reject(
       new Error("The --print-config option does not support globs.")
     );

diff --git a/lib/standalone.js b/lib/standalone.js
@@ -2,6 +2,7 @@
 "use strict";
 
 const _ = require("lodash");
+const convertToGlobbyPath = require("./utils/convertToGlobbyPath");
 const createStylelint = require("./createStylelint");
 const createStylelintResult = require("./createStylelintResult");
 const debug = require("debug")("stylelint:standalone");
@@ -170,7 +171,7 @@ module.exports = function(
       });
   }
 
-  let fileList = [].concat(files).map(file => file.replace(/\\/g, "/"));
+  let fileList = [].concat(files).map(convertToGlobbyPath);
 
   if (!options.disableDefaultIgnores) {
     fileList = fileList.concat(ALWAYS_IGNORED_GLOBS.map(glob => "!" + glob));
@@ -200,7 +201,7 @@ module.exports = function(
 
       if (!filePaths.length) {
         if (!allowEmptyInput) {
-          throw new NoFilesFoundError(fileList);
+          throw new NoFilesFoundError([].concat(files));
         }
 
         return Promise.all([]);

diff --git a/lib/utils/convertToGlobbyPath.js b/lib/utils/convertToGlobbyPath.js
@@ -0,0 +1,17 @@
+"use strict";
+
+const isWin = process.platform === "win32";
+
+/**
+ * Convert file path to globby paths
+ * If you want escape any symbol use double backslashes, this way we can correctly support windows-like paths
+ * @param {string} path
+ * @return {string} result of conversion
+ */
+module.exports = function convertToGlobbyPath(path) {
+  if (!isWin) {
+    return path.replace(/\\\\/g, "\\");
+  }
+
+  return path.replace(/\\/g, "/").replace(/\/\//g, "\\");
+};
diff --git a/lib/utils/noFilesFoundError.js b/lib/utils/noFilesFoundError.js
@@ -1,7 +1,5 @@
 "use strict";
 
-const isWin = process.platform === "win32";
-
 class NoFilesFoundError extends Error {
   constructor(fileList) {
     super();
@@ -10,10 +8,7 @@ class NoFilesFoundError extends Error {
       fileList = [fileList];
     }
 
-    const pattern = fileList
-      .filter(i => !i.startsWith("!"))
-      .map(file => (isWin ? file.replace(/\//g, "\\") : file))
-      .join(", ");
+    const pattern = fileList.filter(i => !i.startsWith("!")).join(", ");
 
     this.message = `No files matching the pattern "${pattern}" were found.`;
   }