p-sw/pswui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cli): replace old things to new utilities

Browse Source
This commit is contained in:
p-sw 2024-06-15 03:48:26 +09:00
parent ea9b70bcc6
commit 024ae50738
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/cli/src/commands/list.ts
View File

@ -3,8 +3,8 @@ import ora from 'ora'
import treeify from 'treeify' import treeify from 'treeify'
import {loadConfig, validateConfig} from '../helpers/config.js' import {loadConfig, validateConfig} from '../helpers/config.js'
import {getComponentsInstalled} from '../helpers/path.js' import {checkComponentInstalled} from '../helpers/path.js'
import {getComponentRealname, getComponentURL, getRegistry} from '../helpers/registry.js' import {getComponentURL, getDirComponentURL, getRegistry} from '../helpers/registry.js'
export default class List extends Command { export default class List extends Command {
static override description = 'Prints all available components in registry and components installed in this project.' static override description = 'Prints all available components in registry and components installed in this project.'
@ -21,7 +21,6 @@ export default class List extends Command {
const {flags} = await this.parse(List) const {flags} = await this.parse(List)
const registrySpinner = ora('Fetching registry...') const registrySpinner = ora('Fetching registry...')
const getInstalledSpinner = ora('Getting installed components...')
const loadedConfig = await validateConfig((message: string) => this.log(message), await loadConfig(flags.config)) const loadedConfig = await validateConfig((message: string) => this.log(message), await loadConfig(flags.config))
@ -41,26 +40,17 @@ export default class List extends Command {
registrySpinner.succeed(`Fetched ${names.length} components.`) registrySpinner.succeed(`Fetched ${names.length} components.`)
getInstalledSpinner.start()
const installedNames = await getComponentsInstalled(
await Promise.all(names.map(async (name) => getComponentRealname(registry, name))),
loadedConfig,
)
getInstalledSpinner.succeed(`Got ${installedNames.length} installed components.`)
let final: Record<string, {URL?: Record<string, string>; installed: 'no' | 'yes'}> = {} let final: Record<string, {URL?: Record<string, string>; installed: 'no' | 'yes'}> = {}
for await (const name of names) { for await (const name of names) {
const componentObject = registry.components[name] const componentObject = registry.components[name]
const installed = installedNames.includes(await getComponentRealname(registry, name)) ? 'yes' : 'no' const installed = (await checkComponentInstalled(componentObject, loadedConfig)) ? 'yes' : 'no'
if (flags.url) { if (flags.url) {
let url: Record<string, string> = {} let url: Record<string, string> = {}
if (componentObject.type === 'file') { if (componentObject.type === 'file') {
url[name] = await getComponentURL(registry, name) url[name] = await getComponentURL(registry, componentObject)
} else if (componentObject.type === 'dir') { } else if (componentObject.type === 'dir') {
for await (const file of componentObject.files) { url = Object.fromEntries(await getDirComponentURL(registry, componentObject))
url[file] = await getComponentURL(registry, name, file)
}
} }
final = {...final, [name]: {URL: url, installed}} final = {...final, [name]: {URL: url, installed}}
} else { } else {