@adamlui/scss-to-css 1.1.1 → 1.2.0

package/README.md

@@ -3,7 +3,7 @@
 ### Recursively compile all SCSS files into minified CSS.
 
 <a href="#%EF%B8%8F-mit-license"><img height=31 src="https://img.shields.io/badge/License-MIT-fcde7b.svg?logo=internetarchive&logoColor=white&labelColor=464646&style=for-the-badge"></a>
-<a href="https://www.npmjs.com/package/@adamlui/scss-to-css"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.1.1-fc7811.svg?logo=npm&logoColor=white&labelColor=464646&style=for-the-badge"></a>
+<a href="https://www.npmjs.com/package/@adamlui/scss-to-css"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.2.0-fc7811.svg?logo=npm&logoColor=white&labelColor=464646&style=for-the-badge"></a>
 
 <img height=8px width="100%" src="https://raw.githubusercontent.com/adamlui/js-utils/main/media/images/separators/aqua.png">
 
@@ -44,7 +44,7 @@ scss-to-css <input_path> <output_path>
 ```
 
 - `<input_path>`: Path to directory containing SCSS files to be compiled, relative to the current working directory. 
-- `<output_path>`: Path to directory where CSS/sourcemap files will be stored, relative to original file location. (If not provided, same location is used.)
+- `<output_path>`: Path to directory where CSS/sourcemap files will be stored, relative to original file location. (If not provided, `css/` is used.)
 
 **💡 Note:** The paths can be either folders or specific files. If folders are passed, files will be processed recursively.
 
@@ -63,19 +63,19 @@ Replace `<scss-to-css-cmd>` with `scss-to-css` + optional args. Then, `npm run b
 
 ## 📃 Example commands:
 
-- Compile all SCSS files in the **current directory** (outputs to same directory`):
+- Compile all SCSS files in the **current directory** (outputs to `css/`):
 
    ```
    scss-to-css
    ```
 
-- Compile all SCSS files in a **specific directory** (outputs to `path/to/your/directory/`):
+- Compile all SCSS files in a **specific directory** (outputs to `path/to/your/directory/css/`):
 
    ```
    scss-to-css path/to/your/directory
    ```
 
-- Compile a **specific file** (outputs to `path/to/your/minified/file.min.css`):
+- Compile a **specific file** (outputs to `path/to/your/css/file.min.css`):
 
    ```
    scss-to-css path/to/your/file.scss

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adamlui/scss-to-css",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Recursively compile all SCSS files into minified CSS",
   "author": {
     "name": "Adam Lui",

package/scss-to-css.js

@@ -23,21 +23,19 @@ if (process.argv[2] && !fs.existsSync(inputArg)) {
 }
 
 // Recursively find all SCSS files or arg-passed file
-const inputPath = path.resolve(process.cwd(), inputArg);
-const scssFiles = inputArg.endsWith('.scss') ? [inputPath]
-  : (() => {
-        const fileList = [];
-        (function findSCSSfiles(dir) {
-            const files = fs.readdirSync(dir);
-            files.forEach(file => {
-                const filePath = path.resolve(dir, file);
-                if (fs.statSync(filePath).isDirectory())
-                    findSCSSfiles(filePath); // recursively find SCSS
-                else if (/\.scss$/.test(file)) // SCSS file found
-                    fileList.push(filePath); // store it for minification
-            });
-        })(inputPath); return fileList;
-    })();
+const inputPath = path.resolve(process.cwd(), inputArg),
+      scssFiles = [];
+if (inputArg.endsWith('.scss')) scssFiles.push(inputPath);
+else (function findSCSSfiles(dir) {
+    const files = fs.readdirSync(dir);
+    files.forEach(file => {
+        const filePath = path.resolve(dir, file);
+        if (fs.statSync(filePath).isDirectory())
+            findSCSSfiles(filePath); // recursively find SCSS
+        else if (/\.scss$/.test(file)) // SCSS file found
+            scssFiles.push(filePath); // store it for minification
+    });
+})(inputPath);
 
 // Compile SCSS files to CSS
 let generatedCnt = 0;
@@ -46,8 +44,9 @@ scssFiles.forEach(scssPath => {
     try { // to compile it
         const outputDir = path.join(
             path.dirname(scssPath), // path of file to be minified
-            outputArg.endsWith('.css') ? path.dirname(outputArg) : outputArg, // path from output arg
-            path.dirname(scssPath).endsWith('scss') ? '../css' : '' // ../css/ if in scss/
+            /(src|s[ac]ss)$/.test(path.dirname(scssPath)) ? '../css' // + ../css/ if in *(src|sass|scss)/
+                : outputArg.endsWith('.css') ? path.dirname(outputArg) // or path from file output arg
+                : outputArg || 'css' // or path from path output arg or css/ from no arg
         );
         const outputFilename = (
             outputArg.endsWith('.css') && inputArg.endsWith('.scss')
@@ -67,5 +66,9 @@ scssFiles.forEach(scssPath => {
 });
 
 // Print final summary
-if (generatedCnt) console.info(`\n${bg}Compilation complete!${nc}\n${ generatedCnt } files generated.`);
-else console.info(`\n${by}No SCSS files found.${nc}`);
+if (generatedCnt) {
+    const isPlural = generatedCnt/2 > 1;
+    console.info(`\n${bg}Compilation complete!${nc}`);
+    console.info(`\n${ generatedCnt/2 } CSS file${ isPlural ? 's' : '' }`
+        + ` + ${ generatedCnt/2 } source map${ isPlural ? 's' : '' } generated.`);
+} else console.info(`\n${by}No SCSS files found.${nc}`);