Support file resolving

Author: alexandrukis

.tape.js

@@ -1,3 +1,5 @@
+const path = require('path');
+
 module.exports = {
     'basic/test': {
         message: 'can inline rules from same file',
@@ -41,4 +43,13 @@ module.exports = {
     'complex/test': {
         message: 'all combined',
     },
+    'resolvesFiles/test': {
+        message: 'knows how to resolve files',
+        options: {
+            paths: [
+                path.join(process.cwd(), '/test/resolvesFiles/some/other/path'),
+                path.join(process.cwd(), '/test/resolvesFiles/weird'),
+            ],
+        },
+    },
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sector-labs/postcss-inline-class",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Inline the declarations of other CSS classes in your CSS classes.",
   "main": "src/index.js",
   "repository": "https://github.com/sectorlabs/postcss-inline-class",
@@ -22,9 +22,9 @@
     "node": ">=6.0.0"
   },
   "dependencies": {
+    "lodash": "latest",
     "postcss": "^7.0.1",
-    "resolve": "^1.1.7",
-    "lodash": "latest"
+    "resolve": "^1.1.7"
   },
   "devDependencies": {
     "eslint": "^6.8.0",

src/index.js

@@ -1,6 +1,7 @@
 const path = require('path');
 
 const postcss = require('postcss');
+const resolvePath = require('resolve');
 
 const readFile = require('./utils').readFile;
 const parseImportPath = require('./utils').parseImportPath;
@@ -9,6 +10,11 @@ const findInlineDeclarations = require('./findInlineDeclarations');
 const findNestedRules = require('./findNestedRules');
 const findMediaQueries = require('./findMediaQueries');
 
+const resolveFile = (filePath, options) =>
+    new Promise((resolve, reject) => {
+        resolvePath(filePath, options, (err, path) => (err ? reject(err) : resolve(path)));
+    });
+
 const processAtRule = (onError, atRule, root, targetClass, importPath) => {
     const matchedDeclarations = findInlineDeclarations(root, targetClass);
     const nestedRules = findNestedRules(root, targetClass);
@@ -45,7 +51,7 @@ const processAtRule = (onError, atRule, root, targetClass, importPath) => {
     return [...nestedRules, ...mediaQueries];
 };
 
-const walkAtRule = (root, result, promises) => (atRule) => {
+const walkAtRule = (root, result, promises, resolve) => (atRule) => {
     const params = postcss.list.space(atRule.params);
     const targetClass = params[0];
 
@@ -60,25 +66,30 @@ const walkAtRule = (root, result, promises) => (atRule) => {
     }
 
     const importPath = parseImportPath(params.slice(-1)[0]);
-    const resolvedPath = path.resolve(path.dirname(root.source.input.file), importPath);
-
     promises.push(
-        readFile(resolvedPath)
-            .then((rawData) => {
-                const importedRoot = postcss.parse(rawData);
-                return processAtRule(onError, atRule, importedRoot, targetClass, importPath);
-            })
+        resolve(importPath)
+            .then((resolvedPath) =>
+                readFile(resolvedPath).then((rawData) => {
+                    const importedRoot = postcss.parse(rawData);
+                    return processAtRule(onError, atRule, importedRoot, targetClass, importPath);
+                }),
+            )
             .catch(() => {
                 onError(`Could not find file '${importPath}'`);
                 return [];
             }),
     );
 };
 
-const processFile = (root, result) => (resolve) => {
-    const promises = [];
+const processFile = (root, result, paths) => (resolve) => {
+    const fileResolver = (importPath) =>
+        resolveFile(importPath, {
+            basedir: path.dirname(root.source.input.file),
+            paths,
+        });
 
-    const atRuleWalker = walkAtRule(root, result, promises);
+    const promises = [];
+    const atRuleWalker = walkAtRule(root, result, promises, fileResolver);
 
     root.walkRules((rule) => rule.walkAtRules('inline', atRuleWalker));
 
@@ -90,6 +101,12 @@ const processFile = (root, result) => (resolve) => {
         .catch(resolve);
 };
 
-module.exports = postcss.plugin('postcss-inline-class', () => (root, result) =>
-    new Promise(processFile(root, result)),
-);
+const defaultOptions = Object.freeze({
+    paths: [],
+    extensions: [''],
+});
+
+module.exports = postcss.plugin('postcss-inline-class', (options) => {
+    return (root, result) =>
+        new Promise(processFile(root, result, (options || defaultOptions).paths));
+});

test/resolvesFiles/some/other/path/bar.css

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

test/resolvesFiles/test.css

@@ -0,0 +1,7 @@
+.b {
+    @inline .a from 'bar.css';
+}
+
+.c {
+    @inline .a from 'dir/foo.css';
+}

test/resolvesFiles/test.expect.css

@@ -0,0 +1,7 @@
+.b {
+    color: red;
+}
+
+.c {
+    color: blue;
+}

test/resolvesFiles/weird/dir/foo.css

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

yarn.lock

@@ -763,7 +763,7 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash@^4.17.14, lodash@^4.17.15:
+lodash@^4.17.14, lodash@^4.17.15, lodash@latest:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==