Infer whether file is a glob or module

This builds on the efforts by @toomuchdesign in #7 and #13.

Instead of using a `glob` option and being forced to pick one or the
other it now uses `isGlob` to detect what kind of resolve function
should be used. This allows both types to be used.

Example:

```css
@import "suitcss-utils-display"; /* node_modules */
@import "./theme.css"; /* relative path */
@import "./components/*.css" /* glob */
```

Author: simonsmith

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## HEAD
+
+- Remove `glob` option and infer it from the path to the file.
+
 ## 1.0.1
 
 - Fix `package.json` files filter

README.md

@@ -15,11 +15,22 @@ postcss([ require('postcss-easy-import') ])
 
 See [PostCSS] docs for examples for your environment.
 
+## Resolving files with globs
+
+The path to the file will be checked and if it contains a glob it will be used
+to locate it. These can be mixed and matched with normal module paths:
+
+```css
+@import "suitcss-utils-display"; /* node_modules */
+@import "./theme.css"; /* relative path */
+@import "./components/*.css"; /* glob */
+```
+
 ## Options
 
 This plugin is a [postcss-import] extension which introduces its own `resolve` option.
 
-### prefix
+### `prefix`
 
 Type: `false` or `string`
 Default: `false`
@@ -31,20 +42,13 @@ Allows partial-like importing with a prefix before the filename.
 /* will import modules/_partial.css */
 ```
 
-### extensions
+### `extensions`
 
 Type: `array` or `string`
 Default: `.css`
 
 Defines file extensions which will be looked for.
 
-### glob
-
-Type: `boolean`
-Default: `false`
-
-Disables module lookup and imports modules based on a glob pattern.
-
 # License
 
 MIT © [Bogdan Chadkin](mailto:trysound@yandex.ru)

index.js

@@ -1,17 +1,22 @@
 var postcss = require('postcss');
 var assign = require('object-assign');
 var postcssImport = require('postcss-import');
+var isGlob = require('is-glob');
 var resolveGlob = require('./lib/resolve-glob.js');
 var resolveModule = require('./lib/resolve-module.js');
 
+function resolve(id) {
+    var resolver = isGlob(id) ? resolveGlob : resolveModule;
+    return resolver.apply(null, arguments);
+}
+
 module.exports = postcss.plugin('postcss-easy-import', function (opts) {
     opts = assign({
         prefix: false,
-        extensions: '.css',
-        glob: false
+        extensions: '.css'
     }, opts);
 
-    opts.resolve = opts.glob ? resolveGlob : resolveModule;
+    opts.resolve = resolve;
 
     if (opts.prefix && typeof opts.prefix !== 'string') {
         throw Error(

package.json

@@ -19,6 +19,7 @@
   "homepage": "https://github.com/TrySound/postcss-easy-import",
   "dependencies": {
     "globby": "^6.1.0",
+    "is-glob": "^3.1.0",
     "object-assign": "^4.0.1",
     "pify": "^2.3.0",
     "postcss": "^5.0.15",

test/easy-import.js

@@ -1,8 +1,18 @@
 import test from 'ava';
 import easyImport from '../';
+import path from 'path';
+import postcss from 'postcss';
 
 const msg = err => 'postcss-easy-import: ' + err;
 
+function preprocess(input, output, opts, t) {
+    return postcss([ easyImport(opts) ]).process(input)
+        .then(result => {
+            t.is(result.css, output);
+            t.is(result.warnings().length, 0);
+        });
+}
+
 test('should fail on incorrect \'prefix\'', t => {
     t.throws(() => {
         easyImport({
@@ -68,3 +78,30 @@ test('should not fail on correct \'extensions\'', t => {
         });
     });
 });
+
+test('should handle glob imports', t => {
+    return preprocess(
+        '@import "./*.css";\n',
+        '.bar {\n    color: green;\n}\n.foo {\n    color: red;\n}\n',
+        { root: path.resolve('./fixtures/integration') },
+        t
+    );
+});
+
+test('should handle module imports', t => {
+    return preprocess(
+        '@import "./module/baz.css";\n',
+        '.baz {\n    color: blue;\n}\n',
+        { root: path.resolve('./fixtures/integration') },
+        t
+    );
+});
+
+test('should handle glob and module imports together', t => {
+    return preprocess(
+        '@import "./module/baz.css";\n @import "./*.css";',
+        '.baz {\n    color: blue;\n}\n .bar {\n    color: green;\n}\n .foo {\n    color: red;\n}', // eslint-disable-line max-len
+        { root: path.resolve('./fixtures/integration') },
+        t
+    );
+});

test/fixtures/integration/bar.css

@@ -0,0 +1,3 @@
+.bar {
+    color: green;
+}

test/fixtures/integration/foo.css

@@ -0,0 +1,3 @@
+.foo {
+    color: red;
+}

test/fixtures/integration/module/baz.css

@@ -0,0 +1,3 @@
+.baz {
+    color: blue;
+}