@adamlui/minify.js 1.4.5 → 1.4.7

package/README.md

@@ -10,7 +10,8 @@
         <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/pa#readme">ਪੰਜਾਬੀ</a>
+        <a href="https://github.com/adamlui/js-utils/tree/main/minify.js/docs/pa#readme">ਪੰਜਾਬੀ</a> |
+        <a href="https://github.com/adamlui/js-utils/tree/main/minify.js/docs/de#readme">Deutsch</a>
     </h6>
 </div>
 
@@ -20,7 +21,7 @@
 
 <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&color=af68ff&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-orange.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.5-44cc11.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
+<a href="https://github.com/adamlui/js-utils/releases/tag/minify.js-1.4.7"><img height=31 src="https://img.shields.io/badge/Latest_Build-1.4.7-44cc11.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>
 
@@ -211,15 +212,19 @@ Searches for all unminified JavaScript files within the `searchDir` string passe
 Options are boolean, passed as object properties. For example:
 
 ```js
-// Search for unminified JS files in exactly `assets/js`:
+// Search for unminified JS files in exactly assets/js:
 const searchResults = minifyJS.findJS('assets/js', { recursive: false });
 console.log(searchResults);
 
-/* outputs:
-Searching for unminified JS files...
-Search complete. 2 files found.
-[ 'E:\\js\\utils\\minify.js\\assets\\js\\foo.js',
-  'E:\\js\\utils\\minify.js\\assets\\js\\bar.js' ]
+/* sample output:
+
+findJS() » Searching for unminified JS files...
+findJS() » Search complete! 2 files found.
+findJS() » Check returned array.
+[
+  'E:\\js\\utils\\minify.js\\assets\\js\\foo.js',
+  'E:\\js\\utils\\minify.js\\assets\\js\\bar.js'
+]
 */
 ```
 

package/docs/LICENSE.md

@@ -10,7 +10,8 @@
         <a href="hi/LICENSE.md">हिंदी</a> |
         <a href="bn/LICENSE.md">বাংলা</a> |
         <a href="mr/LICENSE.md">मराठी</a> |
-        <a href="pa/LICENSE.md">ਪੰਜਾਬੀ</a>
+        <a href="pa/LICENSE.md">ਪੰਜਾਬੀ</a> |
+        <a href="de/LICENSE.md">Deutsch</a>  
     </h6>
 </div>
 

package/docs/SECURITY.md

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

package/minify.js

@@ -14,30 +14,29 @@ function findJS(searchDir, options = {}) {
     options = { ...defaultOptions, ...options };
 
     // Validate searchDir
-    if (!searchDir) return console.error(
-        'findJS() error: Please supply a `searchDir` arg.');
-    else if (typeof searchDir !== 'string') return console.error(
-        'findJS() error: Arg `searchDir` must be a string.');
+    if (typeof searchDir !== 'string') return console.error(
+            'findJS() » ERROR: 1st arg <searchDir> must be a string.');
     else { // verify searchDir path existence
         const searchPath = path.resolve(process.cwd(), searchDir);
         if (!fs.existsSync(searchPath)) return console.error(
-            'findJS() error: Arg `searchDir` must be an existing directory.'
-                + `\n'${ searchPath }' does not exist.`);
+            'findJS() » ERROR: 1st arg <searchDir> must be an existing directory.\n'
+          + `findJS() » ${ searchPath } does not exist.`);
     }
 
     // Validate options
     for (const key of Object.keys(options)) {
         if (!Object.prototype.hasOwnProperty.call(defaultOptions, key))
             if (key !== 'isRecursing') return console.error(
-                `findJS() error: \`${ key }\` is an invalid option.`
-                    + `\nValid options: [ ${Object.keys(defaultOptions).join(', ')} ]`);
+                `findJS() » ERROR: \`${ key }\` is an invalid option.\n`
+              + `findJS() » Valid options: [ ${ Object.keys(defaultOptions).join(', ') } ]`);
         else if (typeof options[key] !== 'boolean') return console.error(
-            `findJS() error: \`${ key }\` option must be set to \`true\` or \`false\`.`);
+                `findJS() » ERROR: \`${ key }\` option can only be set to \`true\` or \`false\`.`);
     }
 
     // Search for unminified JS
     const dirFiles = fs.readdirSync(searchDir), jsFiles = [];
-    if (options.verbose && !options.isRecursing) console.info('\nSearching for unminified JS files...');
+    if (options.verbose && !options.isRecursing) console.info(
+        '\nfindJS() » Searching for unminified JS files...');
     dirFiles.forEach(file => {
         const filePath = path.resolve(searchDir, file);
         if (fs.statSync(filePath).isDirectory() && file != 'node_modules'
@@ -50,11 +49,11 @@ function findJS(searchDir, options = {}) {
     });
 
     // Log/return final result
-    if (!options.isRecursing && options.verbose) {
-        console.info('Search complete. '
-            + ( jsFiles.length === 0 ? 'No' : jsFiles.length )
-            + ` file${ jsFiles.length > 1 ? 's' : '' } found.`);
-    }
+    if (!options.isRecursing && options.verbose) console.info(
+        'findJS() » Search complete! ' + ( jsFiles.length === 0 ? 'No' : jsFiles.length )
+            + ` file${ jsFiles.length > 1 ? 's' : '' } found.`
+        + ( findJS.caller.name !== 'minify' && require.main !== module ?
+            '\nfindJS() » Check returned array.' : '' ));
     return options.isRecursing || jsFiles.length > 0 ? jsFiles : [];
 }
 
@@ -67,41 +66,42 @@ function minify(input, options = {}) {
 
     // Validate input
     if (typeof input !== 'string') return console.error(
-        'minify() error: Arg `inputPath` must be a string.');
+        'minify() » ERROR: 1st arg <input> must be a string.');
 
     // Validate options
     for (const key of Object.keys(options)) {
         if (!Object.prototype.hasOwnProperty.call(defaultOptions, key)) return console.error(
-            `findJS() error: \`${ key }\` is an invalid option.`
-                + `\nValid options: [ ${Object.keys(defaultOptions).join(', ')} ]`);
+            `minify() » ERROR: \`${ key }\` is an invalid option.\n`
+          + `minify() » Valid options: [ ${ Object.keys(defaultOptions).join(', ') } ]`);
         else if (typeof options[key] !== 'boolean') return console.error(
-            `findJS() error: \`${ key }\` option must be set to \`true\` or \`false\`.`);
+            `minify() » ERROR: \`${ key }\` option can only be set to \`true\` or \`false\`.`);
     }
 
     // Minify JS based on input
     const minifyOptions = { mangle: options.mangle ? { toplevel: true } : false };
     if (fs.existsSync(input)) { // minify based on path arg
         if (input.endsWith('.js')) { // file path passed
-            if (options.verbose) console.info(`Minifying ${ input }...`);
+            if (options.verbose) console.info(`minify() » Minifying ${ input }...`);
             const minifyResult = uglifyJS.minify(fs.readFileSync(input, 'utf8'), minifyOptions);
-            if (minifyResult.error) console.error(`ERROR: ${ minifyResult.error.message }`);
+            if (minifyResult.error) console.error(`minify() » ERROR: ${ minifyResult.error.message }`);
             return { code: minifyResult.code, srcPath: path.resolve(process.cwd(), input),
                      error: minifyResult.error };
         } else { // dir path passed
             return findJS(input, { recursive: options.recursive, verbose: options.verbose,
                                    dotFolders: options.dotFolders, dotFiles: options.dotFiles 
                 })?.map(jsPath => { // minify found JS files
-                    if (options.verbose) console.info(`Minifying ${ jsPath }...`);
+                    if (options.verbose) console.info(`minify() » Minifying ${ jsPath }...`);
                     const srcCode = fs.readFileSync(jsPath, 'utf8'),
                           minifyResult = uglifyJS.minify(srcCode, minifyOptions);
-                    if (minifyResult.error) console.error(`ERROR: ${ minifyResult.error.message }`);
+                    if (minifyResult.error) console.error(`minify() » ERROR: ${ minifyResult.error.message }`);
                     return { code: minifyResult.code, srcPath: jsPath, error: minifyResult.error };
                 }).filter(data => !data.error); // filter out failed minifications
         }
     } else { // minify based on src code arg
-        if (options.verbose) console.info('Minifying passed source code...');
+        if (options.verbose) console.info('minify() » Minifying passed source code...');
         const minifyResult = uglifyJS.minify(input, minifyOptions);
-        if (minifyResult.error) console.error(`ERROR: ${ minifyResult.error.message }`);
+        if (minifyResult.error) console.error(`minify() » ERROR: ${ minifyResult.error.message }`);
+
         return { code: minifyResult.code, srcPath: undefined, error: minifyResult.error };
     }
 }
@@ -123,7 +123,7 @@ else { // run as CLI utility
         'dryRun': /^--?(?:n|dry-?run)$/,
         'includeDotFolders': /^--?(?:dd?|(?:include-?)?dot-?(?:folder|dir(?:ector(?:y|ie))?)s?=?(?:true|1)?)$/,
         'includeDotFiles': /^--?(?:df|D|(?:include-?)?dot-?files?=?(?:true|1)?)$/,
-        'noRecursion': /^--?(?:R|(?:disable|no)-?recursion|recursion=(?:false|0))$/,
+        'noRecursion': /^--?(?:R|(?:disable|no)-?recursi(?:on|ve)|recursi(?:on|ve)=(?:false|0))$/,
         'noMangle': /^--?(?:M|(?:disable|no)-?mangle|mangle=(?:false|0))$/,
         'quietMode': /^--?q(?:uiet)?(?:-?mode)?$/,
         'help': /^--?h(?:elp)?$/,
@@ -159,8 +159,8 @@ else { // run as CLI utility
         // Validate input arg (output arg can be anything)
         const inputPath = path.resolve(process.cwd(), inputArg);
         if (inputArg && !fs.existsSync(inputPath)) {
-            console.error(`\n${br}Error: First argument must be an existing file or directory.`
-                + `\n'${ inputPath }' does not exist.${nc}`
+            console.error(`\n${br}Error: First argument can only be an existing file or directory.`
+                + `\n${ inputPath } does not exist.${nc}`
                 + `\n\n${bg}Example valid command: \n>> minify-js . output.min.js${nc}`
                 + `\n\n${by}For all command options: \n>> minify-js --help${nc}`);
             process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adamlui/minify.js",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "Recursively minify all JavaScript files",
   "author": {
     "name": "Adam Lui",