Simplified conditions for return log instructions in API methods to rely on browser window to support ESM env

Author: adamlui

generate-pw/src/generate-pw.js

@@ -84,10 +84,9 @@ function generatePassword(options = {}) {
 
         // Log/return final result
         if (options.verbose && !fromGeneratePasswords) {
-            console.info(
-                'generatePassword() » Password generated!');       
-            if (typeof require == 'undefined' || !/cli(?:\.min)?\.js$/.test(require.main.filename)) console.info(
-                'generatePassword() » Check returned string.');
+                console.info('generatePassword() » Password generated!');       
+            if (typeof window != 'undefined')
+                console.info('generatePassword() » Check returned string.');
         }
         return password;
     }
@@ -129,10 +128,11 @@ function generatePasswords(qty, options = {}) {
     for (let i = 0; i < qty; i++) passwords.push(generatePassword(options));
 
     // Log/return final result
-    if (options.verbose) console.info(
-        `generatePasswords() » Password${ qty > 1 ? 's' : '' } generated!`);
-    if (typeof require == 'undefined' || !/cli(?:\.min)?\.js$/.test(require.main.filename)) console.info(
-        'generatePasswords() » Check returned array.');
+    if (options.verbose) {
+            console.info(`generatePasswords() » Password${ qty > 1 ? 's' : '' } generated!`);
+        if (typeof window != 'undefined')
+            console.info('generatePasswords() » Check returned array.');
+    }
     return passwords;
 }
 

geolocate/src/geolocate.js

@@ -37,7 +37,7 @@ async function geolocate(ips, options = {}) {
             let { status, org, as, query, ...filteredData } = await response.json(); // eslint-disable-line no-unused-vars
             filteredData = { ip, ...filteredData }; geoData.push(filteredData);
         }
-        if (options.verbose && (typeof require == 'undefined' || !/cli(?:\.min)?\.js$/.test(require.main.filename)))
+        if (options.verbose && typeof window != 'undefined')
             console.info('geolocate() » Success! Check returned array.');
         return geoData;
     } catch (err) { console.error('geolocate() » ERROR:', err.message); }

minify.js/node.js/src/minify.js

@@ -63,12 +63,11 @@ function findJS(searchDir, options = {}) {
 
     // Log/return final result
     if (!options.isRecursing && options.verbose) {
-        console.info('findJS() » Search complete! '
-            + ( jsFiles.length == 0 ? 'No' : jsFiles.length )
-            + ` file${ jsFiles.length == 1 ? '' : 's' } found.`);
-        if (findJS.caller.name != 'minify' && !process.argv.some(arg => arg.includes('gulp')) &&
-            !/cli(?:\.min)?\.js$/.test(require.main.filename))
-                console.info('findJS() » Check returned array.');
+            console.info('findJS() » Search complete! '
+                + ( jsFiles.length == 0 ? 'No' : jsFiles.length )
+                + ` file${ jsFiles.length == 1 ? '' : 's' } found.`);
+        if (findJS.caller.name != 'minify' && typeof window != 'undefined')
+            console.info('findJS() » Check returned array.');
     }
     return options.isRecursing || jsFiles.length > 0 ? jsFiles : [];
 }
@@ -107,9 +106,8 @@ function minify(input, options = {}) {
             const minifyResult = uglifyJS.minify(fs.readFileSync(input, 'utf8'), minifyOptions);
             if (options.comment) minifyResult.code = prependComment(minifyResult.code, options.comment);
             if (minifyResult.error) console.error(`minify() » ERROR: ${minifyResult.error.message}`);
-            else if (options.verbose && !process.argv.some(arg => arg.includes('gulp')) &&
-                !/cli(?:\.min)?\.js$/.test(require.main.filename))
-                    console.info('minify() » Minification complete! Check returned object.');
+            else if (typeof window != 'undefined')
+                console.info('minify() » Minification complete! Check returned object.');
             return { code: minifyResult.code, srcPath: path.resolve(process.cwd(), input),
                      error: minifyResult.error };
         } else { // dir path passed

scss-to-css/node.js/src/scss-to-css.js

@@ -64,7 +64,7 @@ function findSCSS(searchDir, options = {}) {
         console.info('findSCSS() » Search complete! '
             + ( scssFiles.length == 0 ? 'No' : scssFiles.length )
             + ` file${ scssFiles.length == 1 ? '' : 's' } found.`);
-        if (findSCSS.caller.name != 'compile' && !/cli(?:\.min)?\.js$/.test(require.main.filename))
+        if (findSCSS.caller.name != 'compile' && typeof window != 'undefined')
             console.info('findSCSS() » Check returned array.');
     }
     return options.isRecursing || scssFiles.length > 0 ? scssFiles : [];
@@ -104,7 +104,7 @@ function compile(input, options = {}) {
             try { // to compile file passed
                 const compileResult = sass.compile(input, compileOptions);
                 if (options.comment) compileResult.css = prependComment(compileResult.css, options.comment);
-                if (options.verbose && !/cli(?:\.min)?\.js$/.test(require.main.filename))
+                if (options.verbose && typeof window != 'undefined')
                     console.info('compile() » Compilation complete! Check returned object.');
                 return { code: compileResult.css, srcMap: compileResult.sourceMap,
                          srcPath: path.resolve(process.cwd(), input), error: undefined };