@quasar/icongenie 3.1.1 → 5.0.0

package/lib/utils/node-version-check.js

@@ -1,27 +1,27 @@
 // version-check
 
 const version = process.version.split('.')
-const major = parseInt(version[ 0 ].replace(/\D/g, ''), 10)
-const minor = parseInt(version[ 1 ].replace(/\D/g,''), 10)
-const patch = parseInt(version[ 2 ].replace(/\D/g,''), 10)
+const major = Number.parseInt(version[0].replaceAll(/\D/g, ''), 10)
+const minor = Number.parseInt(version[1].replaceAll(/\D/g, ''), 10)
+const patch = Number.parseInt(version[2].replaceAll(/\D/g, ''), 10)
 
 const min = {
-  major: 14,
-  minor: 19,
+  major: 22,
+  minor: 22,
   patch: 0
 }
 
 if (
-  major < min.major || (
-    major === min.major && (
-      minor < min.minor || (minor === min.minor && patch < min.patch)
-    )
-  )
+  major < min.major ||
+  (major === min.major &&
+    (minor < min.minor || (minor === min.minor && patch < min.patch)))
 ) {
   console.error()
   console.error('--------------------------------------------------------')
   console.error(' INCOMPATIBLE NODE VERSION')
-  console.error(` @quasar/icongenie requires Node ${ min.major }.${ min.minor }.${ min.patch } or superior`)
+  console.error(
+    ` @quasar/icongenie requires Node ${min.major}.${min.minor}.${min.patch} or superior`
+  )
   console.error()
   console.error(' You are running Node ' + process.version)
   console.error(' Please install a compatible Node version and try again')

package/lib/utils/package-json.js

@@ -1,9 +1,5 @@
-
 import { readFileSync } from 'node:fs'
 
 export const packageJson = JSON.parse(
-  readFileSync(
-    new URL('../../package.json', import.meta.url),
-    'utf-8'
-  )
+  readFileSync(new URL('../../package.json', import.meta.url), 'utf8')
 )

package/lib/utils/parse-argv.js

@@ -1,7 +1,5 @@
-
 import { existsSync, lstatSync } from 'node:fs'
-import { resolve, normalize, isAbsolute } from 'node:path'
-import { fileURLToPath } from 'node:url'
+import { isAbsolute, join, normalize, resolve } from 'node:path'
 import untildify from 'untildify'
 
 import { getPngSize } from './get-png-size.js'
@@ -13,16 +11,14 @@ import { modes } from '../modes/index.js'
 
 const modesList = Object.keys(modes)
 
-function die (msg) {
+function die(msg) {
   warn(msg)
   warn()
   process.exit(1)
 }
 
-function profile (value, argv) {
-  if (!value) {
-    return
-  }
+function profile(value, argv) {
+  if (!value) return
 
   const profilePath = resolve(process.cwd(), untildify(value))
 
@@ -30,17 +26,14 @@ function profile (value, argv) {
     die(`Profile param does not point to a file or folder that exists!`)
   }
 
-  if (
-    !value.endsWith('.json')
-    && !lstatSync(profilePath).isDirectory()
-  ) {
-    die(`Specified profile (${ value }) is not a .json file`)
+  if (!value.endsWith('.json') && !lstatSync(profilePath).isDirectory()) {
+    die(`Specified profile (${value}) is not a .json file`)
   }
 
   argv.profile = profilePath
 }
 
-function mode (value, argv) {
+function mode(value, argv) {
   if (!value) {
     argv.mode = modesList
     return
@@ -53,67 +46,66 @@ function mode (value, argv) {
     return
   }
 
-  if (list.some(mode => !modesList.includes(mode))) {
-    die(`Invalid mode requested: "${ value }"`)
+  if (list.some(item => !modesList.includes(item))) {
+    die(`Invalid mode requested: "${value}"`)
   }
 
   argv.mode = list
 }
 
-function include (value, argv) {
-  if (!value) {
-    return
-  }
+function include(value, argv) {
+  if (!value) return
 
   if (value.includes('all')) {
     argv.include = modesList
     return
   }
 
-  if (value.some(mode => !modesList.includes(mode))) {
-    die(`Invalid include requested: "${ value }"`)
+  if (value.some(item => !modesList.includes(item))) {
+    die(`Invalid include requested: "${value}"`)
   }
 }
 
-function quality (value, argv) {
+function quality(value, argv) {
   if (!value) {
     argv.quality = defaultParams.quality
     return
   }
 
-  const numeric = parseInt(value, 10)
+  const numeric = Number.parseInt(value, 10)
 
-  if (isNaN(numeric)) {
+  if (Number.isNaN(numeric)) {
     die(`Invalid quality level number specified`)
   }
   if (numeric < 1 || numeric > 12) {
-    die(`Invalid quality level specified (${ value }) - should be between 1 - 12`)
+    die(`Invalid quality level specified (${value}) - should be between 1 - 12`)
   }
 
   argv.quality = numeric
 }
 
-function filter (value) {
+function filter(value) {
   if (value && !Object.keys(generators).includes(value)) {
-    die(`Unknown filter value specified (${ value }); there is no such generator`)
+    die(`Unknown filter value specified (${value}); there is no such generator`)
   }
 }
 
-function padding (value, argv) {
+function padding(value, argv) {
   if (!value) {
-    argv.padding = [ 0, 0 ]
+    argv.padding = [0, 0]
     return
   }
 
-  const sizes = (Array.isArray(value) ? value : value.split(','))
-    .map(val => parseInt(val, 10))
+  const sizes = (Array.isArray(value) ? value : value.split(',')).map(val =>
+    Number.parseInt(val, 10)
+  )
 
   if (sizes.length > 2) {
     die(`Invalid padding specified`)
   }
 
   sizes.forEach(size => {
-    if (isNaN(size)) {
+    if (Number.isNaN(size)) {
       die(`Invalid padding specified (not numbers)`)
     }
     if (size < 0) {
@@ -121,38 +113,32 @@ function padding (value, argv) {
     }
   })
 
-  argv.padding = sizes.length === 1
-    ? [ sizes[ 0 ], sizes[ 0 ] ]
-    : sizes
+  argv.padding = sizes.length === 1 ? [sizes[0], sizes[0]] : sizes
 }
 
-function parseIconPath (value) {
+function parseIconPath(value) {
   const __path = untildify(value)
 
   if (isAbsolute(__path)) {
-    return existsSync(__path) === true
-      ? __path
-      : null
+    return existsSync(__path) ? __path : null
   }
 
-  let icon = resolve(process.cwd(), __path)
+  let localIcon = resolve(process.cwd(), __path)
 
-  if (existsSync(icon)) {
-    return icon
+  if (existsSync(localIcon)) {
+    return localIcon
   }
 
-  icon = resolve(appDir, __path)
+  localIcon = resolve(appDir, __path)
 
-  return existsSync(icon) ? icon : null
+  return existsSync(localIcon) ? localIcon : null
 }
 
-function icon (value, argv) {
+function icon(value, argv) {
   if (!value) {
     warn(`No source icon file specified, so using the sample one`)
     argv.icon = normalize(
-      fileURLToPath(
-        new URL('../../samples/icongenie-icon.png', import.meta.url)
-      )
+      join(import.meta.dirname, '../../samples/icongenie-icon.png')
     )
     return
   }
@@ -160,7 +146,7 @@ function icon (value, argv) {
   argv.icon = parseIconPath(value)
 
   if (!argv.icon) {
-    die(`Path to source icon file does not exists: "${ value }"`)
+    die(`Path to source icon file does not exists: "${value}"`)
   }
 
   const { width, height } = getPngSize(argv.icon)
@@ -174,15 +160,13 @@ function icon (value, argv) {
   }
 }
 
-function background (value, argv) {
-  if (!value) {
-    return
-  }
+function background(value, argv) {
+  if (!value) return
 
   argv.background = resolve(appDir, untildify(value))
 
   if (!existsSync(argv.background)) {
-    die(`Path to background source file does not exists: "${ value }"`)
+    die(`Path to background source file does not exists: "${value}"`)
   }
 
   const { width, height } = getPngSize(argv.background)
@@ -196,49 +180,51 @@ function background (value, argv) {
   }
 }
 
-function getColorParser (name, defaultValue) {
+function getColorParser(name, defaultValue) {
   return (value, argv) => {
     if (!value) {
-      argv[ name ] = argv.themeColor || defaultValue
+      argv[name] = argv.themeColor || defaultValue
       return
     }
 
     if (
-      (value.length !== 3 && value.length !== 6)
-      || /^[0-9A-Fa-f]+$/.test(value) !== true
+      (value.length !== 3 && value.length !== 6) ||
+      /^[0-9A-Fa-f]+$/.test(value) !== true
     ) {
-      die(`Invalid ${ name } color specified: "${ value }"`)
+      die(`Invalid ${name} color specified: "${value}"`)
     }
 
-    argv[ name ] = '#' + value
+    argv[name] = '#' + value
   }
 }
 
-function splashscreenIconRatio (value, argv) {
+function splashscreenIconRatio(value, argv) {
   if (!value && value !== 0) {
     argv.splashscreenIconRatio = defaultParams.splashscreenIconRatio
     return
   }
 
-  const numeric = parseFloat(value)
+  const numeric = Number.parseFloat(value)
 
-  if (isNaN(numeric)) {
+  if (Number.isNaN(numeric)) {
     die(`Invalid splashscreen icon ratio number specified`)
   }
   if (numeric < 0 || numeric > 100) {
-    die(`Invalid splashscreen icon ratio specified (${ value }) - should be between 0 - 100`)
+    die(
+      `Invalid splashscreen icon ratio specified (${value}) - should be between 0 - 100`
+    )
   }
 
   argv.splashscreenIconRatio = numeric
 }
 
-function output (value) {
+function output(value) {
   if (!value) {
     die(`The "output" param is required`)
   }
 }
 
-function assets (value, argv) {
+function assets(value, argv) {
   if (!value) {
     argv.assets = []
     return
@@ -251,8 +237,8 @@ function assets (value, argv) {
     return
   }
 
-  if (list.some(mode => !modesList.includes(mode))) {
-    die(`Invalid assets requested: "${ value }"`)
+  if (list.some(item => !modesList.includes(item))) {
+    die(`Invalid assets requested: "${value}"`)
   }
 
   argv.assets = list
@@ -270,7 +256,10 @@ const parsers = {
 
   themeColor: getColorParser('themeColor'),
   pngColor: getColorParser('pngColor', defaultParams.pngColor),
-  splashscreenColor: getColorParser('splashscreenColor', defaultParams.splashscreenColor),
+  splashscreenColor: getColorParser(
+    'splashscreenColor',
+    defaultParams.splashscreenColor
+  ),
   svgColor: getColorParser('svgColor', defaultParams.svgColor),
 
   include, // profile file param
@@ -279,13 +268,13 @@ const parsers = {
   assets // profile cmd
 }
 
-export function parseArgv (argv, list) {
+export function parseArgv(argv, list) {
   list.forEach(name => {
-    const fn = parsers[ name ]
+    const fn = parsers[name]
     if (fn === void 0) {
-      die(`Invalid command parameter specified (${ name })`)
+      die(`Invalid command parameter specified (${name})`)
     }
 
-    fn(argv[ name ], argv)
+    fn(argv[name], argv)
   })
 }

package/lib/utils/spawn-sync.js

@@ -1,20 +1,20 @@
-
 import crossSpawn from 'cross-spawn'
 
 import { log, warn } from './logger.js'
 
-export function spawnSync (cmd, params, opts, onFail) {
-  log(`[sync] Running "${ cmd } ${ params.join(' ') }"\n`)
+export function spawnSync(cmd, params, opts, onFail) {
+  log(`[sync] Running "${cmd} ${params.join(' ')}"\n`)
 
-  const runner = crossSpawn.sync(
-    cmd,
-    params,
-    { stdio: 'inherit', stdout: 'inherit', stderr: 'inherit', ...opts }
-  )
+  const runner = crossSpawn.sync(cmd, params, {
+    stdio: 'inherit',
+    stdout: 'inherit',
+    stderr: 'inherit',
+    ...opts
+  })
 
   if (runner.status || runner.error) {
     warn()
-    warn(`Command "${ cmd }" failed with exit code: ${ runner.status }`)
-    onFail && onFail()
+    warn(`Command "${cmd}" failed with exit code: ${runner.status}`)
+    onFail?.()
   }
 }

package/lib/utils/validate-profile-object.js

@@ -1,18 +1,19 @@
+// oxlint-disable unicorn/no-thenable
 
-import Joi from '@hapi/joi'
+import Joi from 'joi'
 import { red } from 'kolorist'
 
 import { generators } from '../generators/index.js'
 import { modes } from '../modes/index.js'
 
 const generatorsList = Object.keys(generators)
-const modesList = [ 'all' ].concat(Object.keys(modes))
-const platformsList = [ 'cordova-ios', 'cordova-android' ]
+const modesList = ['all', ...Object.keys(modes)]
+const platformsList = ['cordova-ios', 'cordova-android']
 
 const baseParamsSchema = {
-  include: Joi.array().min(1).items(
-    Joi.string().valid(...modesList)
-  ),
+  include: Joi.array()
+    .min(1)
+    .items(Joi.string().valid(...modesList)),
 
   icon: Joi.string().min(1),
   background: Joi.string().min(1),
@@ -21,15 +22,15 @@ const baseParamsSchema = {
   quality: Joi.number().integer().min(1).max(12),
 
   skipTrim: Joi.boolean(),
-  padding: Joi.array().items(
-    Joi.number().integer().min(0)
-  ).min(1).max(2),
+  padding: Joi.array().items(Joi.number().integer().min(0)).min(1).max(2),
 
   splashscreenIconRatio: Joi.number().integer().min(0).max(100)
 }
 
 const assetsSchema = Joi.array().items({
-  generator: Joi.string().required().valid(...generatorsList),
+  generator: Joi.string()
+    .required()
+    .valid(...generatorsList),
   name: Joi.string().required().min(1),
   folder: Joi.string().required().min(1),
 
@@ -46,12 +47,13 @@ const assetsSchema = Joi.array().items({
 
   sizes: Joi.when('generator', {
     is: Joi.valid('png', 'splashscreen'),
-    then: Joi.array().required().min(1).items(
-      Joi.number().integer().min(1),
-      Joi.array().items(
-        Joi.number().integer().min(1)
-      ).length(2)
-    )
+    then: Joi.array()
+      .required()
+      .min(1)
+      .items(
+        Joi.number().integer().min(1),
+        Joi.array().items(Joi.number().integer().min(1)).length(2)
+      )
   }),
 
   tag: Joi.string()
@@ -61,8 +63,10 @@ const assetsSchema = Joi.array().items({
  * When generating the profile file, we don't want to validate with # on the hex color.
  * When generating the icon, we're expecting a hash on the color (automatically added to user input via the CLI)
  */
-const getColorParamsSchema = (requireHash) => {
-  const colorPattern = Joi.string().pattern(new RegExp(`^${ requireHash ? '#' : '' }[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?$`))
+const getColorParamsSchema = requireHash => {
+  const colorPattern = Joi.string().pattern(
+    new RegExp(`^${requireHash ? '#' : ''}[0-9A-Fa-f]{3}([0-9A-Fa-f]{3})?$`)
+  )
   return {
     themeColor: colorPattern,
     pngColor: colorPattern,
@@ -71,14 +75,15 @@ const getColorParamsSchema = (requireHash) => {
   }
 }
 
-const getParamsSchema = (isGeneratingProfileFile) => {
-  return {
-    ...baseParamsSchema,
-    ...getColorParamsSchema(isGeneratingProfileFile === false)
-  }
-}
+const getParamsSchema = isGeneratingProfileFile => ({
+  ...baseParamsSchema,
+  ...getColorParamsSchema(!isGeneratingProfileFile)
+})
 
-export function validateProfileObject (profileObject, generatingProfileFile = false) {
+export function validateProfileObject(
+  profileObject,
+  generatingProfileFile = false
+) {
   const profileSchema = Joi.object({
     params: getParamsSchema(generatingProfileFile),
     assets: assetsSchema
@@ -86,8 +91,10 @@ export function validateProfileObject (profileObject, generatingProfileFile = fa
 
   const { error } = profileSchema.validate(profileObject)
   if (error) {
-    console.error(` ${ red('ERROR') }: Input parameters are not valid. Please correct them.`)
-    console.error(` ${ error }`)
+    console.error(
+      ` ${red('ERROR')}: Input parameters are not valid. Please correct them.`
+    )
+    console.error(` ${error}`)
     console.log()
     process.exit(1)
   }

package/package.json

@@ -1,73 +1,71 @@
 {
   "name": "@quasar/icongenie",
-  "version": "3.1.1",
+  "version": "5.0.0",
   "description": "A Quasar tool for generating all your Quasar App's icons and splashscreens",
-  "bin": {
-    "icongenie": "./bin/icongenie.js"
-  },
-  "type": "module",
-  "scripts": {
-    "lint": "eslint --ext .js ./ --fix --report-unused-disable-directives"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/quasarframework/quasar.git"
-  },
-  "engines": {
-    "node": ">= 14.19.0"
-  },
   "keywords": [
-    "vuejs",
-    "vue",
+    "bex",
+    "desktop",
+    "electron",
     "icons",
-    "quasar",
     "js",
     "phone",
-    "tablet",
-    "desktop",
-    "spa",
     "pwa",
-    "website",
-    "electron",
-    "bex"
+    "quasar",
+    "spa",
+    "tablet",
+    "vue",
+    "vuejs",
+    "website"
   ],
+  "homepage": "https://quasar.dev/icongenie/introduction",
+  "bugs": {
+    "url": "https://github.com/quasarframework/quasar/issues"
+  },
+  "license": "MIT",
   "author": "Razvan Stoenescu <razvan.stoenescu@gmail.com>",
   "contributors": [
     "Razvan Stoenescu <razvan.stoenescu@gmail.com>",
     "Daniel Thompson-Yvetot <35242872+nothingismagick@users.noreply.github.com>"
   ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/quasarframework/quasar/issues"
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/quasarframework/quasar.git"
+  },
+  "bin": {
+    "icongenie": "./bin/icongenie.js"
+  },
+  "files": [
+    "bin",
+    "lib",
+    "samples",
+    "README.md",
+    "LICENSE"
+  ],
+  "type": "module",
+  "publishConfig": {
+    "access": "public"
   },
-  "homepage": "https://quasar.dev/icongenie/introduction",
   "dependencies": {
-    "@hapi/joi": "^17.1.1",
-    "cross-spawn": "^7.0.2",
+    "@quasar/art": "^1.0.0",
+    "ci-info": "^4.4.0",
+    "cross-spawn": "^7.0.6",
     "elementtree": "^0.1.7",
-    "fast-glob": "^3.2.12",
-    "fs-extra": "^11.1.1",
-    "imagemin": "^8.0.1",
-    "imagemin-pngquant": "^9.0.2",
+    "fs-extra": "^11.2.0",
+    "imagemin": "^9.0.1",
+    "imagemin-pngquant": "^10.0.0",
     "is-png": "^3.0.1",
+    "joi": "^18.2.1",
     "kolorist": "^1.8.0",
-    "minimist": "^1.2.8",
     "png2icons": "^2.0.1",
     "potrace": "^2.1.5",
-    "read-chunk": "^4.0.3",
-    "sharp": "^0.32.1",
-    "svgo": "^3.0.2",
-    "untildify": "^4.0.0",
-    "update-notifier": "^6.0.2"
-  },
-  "devDependencies": {
-    "eslint": "^8.31.0",
-    "eslint-plugin-n": "^15.6.1"
-  },
-  "resolutions": {
-    "minimist": "^1.2.8"
+    "read-chunk": "^5.0.0",
+    "sharp": "^0.34.5",
+    "svgo": "^4.0.1",
+    "tinyglobby": "^0.2.10",
+    "untildify": "^6.0.0",
+    "update-notifier": "^7.0.0"
   },
-  "publishConfig": {
-    "access": "public"
+  "engines": {
+    "node": ">= 22.22.0"
   }
-}
+}