Skip to content

Commit

Permalink
fix: replace _out with $out
Browse files Browse the repository at this point in the history
  • Loading branch information
snickbit committed Jun 3, 2022
1 parent da71e90 commit 60cd5b0
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
18 changes: 9 additions & 9 deletions src/actions/add.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {ask, confirm} from '@snickbit/node-utilities'
import {isEmpty, plural} from '@snickbit/utilities'
import {gql} from '@urql/core'
import {_out, client, initConfig, normalizeIconName, saveConfig} from '../utilities/common'
import {$out, client, initConfig, normalizeIconName, saveConfig} from '../utilities/common'
import cli from '@snickbit/node-cli'
import generate from './generate'

Expand Down Expand Up @@ -41,7 +41,7 @@ export default async argv => cli(argv).args({
.query(iconQuery, {query: iconName.replace(/fa:/, '')})
.toPromise()
} catch (e) {
_out.error(`We couldn't find any icons matching {cyan}${iconName}{/cyan}`)
$out.error(`We couldn't find any icons matching {cyan}${iconName}{/cyan}`)
continue
}

Expand All @@ -66,32 +66,32 @@ export default async argv => cli(argv).args({

if (!config.icons.includes(iconName)) {
config.icons.push(iconName)
_out.v().success(`Added icon {cyan}${iconName}{/cyan}`)
$out.v().success(`Added icon {cyan}${iconName}{/cyan}`)
changes.icons++
}
}
} else {
_out.warn(`Icon {cyan}${iconName}{/cyan} already exists`)
$out.warn(`Icon {cyan}${iconName}{/cyan} already exists`)
}

if (!isEmpty(aliases)) {
for (let alias of aliases) {
if (config.aliases[alias] !== iconName && await shouldAddAlias(alias)) {
config.aliases[alias] = iconName
_out.v().success(`Added alias {magenta}${alias}{/magenta}`)
$out.v().success(`Added alias {magenta}${alias}{/magenta}`)
changes.aliases++
} else {
_out.warn(`Alias {magenta}${alias}{/magenta} skipped`)
$out.warn(`Alias {magenta}${alias}{/magenta} skipped`)
}
}
}
}

if (changes.icons || changes.aliases) {
saveConfig(config)
changes.icons && _out.success(`Added {cyan}${changes.icons} ${plural('icon', changes.icons)}{/cyan}`)
changes.aliases && _out.success(`Added {magenta}${changes.aliases} ${plural('alias', changes.aliases)}{/magenta}`)
changes.icons && $out.success(`Added {cyan}${changes.icons} ${plural('icon', changes.icons)}{/cyan}`)
changes.aliases && $out.success(`Added {magenta}${changes.aliases} ${plural('alias', changes.aliases)}{/magenta}`)
return generate()
}
_out.done('Nothing to update')
$out.done('Nothing to update')
})
8 changes: 4 additions & 4 deletions src/actions/generate.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {saveFile} from '@snickbit/node-utilities'
import {_out, getImportString, getStringContent, initConfig, parseIcon, saveConfig} from '../utilities/common'
import {$out, getImportString, getStringContent, initConfig, parseIcon, saveConfig} from '../utilities/common'
import mkdirp from 'mkdirp'
import path from 'path'

Expand Down Expand Up @@ -74,11 +74,11 @@ export default async function() {
}
}

_out.broken.success('FontAwesome Icons Generated!', `\t${icons.length} icons`, `\t${alias_count} aliases`)
$out.broken.success('FontAwesome Icons Generated!', `\t${icons.length} icons`, `\t${alias_count} aliases`)

if (config.isQuasar) {
_out.info('Don\'t forget to add \'fontawesome\' to your Quasar boot config!')
$out.info('Don\'t forget to add \'fontawesome\' to your Quasar boot config!')
}

_out.done()
$out.done()
}
20 changes: 10 additions & 10 deletions src/actions/remove.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {isEmpty, objectFilter, plural} from '@snickbit/utilities'
import {_out, initConfig, parseIcon, saveConfig} from '../utilities/common'
import {$out, initConfig, parseIcon, saveConfig} from '../utilities/common'
import cli from '@snickbit/node-cli'
import generate from './generate'

Expand Down Expand Up @@ -31,35 +31,35 @@ export default async argv => cli(argv)
const icons = config.icons.filter(iconPredicate)
if (!isEmpty(icons)) {
config.icons = config.icons.filter(i => !icons.includes(i))
_out.v().success(`Removed ${plural('icon', icons.length)} {cyan}${icons.join(', ')}{/cyan}`)
$out.v().success(`Removed ${plural('icon', icons.length)} {cyan}${icons.join(', ')}{/cyan}`)
changes.icons += icons.length
} else {
_out.warn(`Icon {cyan}${icon.id}{/cyan} has not been added`)
$out.warn(`Icon {cyan}${icon.id}{/cyan} has not been added`)
}

const aliases = Object.keys(objectFilter(config.aliases, iconPredicate))
if (!isEmpty(aliases)) {
config.aliases = objectFilter(config.aliases, (i, a) => !aliases.includes(a))
_out.v().success(`Removed ${plural('alias', icons.length)}{magenta} ${aliases.join(', ')}{/magenta} from icon {cyan}${icon.id}{/cyan}`)
$out.v().success(`Removed ${plural('alias', icons.length)}{magenta} ${aliases.join(', ')}{/magenta} from icon {cyan}${icon.id}{/cyan}`)
changes.aliases += aliases.length
} else {
_out.warn(`There are no aliases for icon {cyan}${icon.id}{/cyan}`)
$out.warn(`There are no aliases for icon {cyan}${icon.id}{/cyan}`)
}
} else if (config.aliases[subject]) {
const iconName = config.aliases[subject]
delete config.aliases[subject]
_out.v().success(`Removed alias {magenta}${subject}{/magenta} from icon {cyan}${iconName}{/cyan}`)
$out.v().success(`Removed alias {magenta}${subject}{/magenta} from icon {cyan}${iconName}{/cyan}`)
changes.aliases++
} else {
_out.warn(`Alias {cyan}${subject}{/cyan} has not been added.`)
$out.warn(`Alias {cyan}${subject}{/cyan} has not been added.`)
}
}

if (changes.icons || changes.aliases) {
saveConfig(config)
changes.icons && _out.success(`Removed {cyan}${changes.icons} ${plural('icon', changes.icons)}{/cyan}`)
changes.aliases && _out.success(`Removed {magenta}${changes.aliases} ${plural('alias', changes.aliases)}{/magenta}`)
changes.icons && $out.success(`Removed {cyan}${changes.icons} ${plural('icon', changes.icons)}{/cyan}`)
changes.aliases && $out.success(`Removed {magenta}${changes.aliases} ${plural('alias', changes.aliases)}{/magenta}`)
return generate()
}
_out.done('Nothing to update')
$out.done('Nothing to update')
})
8 changes: 4 additions & 4 deletions src/utilities/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface Config {

let config: Config

export const _out = new Out('fa-cli')
export const $out = new Out('fa-cli')

export const client = createClient({url: 'https://api.fontawesome.com'})

Expand All @@ -31,7 +31,7 @@ export async function initConfig() {
if (!config) {
if (!fileExists(config_path)) {
// create with inquirer
_out.block.info('fa-cli config')
$out.block.info('fa-cli config')

config = {} as Config

Expand Down Expand Up @@ -83,7 +83,7 @@ export async function initConfig() {
config.icons = default_icons.slice()
config.aliases = {...default_icon_aliases}
if (fileExists('quasar.conf.js') || fileExists('quasar.config.js')) {
_out.info('Quasar Framework detected!')
$out.info('Quasar Framework detected!')
config.isQuasar = true
}

Expand All @@ -92,7 +92,7 @@ export async function initConfig() {
try {
config = getFileJson(config_path)
} catch (e) {
_out.error(`Error parsing config file: ${e.message}`)
$out.error(`Error parsing config file: ${e.message}`)
process.exit(1)
}
}
Expand Down

0 comments on commit 60cd5b0

Please sign in to comment.