Merge branch 'next'

.npmignore

@@ -1,4 +1,5 @@
 .idea
 .eslint*
 rollup.config.js
+test
 *.tgz

README.md

@@ -27,8 +27,9 @@ lessCompileRoots.compileRoots({
         sourceMap: {sourceMapFileInline: true}
     }
 })
-.then(() => {
-    console.log("All done");
+.then(rootEntries => {
+    console.log("Compiled root files:");
+    console.log(rootEntries.join("\n"));
 })
 .catch(reason => {
     console.error(reason);
@@ -43,7 +44,7 @@ The following methods are exported by the `less-compile-roots` module:
 
 ### `compileRoots(options)`
 
-The method picks out the root Less files from all files matching the provided glob pattern (`options.pattern`), and compiles them with the Less pre-processor. It returns a Promise that resolves once all these root files have been successfully compiled.
+The method picks out the root Less files from all files matching the provided glob pattern (`options.pattern`), and compiles them with the Less pre-processor. It returns a Promise that resolves once all these root files have been successfully compiled. The list of compiled entries is the value the promise resolves to.
 
 The supported options are:
 
@@ -71,8 +72,8 @@ Available options:
 
 * `--pattern=<glob>`: a glob pattern (or several comma-separated patterns) matching your source Less files;
 * `--config=<path>`: path to a config module;
-* `--help`: print CLI usage info;
-* `--version`: print the installed package version.
+* `-h`, `--help`: print CLI usage info;
+* `-v`, `--version`: print the installed package version.
 
 Note that you cannot use the options `--pattern` and `--config` together. Specifying the `--pattern` option makes the module compile Less files using all default parameters. If you need to customize the parameters, create a config file and specify the path to it through the `--config` option (or just use the module [programmatically](#api) rather than in command line). Here is an example of such config file:
 

bin/less-compile-roots.js

@@ -19,8 +19,8 @@ Usage:
 Options:
   --pattern=<glob>   Glob pattern (or several comma-separated patterns)
   --config=<path>    Use config from the specified file
-  --help             Display usage info
-  --version          Print the installed package version`);
+  -h, --help         Display usage info
+  -v, --version      Print the installed package version`);
     },
 
     version() {
@@ -53,12 +53,12 @@ function getArg(name) {
 }
 
 (() => {
-    if (getArg("--help")) {
+    if (getArg("--help") || getArg("-h")) {
         handlers.help();
         return;
     }
 
-    if (getArg("--version")) {
+    if (getArg("--version") || getArg("-v")) {
         handlers.version();
         return;
     }

dist/index.js

@@ -39,7 +39,7 @@ let flat = Array.prototype.flat ? list => list.flat() : list => [].concat(...lis
 
 async function getImports(entries) {
     let commentRE = /\/\*[\s\S]*?\*\/|\/\/\s*@import[^;]+;/g;
-    let importRE = /(?<=@import[^"']+["']).+?(?=['"]\s*;)/g;
+    let importRE = /(?<=@import\s[^"']*["']).+?(?=['"]\s*;)/g;
     let promises = entries.map(entry =>
         readFile(entry)
             .then(data => {
@@ -87,7 +87,8 @@ async function getRoots({pattern, globOptions = {}}) {
 
 async function compileRoots({pattern, lessOptions = {}, globOptions = {}}) {
     let rootEntries = await getRoots({pattern, globOptions});
-    return compile(rootEntries, lessOptions);
+    await compile(rootEntries, lessOptions);
+    return rootEntries;
 }
 
 exports.compileRoots = compileRoots;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "less-compile-roots",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Tool for extracting and compiling root Less files",
   "main": "dist/index.js",
   "module": "src/index.mjs",
@@ -26,11 +26,11 @@
   },
   "homepage": "https://github.com/Amphiluke/less-compile-roots#readme",
   "dependencies": {
-    "fast-glob": "^3.0.2"
+    "fast-glob": "^3.0.3"
   },
   "devDependencies": {
     "eslint": "^6.0.1",
-    "rollup": "^1.16.2"
+    "rollup": "^1.16.3"
   },
   "peerDependencies": {
     "less": ">=2.0.0"

src/index.mjs

@@ -7,7 +7,7 @@ let flat = Array.prototype.flat ? list => list.flat() : list => [].concat(...lis
 
 async function getImports(entries) {
     let commentRE = /\/\*[\s\S]*?\*\/|\/\/\s*@import[^;]+;/g;
-    let importRE = /(?<=@import[^"']+["']).+?(?=['"]\s*;)/g;
+    let importRE = /(?<=@import\s[^"']*["']).+?(?=['"]\s*;)/g;
     let promises = entries.map(entry =>
         readFile(entry)
             .then(data => {
@@ -55,5 +55,6 @@ export async function getRoots({pattern, globOptions = {}}) {
 
 export async function compileRoots({pattern, lessOptions = {}, globOptions = {}}) {
     let rootEntries = await getRoots({pattern, globOptions});
-    return compile(rootEntries, lessOptions);
+    await compile(rootEntries, lessOptions);
+    return rootEntries;
 }

test/.gitignore

@@ -0,0 +1 @@
+*.css

test/less/child-01.less

@@ -0,0 +1 @@
+/* child-01 */

test/less/child-02-1.less

@@ -0,0 +1 @@
+/* child-02-1 */

test/less/child-02-2.less

@@ -0,0 +1 @@
+/* child-02-2 */

test/less/child-02.less

@@ -0,0 +1 @@
+/* child-02 */

test/less/child-03.less

@@ -0,0 +1 @@
+/* child-03 */

test/less/child-04-1.less

@@ -0,0 +1 @@
+/* child-04-1 */

test/less/child-04.less

@@ -0,0 +1 @@
+/* child-04 */

test/less/child-05-1.less

@@ -0,0 +1 @@
+/* child-05-1 */

test/less/child-05.less

@@ -0,0 +1 @@
+/* child-05 */

test/less/root-01.less

@@ -0,0 +1,19 @@
+body {
+    background:#000;
+}
+
+// Test skipping commented out imports
+// @import "root-02";
+//@import "root-03";
+
+/*
+a {
+    color:#0a0;
+}
+@import "root-04";
+some text
+*/
+
+/*@import "root-05";*/
+
+@import "child-01";

test/less/root-02.less

@@ -0,0 +1,7 @@
+// Test extraction of imports placed in one line
+@import "child-02"; @import "child-02-1";@import "child-02-2";
+
+body {
+    background:#000;
+}
+

test/less/root-03.less

@@ -0,0 +1,6 @@
+body {
+    background:#000;
+}
+
+// Test extraction of imports with extension specified
+@import "./child-03.less";

test/less/root-04.less

@@ -0,0 +1,20 @@
+// Test some “quirky” cases
+
+// With line breaks
+@import
+    "child-04";
+
+@import
+
+"child-04-1"
+
+;
+
+@import (reference) "child-04";
+
+// Variable name includes substring “import”
+@import01: "root-01";
+
+body {
+    background:#000;
+}

test/less/root-05.less

@@ -0,0 +1,8 @@
+// Test imports with options
+
+@import (reference) "child-05";
+@import (less) "child-05-1.less";
+
+body {
+    background:#000;
+}