@adamlui/minify.js 1.4.0 → 1.4.2

package/README.md

@@ -9,17 +9,18 @@
         <a href="https://github.com/adamlui/js-utils/tree/main/minify.js/docs/zh-tw#readme">繁體中文</a> |
         <a href="https://github.com/adamlui/js-utils/tree/main/minify.js/docs/hi#readme">हिंदी</a> |
         <a href="https://github.com/adamlui/js-utils/tree/main/minify.js/docs/bn#readme">বাংলা</a> |
-        <a href="https://github.com/adamlui/js-utils/tree/main/minify.js/docs/mr#readme">मराठी</a>
+        <a href="https://github.com/adamlui/js-utils/tree/main/minify.js/docs/mr#readme">मराठी</a> |
+        <a href="https://github.com/adamlui/js-utils/tree/main/minify.js/docs/pa#readme">ਪੰਜਾਬੀ</a>
     </h6>
 </div>
 
-# </> minify.js 
+# </> minify.js
 
 ### Recursively minify all JavaScript files.
 
 <a href="https://www.npmjs.com/package/@adamlui/minify.js"><img height=31 src="https://img.shields.io/npm/dt/%40adamlui%2Fminify.js?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-red.svg?logo=internetarchive&logoColor=white&labelColor=464646&style=for-the-badge"></a>
-<a href="https://www.npmjs.com/package/@adamlui/minify.js?activeTab=versions"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.4.0-fc7811.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
+<a href="https://www.npmjs.com/package/@adamlui/minify.js?activeTab=versions"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.4.2-fc7811.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
 <a href="https://www.npmjs.com/package/@adamlui/minify.js?activeTab=code"><img height=31 src="https://img.shields.io/npm/unpacked-size/%40adamlui%2Fminify.js?style=for-the-badge&logo=ebox&logoColor=white&labelColor=464646&color=blue"></a>
 <a href="https://sonarcloud.io/component_measures?metric=new_vulnerabilities&id=adamlui_js-utils:minify.js/minify.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%3Aminify.js%2Fminify.js%26metricKeys%3Dvulnerabilities&query=%24.component.measures.0.value&style=for-the-badge&logo=sonarcloud&logoColor=white&labelColor=464646&label=Vulnerabilities&color=gold"></a>
 
@@ -164,9 +165,8 @@ If a **directory path** is passed, JavaScript files are searched for (recursivel
 ```js
 const results = minifyJS.minify('.');
 results.forEach(result =>
-    console.log(result.srcPath) // paths to JS files in working directory + all nested directories
-);
-console.log(results[1].code) // minified code of 2nd JS file if found, or `undefined` if not found
+    console.log(result.srcPath)); // paths to JS files in working directory + all nested directories
+console.log(results[1].code);     // minified code of 2nd JS file if found, or `undefined` if not found
 ```
 
 Options are boolean, passed as object properties. For example:
@@ -179,7 +179,8 @@ minifyJS.minify(input, { dotFiles: true });
 Possible parameters (and their default settings) are:
 
 ```
- recursive (true)     Recursively search for nested files if dir path passed.
+ recursive (true)     Recursively search for nested files if dir path
+                      passed.
  verbose (true)       Show logging in console/terminal.
  dotFolders (false)   Include dotfolders in file search.
  dotFiles (false)     Include dotfiles in file search.
@@ -200,7 +201,8 @@ minifyJS.findJS(searchDir, { recursive: false });
 Possible parameters (and their default settings) are:
 
 ```
- recursive (true)     Recursively search for nested files if dir path passed.
+ recursive (true)     Recursively search for nested files if dir path
+                      passed.
  verbose (false)      Show logging in console/terminal.
  dotFolders (false)   Include dotfolders in file search.
  dotFiles (false)     Include dotfiles in file search.
@@ -215,7 +217,7 @@ Please consider [giving a GitHub ⭐](https://github.com/adamlui/js-utils) if th
 
 ## 🏛️ MIT License
 
-**Copyright © 2023–2024 [Adam Lui](https://github.com/adamlui)**
+**Copyright © 2023–2024 [Adam Lui](https://github.com/adamlui) & contributors**
 
 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:
 

package/docs/LICENSE.md

@@ -9,13 +9,14 @@
         <a href="zh-tw/LICENSE.md">繁體中文</a> |
         <a href="hi/LICENSE.md">हिंदी</a> |
         <a href="bn/LICENSE.md">বাংলা</a> |
-        <a href="mr/LICENSE.md">मराठी</a>
+        <a href="mr/LICENSE.md">मराठी</a> |
+        <a href="pa/LICENSE.md">ਪੰਜਾਬੀ</a>
     </h6>
 </div>
 
 # 🏛️ MIT License
 
-**Copyright © 2023–2024 [Adam Lui](https://github.com/adamlui)**
+**Copyright © 2023–2024 [Adam Lui](https://github.com/adamlui) & contributors**
 
 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:
 

package/docs/SECURITY.md

@@ -9,7 +9,8 @@
         <a href="zh-tw/SECURITY.md">繁體中文</a> |
         <a href="hi/SECURITY.md">हिंदी</a> |
         <a href="bn/SECURITY.md">বাংলা</a> |
-        <a href="mr/SECURITY.md">मराठी</a>
+        <a href="mr/SECURITY.md">मराठी</a> |
+        <a href="pa/SECURITY.md">ਪੰਜਾਬੀ</a>
     </h6>
 </div>
 

package/minify.js

@@ -13,16 +13,17 @@ function findJS(searchDir, options = {}) {
     const dirFiles = fs.readdirSync(searchDir), jsFiles = [];
     dirFiles.forEach(file => {
         const filePath = path.resolve(searchDir, file);
-        if (fs.statSync(filePath).isDirectory() && file != 'node_modules' &&
-            (options.dotFolders || !file.startsWith('.')) && options.recursive) {
+        if (fs.statSync(filePath).isDirectory() && file != 'node_modules'
+            && (options.dotFolders || !file.startsWith('.')) && options.recursive) {
                 if (options.verbose) console.info(`Searching for unminified JS files in: ${filePath}...`);
                 jsFiles.push( // recursively find unminified JS in eligible dir
-                    ...findJS(filePath));
-        } else if (/\.js(?<!\.min\.js)$/.test(file) &&
-            (options.dotFiles || !file.startsWith('.')))
+                    ...findJS(filePath, { ...options, isRecursing: true }));
+        } else if (/\.js(?<!\.min\.js)$/.test(file)
+            && (options.dotFiles || !file.startsWith('.')))
                 jsFiles.push(filePath); // store eligible unminified JS file for minification
     });
-    return jsFiles;
+    if (options.isRecursing || jsFiles.length > 0) return jsFiles;
+    else if (options.verbose) console.info('\nNo unminified JavaScript files found.');
 }
 
 function minify(input, options = {}) {
@@ -40,9 +41,10 @@ function minify(input, options = {}) {
             if (minifyResult.error) console.error(`ERROR: ${ minifyResult.error.message }`);
             return { code: minifyResult.code, srcPath: input, error: minifyResult.error };
         } else { // dir path passed
+            if (options.verbose) console.info('Searching for unminified JS files...');
             return findJS(input, { recursive: options.recursive,
                                    dotFolders: options.dotFolders, dotFiles: options.dotFiles })
-                .map(jsPath => { // minify found JS files
+                ?.map(jsPath => { // minify found JS files
                     if (options.verbose) console.info(`Minifying ${ jsPath }...`);
                     const srcCode = fs.readFileSync(jsPath, 'utf8'),
                           minifyResult = uglifyJS.minify(srcCode, minifyOptions);
@@ -129,29 +131,26 @@ else { // run as CLI tool
         }
 
         // Find all eligible JavaScript files or arg-passed file
+        printIfNotQuiet('Searching for unminified JS files...');
         const unminnedJSfiles = inputArg.endsWith('.js') ? [inputPath]
             : findJS(inputPath, { recursive: !config.noRecursion });
 
-        if (unminnedJSfiles.length === 0) { // print nothing found
-            printIfNotQuiet(`\n${by}No unminified JavaScript files found.${nc}`);
-
-        } else if (config.dryRun) { // print files to be processed
+        if (config.dryRun && unminnedJSfiles?.length > 0) { // print files to be processed
             console.info(`\n${by}JS files to be minified:${nc}`);
-            unminnedJSfiles.forEach(file => console.info(file));
+            unminnedJSfiles?.forEach(file => console.info(file));
 
         } else { // actually minify JavaScript files
-            printIfNotQuiet(''); // line break before first log
 
             // Build array of minification data
             const failedPaths = [];
-            const minifyData = unminnedJSfiles.map(jsPath => {
+            const minifyData = unminnedJSfiles?.map(jsPath => {
                 const minifyResult = minify(jsPath, { verbose: !config.quietMode, mangle: !config.noMangle });
                 if (minifyResult.error) failedPaths.push(jsPath);
                 return minifyResult;
             }).filter(minifyResult => !minifyResult.error); // filter out failed minifications
 
             // Write array data to files
-            minifyData.forEach(({ code, srcPath }) => {
+            minifyData?.forEach(({ code, srcPath }) => {
                 const outputDir = path.join(
                     path.dirname(srcPath), // path of file to be minified
                     /so?u?rce?$/.test(path.dirname(srcPath)) ? '../min' // + ../min/ if in *(src|source)/
@@ -169,7 +168,7 @@ else { // run as CLI tool
             });
 
             // Print final summary
-            if (minifyData.length > 0) {
+            if (minifyData?.length > 0) {
                 printIfNotQuiet(`\n${bg}Minification complete!${nc}`);
                 printIfNotQuiet(
                     `${ minifyData.length } file${ minifyData.length > 1 ? 's' : '' } minified.`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adamlui/minify.js",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Recursively minify all JavaScript files",
   "author": {
     "name": "Adam Lui",
@@ -29,11 +29,13 @@
   },
   "keywords": [
     "javascript",
-    "js",
-    "js-utils",
-    "utils",
     "utilities",
-    "minifier"
+    "js-utils",
+    "minifier",
+    "api",
+    "js",
+    "cli",
+    "utils"
   ],
   "bugs": {
     "url": "https://github.com/adamlui/js-utils/issues"