Merge pull request #153 from postcss/resolve-test

MoOx · MoOx · commit 12efd7767c92 · 2016-01-19T14:59:39.000+01:00
Add resolve tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,6 +43,8 @@ postcssImport({
 
 - Changed: support promise in `transform` option and `undefined` result will be skipped
 ([#147](https://github.com/postcss/postcss-import/pull/147))
+- Added: detect css extension in package.json `main` field
+([153](https://github.com/postcss/postcss-import/pull/153))
 
 # 7.1.3 - 2015-11-05
 
diff --git a/README.md b/README.md
@@ -92,17 +92,17 @@ Checkout [tests](test) for more examples.
 #### `root`
 
 Type: `String`  
-Default: `process.cwd()`
+Default: `process.cwd()` or _dirname of [the postcss `from`](https://github.com/postcss/postcss#node-source)_
 
-Define the root where to resolve path (eg: place where `node_modules` are). Should not be used that much.
+Define the root where to resolve path (eg: place where `node_modules` are). Should not be used that much.  
+_Note: nested `@import` will additionally benefit of the relative dirname of imported files._
 
 #### `path`
 
 Type: `String|Array`  
-Default: `process.cwd()` or _dirname of [the postcss `from`](https://github.com/postcss/postcss#node-source)_
+Default: `[]`
 
-A string or an array of paths in where to look for files.  
-_Note: nested `@import` will additionally benefit of the relative dirname of imported files._
+A string or an array of paths in where to look for files.
 
 #### `transform`
 
diff --git a/index.js b/index.js
@@ -22,8 +22,12 @@ function AtImport(options) {
     options.path = [ options.path ]
   }
 
+  if (!Array.isArray(options.path)) {
+    options.path = []
+  }
+
   options.path = options.path.map(function(p) {
-    return path.resolve(p)
+    return path.resolve(options.root, p)
   })
 
   return function(styles, result) {
diff --git a/lib/resolve-id.js b/lib/resolve-id.js
@@ -1,26 +1,10 @@
-var fs = require("fs")
-var path = require("path")
 var resolve = require("resolve")
 
 var moduleDirectories = [
   "web_modules",
   "node_modules",
 ]
 
-function isFile(path) {
-  return new Promise(function(resolve, reject) {
-    fs.stat(path, function(err, stat) {
-      if (err) {
-        if (err.code === "ENOENT") {
-          return resolve(false)
-        }
-        return reject(err)
-      }
-      resolve(stat.isFile() || stat.isFIFO())
-    })
-  })
-}
-
 function resolveModule(id, opts) {
   return new Promise(function(res, rej) {
     resolve(id, opts, function(err, path) {
@@ -41,36 +25,30 @@ module.exports = function(id, base, options) {
     paths: paths,
     extensions: [ ".css" ],
     packageFilter: function processPackage(pkg) {
-      pkg.main = pkg.style || "index.css"
+      if (pkg.style) {
+        pkg.main = pkg.style
+      }
+      else if (!pkg.main || !/\.css$/.test(pkg.main)) {
+        pkg.main = "index.css"
+      }
       return pkg
     },
   }
 
-  // local detect
-  return resolveModule("./" + id, resolveOpts).catch(function() {
-    // modules and paths detect
+  return resolveModule("./" + id, resolveOpts)
+  .catch(function() {
     return resolveModule(id, resolveOpts)
-  }).catch(function() {
-    // LAST HOPE
-    return Promise.all(paths.map(function(p) {
-      return isFile(path.resolve(p, id))
-    })).then(function(results) {
-      for (var i = 0; i < results.length; i += 1) {
-        if (results[i]) {
-          return path.resolve(paths[i], id)
-        }
-      }
-
-      if (paths.indexOf(base) === -1) {
-        paths.unshift(base)
-      }
-
-      throw new Error([
-        "Failed to find '" + id + "'",
-        "in [ ",
-        "    " + paths.join(",\n        "),
-        "]",
-      ].join("\n    "))
-    })
+  })
+  .catch(function() {
+    if (paths.indexOf(base) === -1) {
+      paths.unshift(base)
+    }
+
+    throw new Error([
+      "Failed to find '" + id + "'",
+      "in [ ",
+      "    " + paths.join(",\n        "),
+      "]",
+    ].join("\n    "))
   })
 }
diff --git a/test/fixtures/imports/local-module/main.css b/test/fixtures/imports/local-module/main.css
diff --git a/test/fixtures/imports/local-module/package.json b/test/fixtures/imports/local-module/package.json
diff --git a/test/fixtures/imports/modules/empty/index.css b/test/fixtures/imports/modules/empty/index.css
@@ -0,0 +1 @@
+empty {}
diff --git a/test/fixtures/imports/modules/empty/package.json b/test/fixtures/imports/modules/empty/package.json
@@ -0,0 +1 @@
+{}
diff --git a/test/fixtures/imports/modules/main-js/index.css b/test/fixtures/imports/modules/main-js/index.css
@@ -0,0 +1 @@
+main-js {}
diff --git a/test/fixtures/imports/modules/main-js/main.js b/test/fixtures/imports/modules/main-js/main.js
@@ -0,0 +1 @@
+module.exports = {}
diff --git a/test/fixtures/imports/modules/main-js/package.json b/test/fixtures/imports/modules/main-js/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "main.js"
+}
diff --git a/test/fixtures/imports/modules/main-style/main.css b/test/fixtures/imports/modules/main-style/main.css
@@ -0,0 +1 @@
+style-mained {}
diff --git a/test/fixtures/imports/modules/main-style/package.json b/test/fixtures/imports/modules/main-style/package.json
@@ -0,0 +1,4 @@
+{
+  "main": "main.css",
+  "style": "style.css"
+}
diff --git a/test/fixtures/imports/modules/main-style/style.css b/test/fixtures/imports/modules/main-style/style.css
@@ -0,0 +1 @@
+main-styled {}
diff --git a/test/fixtures/imports/modules/main/main.css b/test/fixtures/imports/modules/main/main.css
@@ -0,0 +1 @@
+main {}
diff --git a/test/fixtures/imports/modules/main/package.json b/test/fixtures/imports/modules/main/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "main.css"
+}
diff --git a/test/fixtures/imports/modules/simple/index.css b/test/fixtures/imports/modules/simple/index.css
@@ -0,0 +1 @@
+simple {}
diff --git a/test/fixtures/imports/modules/style/package.json b/test/fixtures/imports/modules/style/package.json
@@ -0,0 +1,3 @@
+{
+  "style": "style.css"
+}
diff --git a/test/fixtures/imports/modules/style/style.css b/test/fixtures/imports/modules/style/style.css
@@ -0,0 +1 @@
+style {}
diff --git a/test/fixtures/imports/relative/baz.css b/test/fixtures/imports/relative/baz.css
diff --git a/test/fixtures/imports/relative/import.css b/test/fixtures/imports/relative/import.css
diff --git a/test/fixtures/imports/relative/qux.css b/test/fixtures/imports/relative/qux.css
diff --git a/test/fixtures/relative-to-source.css b/test/fixtures/relative-to-source.css
diff --git a/test/fixtures/relative-to-source.expected.css b/test/fixtures/relative-to-source.expected.css
diff --git a/test/fixtures/relative.css b/test/fixtures/relative.css
diff --git a/test/fixtures/relative.expected.css b/test/fixtures/relative.expected.css
diff --git a/test/fixtures/resolve-cwd.css b/test/fixtures/resolve-cwd.css
diff --git a/test/fixtures/resolve-cwd.expected.css b/test/fixtures/resolve-cwd.expected.css
diff --git a/test/fixtures/resolve-from.css b/test/fixtures/resolve-from.css
@@ -0,0 +1,2 @@
+@import "imports/foo.css";
+@import "imports/foo-recursive.css";
diff --git a/test/fixtures/resolve-from.expected.css b/test/fixtures/resolve-from.expected.css
@@ -0,0 +1,3 @@
+foo{}
+bar{}
+foo.recursive{}
diff --git a/test/fixtures/resolve-local-modules.css b/test/fixtures/resolve-local-modules.css
@@ -0,0 +1,6 @@
+@import "fixtures/imports/modules/simple";
+@import "fixtures/imports/modules/empty";
+@import "fixtures/imports/modules/style";
+@import "fixtures/imports/modules/main";
+@import "fixtures/imports/modules/main-js";
+@import "fixtures/imports/modules/main-style";
diff --git a/test/fixtures/resolve-local-modules.expected.css b/test/fixtures/resolve-local-modules.expected.css
@@ -0,0 +1,6 @@
+simple {}
+empty {}
+style {}
+main {}
+main-js {}
+main-styled {}
diff --git a/test/fixtures/resolve-modules.css b/test/fixtures/resolve-modules.css
@@ -13,7 +13,3 @@
 @import "web-use-dep";
 @import "web-use-dep-too";
 @import "web-use-dep" screen;
-
-@import "local-module";
-
-content{}
diff --git a/test/fixtures/resolve-modules.expected.css b/test/fixtures/resolve-modules.expected.css
@@ -14,5 +14,3 @@
 @media screen{
 .web-dep{}
 }
-.local-module{}
-content{}
diff --git a/test/fixtures/resolve-path-cwd.css b/test/fixtures/resolve-path-cwd.css
@@ -0,0 +1,2 @@
+@import "foo.css";
+@import "foo-recursive.css";
diff --git a/test/fixtures/resolve-path-cwd.expected.css b/test/fixtures/resolve-path-cwd.expected.css
@@ -0,0 +1,3 @@
+foo{}
+bar{}
+foo.recursive{}
diff --git a/test/fixtures/resolve-path-modules.css b/test/fixtures/resolve-path-modules.css
@@ -0,0 +1,6 @@
+@import "simple";
+@import "empty";
+@import "style";
+@import "main";
+@import "main-js";
+@import "main-style";
diff --git a/test/fixtures/resolve-path-modules.expected.css b/test/fixtures/resolve-path-modules.expected.css
@@ -0,0 +1,6 @@
+simple {}
+empty {}
+style {}
+main {}
+main-js {}
+main-styled {}
diff --git a/test/fixtures/resolve-path-root.css b/test/fixtures/resolve-path-root.css
@@ -0,0 +1,2 @@
+@import "foo.css";
+@import "foo-recursive.css";
diff --git a/test/fixtures/resolve-path-root.expected.css b/test/fixtures/resolve-path-root.expected.css
@@ -0,0 +1,3 @@
+foo{}
+bar{}
+foo.recursive{}
diff --git a/test/fixtures/resolve-root.css b/test/fixtures/resolve-root.css
@@ -0,0 +1,2 @@
+@import "imports/foo.css";
+@import "imports/foo-recursive.css";
diff --git a/test/fixtures/resolve-root.expected.css b/test/fixtures/resolve-root.expected.css
@@ -0,0 +1,3 @@
+foo{}
+bar{}
+foo.recursive{}
diff --git a/test/import.js b/test/import.js
@@ -27,26 +27,6 @@ test("should ignore & adjust external import", t => {
   return compareFixtures(t, "ignore")
 })
 
-test("should import stylsheets relatively", t => {
-  return compareFixtures(t, "relative")
-})
-
-test("should work without a specified path", t => {
-  return compareFixtures(t, "cwd")
-})
-
-test("should not need `path` option if `source` option has been passed", t => {
-  return compareFixtures(t, "relative-to-source", null, {
-    from: "fixtures/relative-to-source.css",
-  })
-})
-
-test("should be able to consume npm package or local modules", t => {
-  return compareFixtures(t, "modules", {
-    root: ".",
-  })
-})
-
 test("should not fail with only one absolute import", t => {
   var base = "@import url(http://)"
   return postcss()
@@ -100,15 +80,6 @@ test("should contain a correct sourcemap", t => {
     })
 })
 
-test("import relative files using path option only", t => {
-  return postcss()
-    .use(atImport({ path: "fixtures/imports/relative" }))
-    .process(readFileSync("fixtures/imports/relative/import.css"))
-    .then(result => {
-      t.is(result.css, readFileSync("fixtures/imports/bar.css", "utf-8"))
-    })
-})
-
 test("inlined @import should keep PostCSS AST references clean", t => {
   return postcss()
     .use(atImport())
diff --git a/test/resolve.js b/test/resolve.js
@@ -0,0 +1,56 @@
+import test from "ava"
+import compareFixtures from "./lib/compare-fixtures"
+
+test("should resolve relative to cwd", t => {
+  return compareFixtures(t, "resolve-cwd", {
+    path: null,
+  })
+})
+
+test(`should resolve relative to 'root' option`, t => {
+  return compareFixtures(t, "resolve-root", {
+    root: "fixtures",
+    path: null,
+  })
+})
+
+test(`should resolve relative to postcss 'from' option`, t => {
+  return compareFixtures(t, "resolve-from", {
+    path: null,
+  }, {
+    from: "fixtures/file.css",
+  })
+})
+
+test(`should resolve relative to 'path' which resolved with cwd`, t => {
+  return compareFixtures(t, "resolve-path-cwd", {
+    path: "fixtures/imports",
+  })
+})
+
+test(`should resolve relative to 'path' which resolved with 'root'`, t => {
+  return compareFixtures(t, "resolve-path-root", {
+    root: "fixtures",
+    path: "imports",
+  })
+})
+
+test("should resolve local modules", t => {
+  return compareFixtures(t, "resolve-local-modules", {
+    path: null,
+  })
+})
+
+test("should resolve local modules", t => {
+  return compareFixtures(t, "resolve-path-modules", {
+    path: "fixtures/imports/modules",
+  })
+})
+
+test("should be able to consume npm package or local modules", t => {
+  return compareFixtures(t, "resolve-modules", {
+    path: null,
+  }, {
+    from: "fixtures/imports/foo.css",
+  })
+})
