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

fix(cli): use checkComponentInstalled and getDirComponentRequiredFiles

Browse Source
This commit is contained in:
p-sw 2024-06-15 03:29:18 +09:00
parent 6f637e51ba
commit 217410a507
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/cli/src/commands/add.tsx
View File

@ -3,12 +3,12 @@ import {loadConfig, validateConfig} from '../helpers/config.js'
import {existsSync} from 'node:fs' import {existsSync} from 'node:fs'
import {mkdir, writeFile} from 'node:fs/promises' import {mkdir, writeFile} from 'node:fs/promises'
import {join} from 'node:path' import {join} from 'node:path'
import {getAvailableComponentNames, getComponentRealname, getComponentURL, getRegistry} from '../helpers/registry.js' import {getAvailableComponentNames, getComponentURL, getRegistry} from '../helpers/registry.js'
import ora from 'ora' import ora from 'ora'
import React, {ComponentPropsWithoutRef} from 'react' import React, {ComponentPropsWithoutRef} from 'react'
import {render, Box} from 'ink' import {render, Box} from 'ink'
import {SearchBox} from '../components/SearchBox.js' import {SearchBox} from '../components/SearchBox.js'
import {getComponentsInstalled, getDirComponentInstalledFiles} from '../helpers/path.js' import {getDirComponentRequiredFiles, checkComponentInstalled} from '../helpers/path.js'
import {Choice} from '../components/Choice.js' import {Choice} from '../components/Choice.js'
import {colorize} from '@oclif/core/ux' import {colorize} from '@oclif/core/ux'
import {safeFetch} from '../helpers/safeFetcher.js' import {safeFetch} from '../helpers/safeFetcher.js'
@ -121,15 +121,15 @@ export default class Add extends Command {
const registry = unsafeRegistry.registry const registry = unsafeRegistry.registry
const componentNames = await getAvailableComponentNames(registry) const componentNames = await getAvailableComponentNames(registry)
loadRegistryOra.succeed(`Successfully fetched registry! (${componentNames.length} components)`) loadRegistryOra.succeed(`Successfully fetched registry! (${componentNames.length} components)`)
const componentRealNames = await Promise.all( const searchBoxComponent: {displayName: string; key: string; installed: boolean}[] = []
componentNames.map(async (name) => await getComponentRealname(registry, name)), for await (const name of componentNames) {
) const installed = await checkComponentInstalled(registry.components[name], resolvedConfig)
const installed = await getComponentsInstalled(componentRealNames, resolvedConfig) searchBoxComponent.push({
const searchBoxComponent = componentNames.map((name, index) => ({ displayName: installed ? `${name} (installed)` : name,
displayName: installed.includes(componentRealNames[index]) ? `${name} (installed)` : name, key: name,
key: name, installed,
installed: installed.includes(componentRealNames[index]), })
})) }
let name: string | undefined = args.name?.toLowerCase?.() let name: string | undefined = args.name?.toLowerCase?.()
let requireForce: boolean = let requireForce: boolean =
@ -228,8 +228,7 @@ export default class Add extends Command {
if (!existsSync(componentDir)) { if (!existsSync(componentDir)) {
await mkdir(componentDir, {recursive: true}) await mkdir(componentDir, {recursive: true})
} }
const installed = await getDirComponentInstalledFiles(componentObject, resolvedConfig) const requiredFiles = await getDirComponentRequiredFiles(componentObject, resolvedConfig)
const requiredFiles = componentObject.files.filter((filename) => !installed.includes(filename))
if (requiredFiles.length === 0 && !force) { if (requiredFiles.length === 0 && !force) {
componentFileOra.succeed(`Component is already installed! (${componentDir})`) componentFileOra.succeed(`Component is already installed! (${componentDir})`)
} else { } else {