@adamlui/scss-to-css 1.5.0 → 1.5.2

package/README.md

@@ -3,9 +3,10 @@
 ### Recursively compile all SCSS files into minified CSS.
 
 <a href="https://www.npmjs.com/package/@adamlui/scss-to-css"><img height=31 src="https://img.shields.io/npm/dt/%40adamlui%2Fscss-to-css?logo=npm&logoColor=white&labelColor=464646&style=for-the-badge"></a>
-<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?activeTab=versions"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.5.0-fc7811.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
-<a href="https://www.npmjs.com/package/@adamlui/scss-to-css?activeTab=code"><img height=31 src="https://img.shields.io/npm/unpacked-size/%40adamlui%2Fscss-to-css?style=for-the-badge&logo=ebox&logoColor=white&labelColor=464646"></a>
+<a href="#%EF%B8%8F-mit-license"><img height=31 src="https://img.shields.io/badge/License-MIT-red.svg?logo=internetarchive&logoColor=white&labelColor=464646&style=for-the-badge"></a>
+<a href="https://www.npmjs.com/package/@adamlui/scss-to-css?activeTab=versions"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.5.2-fc7811.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
+<a href="https://www.npmjs.com/package/@adamlui/scss-to-css?activeTab=code"><img height=31 src="https://img.shields.io/npm/unpacked-size/%40adamlui%2Fscss-to-css?style=for-the-badge&logo=ebox&logoColor=white&color=blue&labelColor=464646"></a>
+<a href="https://sonarcloud.io/component_measures?metric=new_vulnerabilities&id=adamlui_js-utils:scss-to-css/scss-to-css.js"><img height=31 src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fsonarcloud.io%2Fapi%2Fmeasures%2Fcomponent%3Fcomponent%3Dadamlui_js-utils%3Ascss-to-css%2Fscss-to-css.js%26metricKeys%3Dvulnerabilities&query=%24.component.measures.0.value&style=for-the-badge&logo=sonarcloud&logoColor=white&labelColor=464646&label=Vulnerabilities&color=gold"></a>
 
 <img height=8px width="100%" src="https://github.com/adamlui/js-utils/blob/main/docs/images/aqua-separator.png">
 
@@ -37,7 +38,7 @@ Sample output:
 
 <img src="https://github.com/adamlui/js-utils/blob/main/scss-to-css/media/images/sample-output.png">
 
-**💡 Note:** Source maps are also generated by default unless `-S` or `--disable-source-maps` is passed.
+**💡 Note:** Source maps are also generated by default unless `-S` or `--no-source-maps` is passed.
 
 #
 
@@ -50,7 +51,7 @@ scss-to-css [input_path] [output_path]
 - `[input_path]`: Path to SCSS file or directory containing SCSS files to be compiled, relative to the current working directory. 
 - `[output_path]`: Path to file or directory where CSS + sourcemap files will be stored, relative to original file location (if not provided, `css/` is used).
 
-**💡 Note:** If folders are passed, files will be processed recursively. To include dotfolders, pass `-dd` or `--include-dotfolders`.
+**💡 Note:** If folders are passed, files will be processed recursively unless `-R` or `--no-recursion` is passed. To include dotfolders, pass `-d` or `--include-dotfolders`.
 
 #
 
@@ -65,61 +66,66 @@ To use as a **package script**, in your project's `package.json`:
 Replace `<scss-to-css-cmd>` with `scss-to-css` + optional args. Then, `npm run build:css` can be used to run the command.
 <br><br>
 
-## 📃 Example commands:
+### Command line options
 
-- Compile all SCSS files in the **current directory** (outputs to `css/`):
+```
+Config options:
+ -n, --dry-run               Don't actually compile the file(s), just
+                             show if they will be processed.
+ -d, --include-dotfolders    Include dotfolders in file search.
+ -S, --no-source-maps        Prevent source maps from being generated.
+ -M, --no-minify             Disable minification of output CSS.
+ -R, --no-recursion          Disable recursive file searching.
+ -q, --quiet                 Suppress all logging except errors.
+
+Info commands:
+ -h, --help                  Display this help screen.
+ -v, --version               Show version number.
+```
 
-   ```
-   scss-to-css
-   ```
+### Example commands
 
-- Compile all SCSS files in a **specific directory** (outputs to `path/to/your/directory/css/`):
+Compile all SCSS files in the **current directory** (outputs to `css/`):
 
-   ```
-   scss-to-css path/to/your/directory
-   ```
+```
+scss-to-css
+```
 
-- Compile a **specific file** (outputs to `path/to/your/css/file.min.css`):
+Compile all SCSS files in a **specific directory** (outputs to `path/to/your/directory/css/`):
 
-   ```
-   scss-to-css path/to/your/file.scss
-   ```
+```
+scss-to-css path/to/your/directory
+```
 
-- Specify both **input and output** directories (outputs to `output_folder/`):
+Compile a **specific file** (outputs to `path/to/your/css/file.min.css`):
 
-   ```
-   scss-to-css input_folder output_folder
-   ```
+```
+scss-to-css path/to/your/file.scss
+```
+
+Specify both **input and output** directories (outputs to `output_folder/`):
+
+```
+scss-to-css input_folder output_folder
+```
 
 **💡 Note:** Output CSS is minified unless `-M` or `--no-minify` is passed.
 <br><br>
 
 ## 💖 Support
 
-Please consider giving a ⭐ on [GitHub](https://github.com/adamlui/js-utils) if this helped you!
+Please consider [giving a GitHub ⭐](https://github.com/adamlui/js-utils) if this helped you!
 <br><br>
 
 ## 🏛️ MIT License
 
 **Copyright (c) 2024 [Adam Lui](https://github.com/adamlui)**
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 <br>
 

package/docs/LICENSE.md

@@ -1,21 +1,9 @@
-# MIT License
+# 🏛️ MIT License
 
 **Copyright (c) 2024 [Adam Lui](https://github.com/adamlui)**
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/package.json

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

package/scss-to-css.js

@@ -11,27 +11,42 @@ const nc = '\x1b[0m', // no color
       by = '\x1b[1;33m', // bright yellow
       bg = '\x1b[1;92m'; // bright green
 
+// Load FLAG settings
+const config = { 
+    dryRun: process.argv.some(arg => /^--?(?:n|dry-?run)$/.test(arg)),
+    includeDotFolders: process.argv.some(arg =>
+        /^--?(?:dd?|(?:include-?)?dot-?(?:folder|dir(?:ector(?:y|ie))?)s?)$/.test(arg)),
+    disableSourceMaps: process.argv.some(arg =>
+        /^--?(?:S|(?:exclude|disable|no)-?so?u?rce?-?maps?)$/.test(arg)),
+    noRecursion: process.argv.some(arg =>
+        /^--?(?:R|(?:disable|no)-?recursion)$/.test(arg)),
+    noMinify: process.argv.some(arg =>
+        /^--?(?:M|(?:disable|no)-?minif(?:y|ication))$/.test(arg)),
+    quietMode: process.argv.some(arg => /^--?q(?:uiet)?$/.test(arg))
+};
+
 // Show HELP screen if -h or --help passed
 if (process.argv.some(arg => /^--?h(?:elp)?$/.test(arg))) {
 
-    // Print help
-    console.info(`\n${by}scss-to-css [inputPath] [outputPath] [options]${nc}`);
-    console.info('\nPath arguments:');
-    printWrappedMsg(' [inputPath]                  '
+    printHelp(`\n${by}scss-to-css [inputPath] [outputPath] [options]${nc}`);
+    printHelp('\nPath arguments:');
+    printHelp(' [inputPath]                  '
         + 'Path to SCSS file or directory containing SCSS files to be compiled,'
         + ' relative to the current working directory.');
-    printWrappedMsg(' [outputPath]                 '
+    printHelp(' [outputPath]                 '
         + 'Path to file or directory where CSS + sourcemap files will be stored,'
         + ' relative to original file location (if not provided, css/ is used).');
-    console.info('\nConfig options:');
-    printWrappedMsg(' -n, --dry-run                Don\'t actually compile the file(s),'
+    printHelp('\nConfig options:');
+    printHelp(' -n, --dry-run                Don\'t actually compile the file(s),'
         + ' just show if they will be processed.');
-    printWrappedMsg(' -dd, --include-dotfolders    Include dotfolders in file search.');
-    printWrappedMsg(' -S, --disable-source-maps    Prevent source maps from being generated.');
-    printWrappedMsg(' -M, --no-minify              Disable minification of output CSS.');
-    console.info('\nInfo commands:');
-    printWrappedMsg(' -h, --help                   Display this help screen.');
-    printWrappedMsg(' -v, --version                Show version number.');
+    printHelp(' -d, --include-dotfolders     Include dotfolders in file search.');
+    printHelp(' -S, --no-source-maps         Prevent source maps from being generated.');
+    printHelp(' -M, --no-minify              Disable minification of output CSS.');
+    printHelp(' -R, --no-recursion           Disable recursive file searching.');
+    printHelp(' -q, --quiet                  Suppress all logging except errors.');
+    printHelp('\nInfo commands:');
+    printHelp(' -h, --help                   Display this help screen.');
+    printHelp(' -v, --version                Show version number.');
 
 // Show VERSION number if -v or --version passed
 } else if (process.argv.some(arg => /^--?ve?r?s?i?o?n?$/.test(arg))) {
@@ -56,18 +71,7 @@ if (process.argv.some(arg => /^--?h(?:elp)?$/.test(arg))) {
         process.exit(1);
     }
 
-    // Load flag settings
-    const config = { 
-        dryRun: process.argv.some(arg => /^--?(?:n|dry-?run)$/.test(arg)),
-        includeDotFolders: process.argv.some(arg =>
-            /^--?(?:dd|(?:include-)?dot-?(?:folder|dir(?:ector(?:y|ie))?)s?)$/.test(arg)),
-        disableSourceMaps: process.argv.some(arg =>
-            /^--?(?:S|(?:exclude|disable)-so?u?rce?-?maps?)$/.test(arg)),
-        noMinify: process.argv.some(arg =>
-            /^--?(?:M|(?:disable|no)-minif(?:y|ication))$/.test(arg))
-    };
-
-    // Recursively find all eligible SCSS files or arg-passed file
+    // Find all eligible SCSS files or arg-passed file
     const scssFiles = [];
     if (inputArg.endsWith('.scss')) scssFiles.push(inputPath);
     else (function findSCSSfiles(dir) {
@@ -75,7 +79,7 @@ if (process.argv.some(arg => /^--?h(?:elp)?$/.test(arg))) {
         files.forEach(file => {
             const filePath = path.resolve(dir, file);
             if (fs.statSync(filePath).isDirectory() &&
-                (config.includeDotFolders || !file.startsWith('.')))
+                (config.includeDotFolders || !file.startsWith('.')) && !config.noRecursion)
                     findSCSSfiles(filePath); // recursively find SCSS in eligible dir
             else if (file.endsWith('.scss')) // SCSS file found
                 scssFiles.push(filePath); // store it for compilation
@@ -83,7 +87,7 @@ if (process.argv.some(arg => /^--?h(?:elp)?$/.test(arg))) {
     })(inputPath);
 
     if (scssFiles.length === 0) { // print nothing found
-        console.info(`\n${by}No SCSS files found.${nc}`);
+        printIfNotQuiet(`\n${by}No SCSS files found.${nc}`);
 
     } else if (config.dryRun) { // print files to be processed
         console.info(`\n${by}SCSS files to be compiled:${nc}`);
@@ -92,10 +96,10 @@ if (process.argv.some(arg => /^--?h(?:elp)?$/.test(arg))) {
     } else { // actually compile SCSS files
 
         let cssGenCnt = 0, srcMapGenCnt = 0;
-        console.log(''); // line break before first log
+        printIfNotQuiet(''); // line break before first log
         scssFiles.forEach(scssPath => {
-            console.info(`Compiling ${ scssPath }...`);
-            try { // to compile it
+            printIfNotQuiet(`Compiling ${ scssPath }...`);
+            try { // to compile SCSS file
                 const outputDir = path.join(
                     path.dirname(scssPath), // path of file to be minified
                     /(?:src|s[ac]ss)$/.test(path.dirname(scssPath)) ? '../css' // + ../css/ if in *(src|sass|scss)/
@@ -117,22 +121,22 @@ if (process.argv.some(arg => /^--?h(?:elp)?$/.test(arg))) {
                     fs.writeFileSync(outputPath + '.map', JSON.stringify(compileResult.sourceMap), 'utf8');
                     srcMapGenCnt++;
                 }
-            } catch (err) {
-                console.error(`${br}Error compiling ${ scssPath }: ${ err.message }${nc}`);
-            }
+            } catch (err) { console.error(`${br}Error compiling ${ scssPath }: ${ err.message }${nc}`); }
         });
 
         // Print final summary
         if (cssGenCnt) {
-            console.info(`\n${bg}Compilation complete!${nc}`);
-            console.info(`${ cssGenCnt } CSS file${ cssGenCnt > 1 ? 's' : '' }`
+            printIfNotQuiet(`\n${bg}Compilation complete!${nc}`);
+            printIfNotQuiet(`${ cssGenCnt } CSS file${ cssGenCnt > 1 ? 's' : '' }`
                 + ( srcMapGenCnt ? ` + ${ srcMapGenCnt } source map${ srcMapGenCnt > 1 ? 's' : '' }` : '' )
                 + ' generated.');
-        } else console.info(`${by}No SCSS files processed successfully.${nc}`);
+        } else printIfNotQuiet(`${by}No SCSS files processed successfully.${nc}`);
     }
 }
 
-function printWrappedMsg(msg) { // wraps msg, indents 2nd+ lines
+// Define LOGGING functions
+
+function printHelp(msg) { // wrap msg + indent 2nd+ lines (for --help screen)
     const terminalWidth = process.stdout.columns || 80,
           indentation = 30, lines = [], words = msg.match(/\S+|\s+/g);
 
@@ -154,3 +158,5 @@ function printWrappedMsg(msg) { // wraps msg, indents 2nd+ lines
             : ' '.repeat(indentation) + line // print subsequent lines indented
     ));
 }
+
+function printIfNotQuiet(msg) { if (!config.quietMode) console.info(msg); }