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

feat(cli): add realname resolution for components

Browse Source 
The update enhances the CLI functionality by introducing the realname resolution for components. This is done in the 'list.ts' file, through a new helper function 'getComponentRealName' that is called whenever list of installed components is required. This ensures the correct identifiers are always considered, regardless of them being aliases or actual names.
This commit is contained in:
p-sw 2024-06-07 00:48:14 +09:00
parent 593559f8b4
commit 5f50d1d8f6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import {Command, Flags} from '@oclif/core' import {Command, Flags} from '@oclif/core'
import {getAvailableComponentNames, getRegistry, getComponentURL} from '../helpers/registry.js' import {getAvailableComponentNames, getRegistry, getComponentURL, getComponentRealname} from '../helpers/registry.js'
import ora from 'ora' import ora from 'ora'
import treeify from 'treeify' import treeify from 'treeify'
import {CONFIG_DEFAULT_PATH} from '../const.js' import {CONFIG_DEFAULT_PATH} from '../const.js'
@ -36,12 +36,15 @@ export default class List extends Command {
const names = await getAvailableComponentNames(registry) const names = await getAvailableComponentNames(registry)
getInstalledSpinner.start() getInstalledSpinner.start()
const installedNames = await getComponentsInstalled(names, loadedConfig) const installedNames = await getComponentsInstalled(
await Promise.all(names.map(async (name) => await getComponentRealname(registry, name))),
loadedConfig,
)
getInstalledSpinner.succeed(`Got ${installedNames.length} installed components.`) getInstalledSpinner.succeed(`Got ${installedNames.length} installed components.`)
let final: Record<string, {URL?: string; installed: 'yes' | 'no'}> = {} let final: Record<string, {URL?: string; installed: 'yes' | 'no'}> = {}
for (const name of names) { for (const name of names) {
const installed = installedNames.includes(name) ? 'yes' : 'no' const installed = installedNames.includes(await getComponentRealname(registry, name)) ? 'yes' : 'no'
if (flags.url) { if (flags.url) {
const url = await getComponentURL(registry, name) const url = await getComponentURL(registry, name)
final = {...final, [name]: {URL: url, installed}} final = {...final, [name]: {URL: url, installed}}

7
packages/cli/src/helpers/registry.ts
View File

@ -23,3 +23,10 @@ export async function getAvailableComponentNames(registry: Registry): Promise<st
export async function getComponentURL(registry: Registry, componentName: string): Promise<string> { export async function getComponentURL(registry: Registry, componentName: string): Promise<string> {
return registry.base.replace('{componentName}', registry.components[componentName]) return registry.base.replace('{componentName}', registry.components[componentName])
} }
export async function getComponentRealname(
registry: Registry,
componentName: keyof Registry['components'],
): Promise<string> {
return registry.components[componentName].split('/').pop() ?? ''
}