Merge pull request #144 from postcss/custom-load

Add custom load support

Author: MoOx

CHANGELOG.md

@@ -13,6 +13,20 @@ See [resolve option](https://github.com/postcss/postcss-import#resolve) for more
 ([#130](https://github.com/postcss/postcss-import/pull/130))
 - Changed: glob resolver do not add `moduleDirectories` and parse all uri as glob patterns
 ([#131](https://github.com/postcss/postcss-import/pull/131))
+- Added: support custom `load` option
+([#144](https://github.com/postcss/postcss-import/pull/144))
+- Removed: `encoding` option.
+([#144](https://github.com/postcss/postcss-import/pull/144))
+
+Encoding can be specified in custom `load` option
+
+```js
+postcssImport({
+  load: function(filename) {
+    return fs.readFileSync(filename, "utf-8")
+  }
+})
+```
 
 # 7.1.3 - 2015-11-05
 

README.md

@@ -118,13 +118,6 @@ Default: `undefined`
 
 An array of plugins to be applied on each imported file.
 
-#### `encoding`
-
-Type: `String`  
-Default: `utf8`
-
-Use if your CSS is encoded in anything other than UTF-8.
-
 #### `onImport`
 
 Type: `Function`  
@@ -149,6 +142,14 @@ You can overwrite the default path resolving way by setting this option.
 This function gets `(id, basedir, importOptions)` arguments and returns full path, array of paths or promise resolving paths.
 You can use [resolve](https://github.com/substack/node-resolve) for that.
 
+#### `load`
+
+Type: `Function`  
+Default: null
+
+You can overwrite the default loading way by setting this option.
+This function gets `(filename, importOptions)` arguments and returns content or promised content.
+
 #### `skipDuplicates`
 
 Type: `Boolean`  

index.js

@@ -1,17 +1,17 @@
-var fs = require("fs")
 var path = require("path")
 var assign = require("object-assign")
 var postcss = require("postcss")
 var joinMedia = require("./lib/join-media")
 var resolveId = require("./lib/resolve-id")
+var loadContent = require("./lib/load-content")
 var parseStatements = require("./lib/parse-statements")
 
 function AtImport(options) {
   options = assign({
     root: process.cwd(),
     path: [],
     skipDuplicates: true,
-    encoding: "utf8",
+    load: loadContent,
   }, options)
 
   options.root = path.resolve(options.root)
@@ -281,14 +281,8 @@ function loadImportContent(
     state.importedFiles[filename][media] = true
   }
 
-  return new Promise(function(resolve, reject) {
-    fs.readFile(filename, options.encoding, function(err, data) {
-      if (err) {
-        return reject(err)
-      }
-      resolve(data)
-    })
-  }).then(function(content) {
+  return Promise.resolve(options.load(filename, options))
+  .then(function(content) {
     if (typeof options.transform === "function") {
       content = options.transform(content, filename)
     }
@@ -333,8 +327,10 @@ function loadImportContent(
       state,
       media,
       processor
-    ).then(function(statements) {
-      return processor.process(newStyles).then(function(newResult) {
+    )
+    .then(function(statements) {
+      return processor.process(newStyles)
+      .then(function(newResult) {
         result.messages = result.messages.concat(newResult.messages)
 
         return statements

lib/load-content.js

@@ -0,0 +1,12 @@
+var fs = require("fs")
+
+module.exports = function(filename) {
+  return new Promise(function(resolve, reject) {
+    fs.readFile(filename, "utf-8", function(err, data) {
+      if (err) {
+        return reject(err)
+      }
+      resolve(data)
+    })
+  })
+}

test/custom-load.js

@@ -0,0 +1,18 @@
+import test from "ava"
+import compareFixtures from "./lib/compare-fixtures"
+
+test("should accept content", t => {
+  return compareFixtures(t, "custom-load", {
+    load: () => {
+      return "custom-content {}"
+    },
+  })
+})
+
+test("should accept promised content", t => {
+  return compareFixtures(t, "custom-load", {
+    load: () => {
+      return Promise.resolve("custom-content {}")
+    },
+  })
+})

test/fixtures/custom-load.css

@@ -0,0 +1 @@
+@import "foo"

test/fixtures/custom-load.expected.css

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