Merge pull request #15 from css-modules/non-relative-imports

Non relative imports

Author: mightyaleksey

.gitignore

@@ -24,9 +24,10 @@ build/Release
 
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
+node_modules/*
 
 # added automatically by precommit-hook as defaults
 .jshint*
 
 dist/
+!node_modules/awesome-theme

node_modules/awesome-theme/oceanic.css

@@ -3,6 +3,9 @@
   "version": "1.0.2",
   "description": "A require hook to compile CSS Modules on the fly",
   "main": "index.js",
+  "engines": {
+    "node": ">0.12"
+  },
   "devDependencies": {
     "babel": "^5.8.20",
     "babel-eslint": "^4.0.5",

package.json

@@ -1,18 +1,31 @@
 import './guard';
 import hook from './hook';
 import postcss from 'postcss';
-import { dirname, join, relative, resolve } from 'path';
+import { dirname, join, parse, relative, resolve, sep } from 'path';
 import { readFileSync } from 'fs';
 
 import ExtractImports from 'postcss-modules-extract-imports';
 import LocalByDefault from 'postcss-modules-local-by-default';
 import Scope from 'postcss-modules-scope';
 import Parser from './parser';
 
+const escapedSeparator = sep.replace(/(.)/g, '\\$1');
+const relativePathPattern = new RegExp(`^.{1,2}$|^.{1,2}${escapedSeparator}`);
+
 const defaultRoot = process.cwd();
 const tokensByFile = {};
 let plugins = [LocalByDefault, ExtractImports, Scope];
 let root = defaultRoot;
+let importNr = 0;
+
+/**
+ * @param  {string}  pathname
+ * @return {boolean}
+ */
+function isModule(pathname) {
+  const parsed = parse(pathname);
+  return !parsed.root && !relativePathPattern.test(parsed.dir);
+}
 
 /**
  * @param  {string}   sourceString The file content
@@ -29,32 +42,38 @@ function load(sourceString, sourcePath, trace, pathFetcher) {
   return result.tokens;
 }
 
-hook(filename => {
-  let importNr = 0;
+/**
+ * @param  {string} _newPath
+ * @param  {string} _relativeTo
+ * @param  {string} _trace
+ * @return {object}
+ */
+function fetch(_newPath, _relativeTo, _trace) {
+  const newPath = _newPath.replace(/^["']|["']$/g, '');
+  const trace = _trace || String.fromCharCode(importNr++);
 
-  const fetch = (_newPath, _relativeTo, _trace) => {
-    const newPath = _newPath.replace(/^["']|["']$/g, '');
-    const trace = _trace || String.fromCharCode(importNr++);
+  const relativeDir = dirname(_relativeTo);
+  const rootRelativePath = resolve(relativeDir, newPath);
+  let fileRelativePath = resolve(join(root, relativeDir), newPath);
 
-    const relativeDir = dirname(_relativeTo);
-    const rootRelativePath = resolve(relativeDir, newPath);
-    const fileRelativePath = resolve(join(root, relativeDir), newPath);
+  if (isModule(newPath)) {
+    fileRelativePath = require.resolve(newPath);
+  }
 
-    const tokens = tokensByFile[fileRelativePath];
-    if (tokens) {
-      return tokens;
-    }
+  const tokens = tokensByFile[fileRelativePath];
+  if (tokens) {
+    return tokens;
+  }
 
-    const source = readFileSync(fileRelativePath, 'utf-8');
-    const exportTokens = load(source, rootRelativePath, trace, fetch);
+  const source = readFileSync(fileRelativePath, 'utf-8');
+  const exportTokens = load(source, rootRelativePath, trace, fetch);
 
-    tokensByFile[fileRelativePath] = exportTokens;
+  tokensByFile[fileRelativePath] = exportTokens;
 
-    return exportTokens;
-  };
+  return exportTokens;
+}
 
-  return fetch(relative(root, filename), '/');
-});
+hook(filename => fetch(`.${sep}${relative(root, filename)}`, '/'));
 
 /**
  * @param  {object} opts

src/index.js

@@ -0,0 +1,3 @@
+{
+  "localName": "_test_cases_non_relative_imports_source__localName _test_cases_non_relative_imports_awesome_theme_oceanic__color"
+}

test/cases/non-relative-imports/expected.json

@@ -0,0 +1,4 @@
+.localName
+{
+  composes: color from 'awesome-theme/oceanic.css';
+}

test/cases/non-relative-imports/source.css

@@ -14,4 +14,13 @@ describe('css-modules-require-hook', () => {
       equal(JSON.stringify(expectedTokens), JSON.stringify(tokens));
     });
   });
+
+  describe('non-relative imports', () => {
+    it('should resolve to node_modules', () => {
+      const expectedTokens = JSON.parse(readFileSync(join(__dirname, './cases/non-relative-imports/expected.json'), 'utf8'));
+      const tokens = require('./cases/non-relative-imports/source.css');
+
+      equal(JSON.stringify(expectedTokens), JSON.stringify(tokens));
+    });
+  });
 });