Merge pull request #143 from postcss/custom-resolve

Refactor resolve option

Author: MoOx

index.js

@@ -11,6 +11,7 @@ function AtImport(options) {
     root: process.cwd(),
     path: [],
     skipDuplicates: true,
+    resolve: resolveId,
     load: loadContent,
   }, options)
 
@@ -221,14 +222,12 @@ function resolveImportId(
   processor
 ) {
   var atRule = stmt.node
-  var resolve = options.resolve ? options.resolve : resolveId
   var base = atRule.source && atRule.source.input && atRule.source.input.file
     ? path.dirname(atRule.source.input.file)
     : options.root
 
-  return Promise.resolve().then(function() {
-    return resolve(stmt.uri, base, options)
-  }).then(function(resolved) {
+  return Promise.resolve(options.resolve(stmt.uri, base, options))
+  .then(function(resolved) {
     if (!Array.isArray(resolved)) {
       resolved = [ resolved ]
     }
@@ -242,15 +241,17 @@ function resolveImportId(
         processor
       )
     }))
-  }).then(function(result) {
+  })
+  .then(function(result) {
     // Merge loaded statements
     stmt.children = result.reduce(function(result, statements) {
       if (statements) {
         result = result.concat(statements)
       }
       return result
     }, [])
-  }).catch(function(err) {
+  })
+  .catch(function(err) {
     result.warn(err.message, { node: atRule })
   })
 }

test/custom-resolve.js

@@ -0,0 +1,45 @@
+import test from "ava"
+import compareFixtures from "./lib/compare-fixtures"
+import path from "path"
+
+test("should accept file", t => {
+  return compareFixtures(t, "custom-resolve-file", {
+    resolve: () => {
+      return path.resolve("fixtures/imports/custom-resolve-1.css")
+    },
+  })
+})
+
+test("should accept promised file", t => {
+  return compareFixtures(t, "custom-resolve-file", {
+    resolve: () => {
+      return Promise.resolve(
+        path.resolve("fixtures/imports/custom-resolve-1.css")
+      )
+    },
+  })
+})
+
+test("should accept array of files", t => {
+  return compareFixtures(t, "custom-resolve-array", {
+    resolve: () => {
+      return [
+        path.resolve("fixtures/imports/custom-resolve-1.css"),
+        path.resolve("fixtures/imports/custom-resolve-2.css"),
+        path.resolve("fixtures/imports/custom-resolve-1.css"),
+      ]
+    },
+  })
+})
+
+test("should accept promised array of files", t => {
+  return compareFixtures(t, "custom-resolve-array", {
+    resolve: () => {
+      return Promise.resolve([
+        path.resolve("fixtures/imports/custom-resolve-1.css"),
+        path.resolve("fixtures/imports/custom-resolve-2.css"),
+        path.resolve("fixtures/imports/custom-resolve-1.css"),
+      ])
+    },
+  })
+})

test/fixtures/custom-resolve-array.expected.css

@@ -1,2 +1,2 @@
-.custom-array-1 {}
-.custom-array-2 {}
+custom-resolve-1 {}
+custom-resolve-2 {}

test/fixtures/custom-resolve-file.css

@@ -0,0 +1 @@
+@import "any-path";

test/fixtures/custom-resolve-file.expected.css

@@ -0,0 +1 @@
+custom-resolve-1 {}

test/fixtures/custom-resolve-modules.css

@@ -0,0 +1 @@
+custom-resolve-1 {}