@quasar/icongenie 3.1.1 → 5.0.0

package/lib/runner/verify.js

@@ -1,4 +1,3 @@
-
 import { existsSync } from 'node:fs'
 import { green, red, underline } from 'kolorist'
 
@@ -14,7 +13,7 @@ import { mergeObjects } from '../utils/merge-objects.js'
 import { getProfileContent } from '../utils/get-profile-content.js'
 import { validateProfileObject } from '../utils/validate-profile-object.js'
 
-function getFileStatus (file) {
+function getFileStatus(file) {
   if (!existsSync(file.absoluteName)) {
     return red('ERROR: missing!')
   }
@@ -27,53 +26,55 @@ function getFileStatus (file) {
     }
 
     if (width !== file.width || height !== file.height) {
-      return red(`ERROR: incorrect resolution! ${ width }x${ height }`)
+      return red(`ERROR: incorrect resolution! ${width}x${height}`)
     }
   }
 
   return green('SIZE OK')
 }
 
-function printMode (modeName, files) {
-  console.log(` ${ green(underline(`Mode ${ modeName.toUpperCase() }`)) } \n`)
+function printMode(modeName, files) {
+  console.log(` ${green(underline(`Mode ${modeName.toUpperCase()}`))} \n`)
 
   files.forEach(file => {
-    console.log(` ${ getFileStatus(file) } - ${ (file.generator + ':').padEnd(13, ' ') } ${ file.relativeName } ${ verifyMount(file) }`)
+    console.log(
+      ` ${getFileStatus(file)} - ${(file.generator + ':').padEnd(13, ' ')} ${file.relativeName} ${verifyMount(file)}`
+    )
   })
 
   console.log()
 }
 
-function printBanner (assetsOf, params) {
+function printBanner(assetsOf, params) {
   console.log(` VERIFYING with the following options:
  ================
- Root folder..... ${ green(appDir) }
- Assets of....... ${ green(assetsOf) }
- Assets filter... ${ !params.filter ? 'none' : green(params.filter) }
+ Root folder..... ${green(appDir)}
+ Assets of....... ${green(assetsOf)}
+ Assets filter... ${!params.filter ? 'none' : green(params.filter)}
  ================
 `)
 }
 
-function parseAssets (assets, include) {
+function parseAssets(assets, include) {
   const filesMap = []
-  let assetsOf = []
+  const assetsOf = []
 
   if (include) {
-    const embeddedModes = include.filter(
-      mode => existsSync(resolveDir(modes[ mode ].folder))
+    const embeddedModes = include.filter(mode =>
+      existsSync(resolveDir(modes[mode].folder))
     )
 
     embeddedModes.forEach(mode => {
       filesMap.push({
         name: mode,
-        files: getAssetsFiles(modes[ mode ].assets)
+        files: getAssetsFiles(modes[mode].assets)
       })
     })
 
-    assetsOf = assetsOf.concat(embeddedModes)
+    assetsOf.push(...embeddedModes)
   }
 
-  if (assets && assets.length > 0) {
+  if (assets && assets.length !== 0) {
     filesMap.push({
       name: 'profile assets',
       files: getAssetsFiles(assets)
@@ -88,12 +89,14 @@ function parseAssets (assets, include) {
   }
 }
 
-function verifyProfile (profile) {
+function verifyProfile(profile) {
   const params = profile.params
   const { assetsOf, filesMap } = parseAssets(profile.assets, params.include)
 
   if (assetsOf.length === 0) {
-    warn(`No assets to generate! No mode/include specified, filter too specific or the respective Quasar mode(s) are not installed`)
+    warn(
+      `No assets to generate! No mode/include specified, filter too specific or the respective Quasar mode(s) are not installed`
+    )
     return
   }
 
@@ -104,20 +107,20 @@ function verifyProfile (profile) {
       ? entry.files.filter(file => file.generator === params.filter)
       : entry.files
 
-    if (files.length > 0) {
+    if (files.length !== 0) {
       printMode(entry.name, files)
     }
   })
 }
 
-export function verify (argv) {
+export function verify(argv) {
   const profile = {
     params: {},
     assets: []
   }
 
   if (argv.profile) {
-    parseArgv(argv, [ 'profile' ])
+    parseArgv(argv, ['profile'])
 
     const userProfile = getProfileContent(argv.profile)
 
@@ -125,14 +128,13 @@ export function verify (argv) {
       const { profile: _, ...params } = argv
 
       profile.params = mergeObjects(userProfile.params, params)
-      parseArgv(profile.params, [ 'include' ])
+      parseArgv(profile.params, ['include'])
     }
     if (userProfile.assets) {
       profile.assets = userProfile.assets
     }
-  }
-  else {
-    parseArgv(argv, [ 'mode' ])
+  } else {
+    parseArgv(argv, ['mode'])
 
     const { mode, ...params } = argv
 
@@ -140,7 +142,7 @@ export function verify (argv) {
     profile.params.include = mode
   }
 
-  parseArgv(profile.params, [ 'filter' ])
+  parseArgv(profile.params, ['filter'])
 
   // final thorough validation
   validateProfileObject(profile)

package/lib/utils/app-paths.js

@@ -1,19 +1,18 @@
-
 import { existsSync } from 'node:fs'
-import { normalize, join, sep } from 'node:path'
+import { join, normalize, sep } from 'node:path'
 
 import { fatal } from './logger.js'
 
-function getAppInfo () {
+function getAppInfo() {
   let appDir = process.cwd()
 
-  while (appDir.length && appDir[ appDir.length - 1 ] !== sep) {
+  while (appDir.length !== 0 && appDir.at(-1) !== sep) {
     if (
-      existsSync(join(appDir, 'quasar.config.js'))
-      || existsSync(join(appDir, 'quasar.config.mjs'))
-      || existsSync(join(appDir, 'quasar.config.ts'))
-      || existsSync(join(appDir, 'quasar.config.cjs'))
-      || existsSync(join(appDir, 'quasar.conf.js')) // legacy
+      existsSync(join(appDir, 'quasar.config.js')) ||
+      existsSync(join(appDir, 'quasar.config.mjs')) ||
+      existsSync(join(appDir, 'quasar.config.ts')) ||
+      existsSync(join(appDir, 'quasar.config.cjs')) ||
+      existsSync(join(appDir, 'quasar.conf.js')) // legacy
     ) {
       return appDir
     }

package/lib/utils/default-params.js

@@ -1,4 +1,3 @@
-
 export const defaultParams = {
   quality: 5,
   splashscreenIconRatio: 40,

package/lib/utils/filter-argv-params.js

@@ -1,13 +1,12 @@
-
-export function filterArgvParams (argv) {
+export function filterArgvParams(argv) {
   const params = {}
 
   Object.keys(argv).forEach(key => {
     if (key.length > 1 && key !== 'help') {
       // kebab to camel case
-      const prop = key.replace(/(-\w)/g, m => m[ 1 ].toUpperCase())
+      const prop = key.replaceAll(/(-\w)/g, m => m[1].toUpperCase())
 
-      params[ prop ] = argv[ key ]
+      params[prop] = argv[key]
     }
   })
 

package/lib/utils/get-argv.js

@@ -0,0 +1,47 @@
+import { parseArgs } from 'node:util'
+import { warn } from './logger.js'
+
+function kebabToCamelCase(str) {
+  return str
+    .split('-')
+    .map((part, index) =>
+      index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)
+    )
+    .join('')
+}
+
+function parseValues(values) {
+  return Object.keys(values).reduce((acc, key) => {
+    acc[kebabToCamelCase(key)] = values[key]
+    return acc
+  }, {})
+}
+
+export function getArgv(options, { strict = true } = {}) {
+  try {
+    const { values, positionals } = parseArgs({
+      options,
+      strict,
+      allowPositionals: true
+    })
+
+    return { ...parseValues(values), _: positionals }
+  } catch (err) {
+    return {
+      help: true,
+      _: [],
+
+      // Should be handled if (argv.help) in the caller
+      __warn() {
+        console.error(err)
+        warn(
+          err?.code === 'ERR_PARSE_ARGS_UNKNOWN_OPTION'
+            ? err.message
+            : 'Unknown error while parsing arguments'
+        )
+        warn()
+        process.exit(1)
+      }
+    }
+  }
+}

package/lib/utils/get-assets-files.js

@@ -1,11 +1,10 @@
-
 import { join } from 'node:path'
 
 import { appDir } from './app-paths.js'
 
 const tagRegex = /\{(.*?)\}/g
 
-export function getAssetsFiles (assets) {
+export function getAssetsFiles(assets) {
   const list = []
 
   assets.forEach(({ sizes, ...props }) => {
@@ -13,23 +12,18 @@ export function getAssetsFiles (assets) {
       sizes.forEach(size => {
         const isArray = Array.isArray(size)
 
-        const [ width, height ] = isArray
-          ? size
-          : [ size, size ]
+        const [width, height] = isArray ? size : [size, size]
 
-        const replacer = isArray
-          ? `${ width }x${ height }`
-          : width
+        const replacer = isArray ? `${width}x${height}` : width
 
         list.push({
           ...props,
-          name: props.name.replace(/{size}/g, replacer),
+          name: props.name.replaceAll('{size}', replacer),
           width,
           height
         })
       })
-    }
-    else {
+    } else {
       list.push(props)
     }
   })
@@ -42,7 +36,10 @@ export function getAssetsFiles (assets) {
     }
 
     if (tag) {
-      file.tag = tag.replace(tagRegex, (_, p) => file[ p === 'size' ? 'width' : p ])
+      file.tag = tag.replace(
+        tagRegex,
+        (_, p) => file[p === 'size' ? 'width' : p]
+      )
     }
 
     return file

package/lib/utils/get-compression.js

@@ -1,47 +1,59 @@
-
 import { dirname } from 'node:path'
 
 import imagemin from 'imagemin'
 import pngquant from 'imagemin-pngquant'
-import { BICUBIC2, HERMITE, BEZIER, BICUBIC, BILINEAR, NEAREST_NEIGHBOR } from 'png2icons'
+import {
+  BEZIER,
+  BICUBIC,
+  BICUBIC2,
+  BILINEAR,
+  HERMITE,
+  NEAREST_NEIGHBOR
+} from 'png2icons'
 
-export function getIcoCompression (quality) {
+export function getIcoCompression(quality) {
   switch (quality) {
     case 1:
-    case 2:
-      return NEAREST_NEIGHBOR // fastest, mediocre to OK quality
+    case 2: {
+      return NEAREST_NEIGHBOR
+    } // fastest, mediocre to OK quality
     case 3:
-    case 4:
-      return BILINEAR // fast, quality OK
+    case 4: {
+      return BILINEAR
+    } // fast, quality OK
     case 5:
-    case 6:
-      return BICUBIC2 // fast, good to very good quality
+    case 6: {
+      return BICUBIC2
+    } // fast, good to very good quality
     case 7:
-    case 8:
-      return BICUBIC // slower, good to very good quality
+    case 8: {
+      return BICUBIC
+    } // slower, good to very good quality
     case 9:
-    case 10:
-      return BEZIER // quite slow, high quality
+    case 10: {
+      return BEZIER
+    } // quite slow, high quality
     case 11:
-    case 12:
-      return HERMITE // quite slow, high quality
+    case 12: {
+      return HERMITE
+    } // quite slow, high quality
   }
 }
 
-export function getPngCompression (quality) {
+export function getPngCompression(quality) {
   if (quality === 12) {
     return () => {}
   }
 
   const plugins = [
     pngquant({
-      quality: [ 0.6, 0.8 ],
+      quality: [0.6, 0.8],
       speed: 12 - quality // 1 - 11
     })
   ]
 
-  return async function minifyFile (filename) {
-    return imagemin([ filename ], {
+  return function minifyFile(filename) {
+    return imagemin([filename], {
       destination: dirname(filename),
       plugins
     })

package/lib/utils/get-file-size.js

@@ -1,19 +1,18 @@
-
 import { statSync } from 'node:fs'
 
-const units = [ 'B', 'KB', 'MB', 'GB', 'TB', 'PB' ]
+const units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']
 
-function humanStorageSize (bytes) {
+function humanStorageSize(bytes) {
   let u = 0
 
-  while (parseInt(bytes, 10) >= 1024 && u < units.length - 1) {
+  while (Number.parseInt(bytes, 10) >= 1024 && u < units.length - 1) {
     bytes /= 1024
     ++u
   }
 
-  return `${ bytes.toFixed(1) }${ units[ u ] }`
+  return `${bytes.toFixed(1)}${units[u]}`
 }
 
-export function getFileSize (filename) {
+export function getFileSize(filename) {
   return humanStorageSize(statSync(filename).size)
 }

package/lib/utils/get-files-options.js

@@ -1,26 +1,25 @@
-
 import sharp from 'sharp'
 
-import { getPngCompression, getIcoCompression } from './get-compression.js'
+import { getIcoCompression, getPngCompression } from './get-compression.js'
 
-function getRgbColor (color) {
+function getRgbColor(color) {
   let hex = color.replace(/^#/, '')
 
   if (hex.length === 3) {
-    hex = hex[ 0 ] + hex[ 0 ] + hex[ 1 ] + hex[ 1 ] + hex[ 2 ] + hex[ 2 ]
+    hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2]
   }
 
-  const num = parseInt(hex, 16)
+  const num = Number.parseInt(hex, 16)
 
   return {
     r: num >> 16,
-    g: num >> 8 & 255,
+    g: (num >> 8) & 255,
     b: num & 255,
     alpha: 1
   }
 }
 
-export async function getFilesOptions ({
+export async function getFilesOptions({
   quality,
   padding,
 
@@ -32,29 +31,27 @@ export async function getFilesOptions ({
 
   ...opts
 }) {
-  const qualityLevel = parseInt(quality, 10)
+  const qualityLevel = Number.parseInt(quality, 10)
   const sharpIcon = sharp(icon).withMetadata()
   const sharpBackground = background
     ? sharp(background).withMetadata()
     : sharp({
-      create: {
-        width: 12,
-        height: 12,
-        channels: 4,
-        background: { r: 0, g: 0, b: 0, alpha: 0 }
-      }
-    })
+        create: {
+          width: 12,
+          height: 12,
+          channels: 4,
+          background: { r: 0, g: 0, b: 0, alpha: 0 }
+        }
+      })
 
   if (opts.skipTrim !== true) {
     sharpIcon.trim()
   }
 
   const computedPadding = padding
-    ? (
-      padding.length === 1
-        ? { horiz: padding[ 0 ], vert: padding[ 0 ] }
-        : { horiz: padding[ 0 ], vert: padding[ 1 ] }
-    )
+    ? padding.length === 1
+      ? { horiz: padding[0], vert: padding[0] }
+      : { horiz: padding[0], vert: padding[1] }
     : { horiz: 0, vert: 0 }
 
   return {
@@ -66,7 +63,7 @@ export async function getFilesOptions ({
 
     compression: {
       ico: getIcoCompression(qualityLevel),
-      png: getPngCompression(qualityLevel),
+      png: getPngCompression(qualityLevel)
     },
 
     padding: computedPadding,

package/lib/utils/get-png-size.js

@@ -1,25 +1,21 @@
-
 import { readChunkSync } from 'read-chunk'
 import isPng from 'is-png'
 
 // "fried" png's - http://www.jongware.com/pngdefry.html
 const friedChunk = 'CgBI'
 
-function getSize (buffer) {
-  const offset = buffer.toString('ascii', 12, 16) === friedChunk
-    ? [ 36, 32 ]
-    : [ 20, 16 ]
+function getSize(buffer) {
+  const offset =
+    buffer.toString('ascii', 12, 16) === friedChunk ? [36, 32] : [20, 16]
 
   return {
-    height: buffer.readUInt32BE(offset[ 0 ]),
-    width: buffer.readUInt32BE(offset[ 1 ])
+    height: buffer.readUInt32BE(offset[0]),
+    width: buffer.readUInt32BE(offset[1])
   }
 }
 
-export function getPngSize (file) {
+export function getPngSize(file) {
   const buffer = readChunkSync(file, { startPosition: 0, length: 40 })
 
-  return isPng(buffer) !== true
-    ? { width: 0, height: 0 }
-    : getSize(buffer)
+  return isPng(buffer) !== true ? { width: 0, height: 0 } : getSize(buffer)
 }

package/lib/utils/get-profile-content.js

@@ -1,19 +1,15 @@
-
 import { resolve } from 'node:path'
 import { readFileSync } from 'node:fs'
 
 import { warn } from './logger.js'
 import { appDir } from './app-paths.js'
 
-export function getProfileContent (profileFile) {
+export function getProfileContent(profileFile) {
   const file = resolve(appDir, profileFile)
 
   try {
-    return JSON.parse(
-      readFileSync(file, 'utf-8')
-    )
-  }
-  catch (err) {
+    return JSON.parse(readFileSync(file, 'utf8'))
+  } catch (err) {
     warn(`Specified profile file has a syntax error`)
     console.error(err)
     process.exit(1)

package/lib/utils/get-profile-files.js

@@ -1,12 +1,11 @@
-
 import { basename } from 'node:path'
-import glob from 'fast-glob'
+import { globSync } from 'tinyglobby'
 import { lstatSync } from 'node:fs'
 
 import { warn } from '../utils/logger.js'
 
-function parseFolder (folder) {
-  const profileFiles = glob.sync(`icongenie-*.json`, {
+function parseFolder(folder) {
+  const profileFiles = globSync(`icongenie-*.json`, {
     cwd: folder,
     deep: 1,
     absolute: true
@@ -15,19 +14,17 @@ function parseFolder (folder) {
   const numberOfFiles = profileFiles.length
 
   if (numberOfFiles === 0) {
-    warn(`No icongenie-*.json files detected in "${ folder }" folder!`)
+    warn(`No icongenie-*.json files detected in "${folder}" folder!`)
     process.exit(1)
   }
 
-  console.log(` Detected ${ numberOfFiles } JSON profile file(s):\n`)
-  console.log(` * ${ folder }`)
+  console.log(` Detected ${numberOfFiles} JSON profile file(s):\n`)
+  console.log(` * ${folder}`)
 
   profileFiles.forEach((file, index) => {
-    const prefix = index + 1 < profileFiles.length
-      ? `├──`
-      : `└──`
+    const prefix = index + 1 < profileFiles.length ? `├──` : `└──`
 
-    console.log(` ${ prefix } ${ basename(file) }`)
+    console.log(` ${prefix} ${basename(file)}`)
   })
 
   console.log()
@@ -35,8 +32,8 @@ function parseFolder (folder) {
   return profileFiles
 }
 
-export function getProfileFiles (profileParam) {
+export function getProfileFiles(profileParam) {
   return lstatSync(profileParam).isDirectory()
     ? parseFolder(profileParam)
-    : [ profileParam ]
+    : [profileParam]
 }

package/lib/utils/get-square-icon.js

@@ -1,7 +1,6 @@
-
 import { warn } from '../utils/logger.js'
 
-export function getSquareIcon ({
+export function getSquareIcon({
   file,
   icon,
   size,
@@ -25,8 +24,10 @@ export function getSquareIcon ({
     corrections.push('height')
   }
 
-  if (corrections.length > 0) {
-    warn(`Correction on padding for ${ file.relativeName } due to padding exceeding file's dimension of ${ size }x${ size }px`)
+  if (corrections.length !== 0) {
+    warn(
+      `Correction on padding for ${file.relativeName} due to padding exceeding file's dimension of ${size}x${size}px`
+    )
   }
 
   img.resize({

package/lib/utils/logger.js

@@ -1,4 +1,3 @@
-
 import { green, red } from 'kolorist'
 
 const banner = '*'
@@ -6,15 +5,15 @@ const banner = '*'
 const logBanner = green(banner)
 const warnBanner = red(banner)
 
-export function log (msg) {
-  console.log(msg ? ` ${ logBanner } ${ msg }` : '')
+export function log(msg) {
+  console.log(msg ? ` ${logBanner} ${msg}` : '')
 }
 
-export function warn (msg) {
-  console.warn(msg ? ` ${ warnBanner } ⚠️  ${ msg }\n` : '')
+export function warn(msg) {
+  console.warn(msg ? ` ${warnBanner} ⚠️  ${msg}\n` : '')
 }
 
-export function fatal (msg) {
-  console.error(msg ? ` ${ warnBanner } ⚠️  ${ msg }` : '')
+export function fatal(msg) {
+  console.error(msg ? ` ${warnBanner} ⚠️  ${msg}` : '')
   process.exit(1)
 }

package/lib/utils/merge-objects.js

@@ -1,13 +1,12 @@
-
-export function mergeObjects () {
+export function mergeObjects(...args) {
   const base = {}
 
-  for (let i = 0; i < arguments.length; i++) {
-    const obj = arguments[ i ]
+  for (let i = 0; i < args.length; i++) {
+    const obj = args[i]
 
     Object.keys(obj).forEach(key => {
-      if (obj[ key ] !== void 0) {
-        base[ key ] = obj[ key ]
+      if (obj[key] !== void 0) {
+        base[key] = obj[key]
       }
     })
   }