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

refactor(cli): simplify library installation process

Browse Source 
Consolidated the process of installing the library in the "add" command. Simplified the path handling by using the dirname function. Also, the shared-file version dependent part has been removed. Library installation is now based on a singular registry url path instead of component specific versions.
This commit is contained in:
p-sw 2024-06-11 18:01:51 +09:00
parent 89776267ad
commit 99773f11cc
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,15 +2,8 @@ import {Args, Command, Flags} from '@oclif/core'
import {loadConfig, validateConfig} from '../helpers/config.js' 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, dirname} from 'node:path'
import { import {getAvailableComponentNames, getComponentRealname, getComponentURL, getRegistry} from '../helpers/registry.js'
getAvailableComponentNames,
getComponentLibVersion,
getComponentRealname,
getComponentURL,
getLibURL,
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'
@ -106,13 +99,12 @@ export default class Add extends Command {
const resolvedConfig = await validateConfig((message: string) => this.log(message), await loadConfig(flags.config)) const resolvedConfig = await validateConfig((message: string) => this.log(message), await loadConfig(flags.config))
const componentFolder = join(process.cwd(), resolvedConfig.paths.components) const componentFolder = join(process.cwd(), resolvedConfig.paths.components)
const libFolder = join(process.cwd(), resolvedConfig.paths.lib) const libFile = join(process.cwd(), resolvedConfig.paths.lib)
const sharedFileBeforeResolve = join(libFolder, 'shared@version.tsx')
if (!existsSync(componentFolder)) { if (!existsSync(componentFolder)) {
await mkdir(componentFolder, {recursive: true}) await mkdir(componentFolder, {recursive: true})
} }
if (!existsSync(libFolder)) { if (!existsSync(dirname(libFile))) {
await mkdir(libFolder, {recursive: true}) await mkdir(dirname(libFile), {recursive: true})
} }
const loadRegistryOra = ora('Fetching registry...').start() const loadRegistryOra = ora('Fetching registry...').start()
@ -186,28 +178,20 @@ export default class Add extends Command {
this.error('Component name is not provided, or not selected.') this.error('Component name is not provided, or not selected.')
} }
const resolvedName: keyof typeof registry.components = name const libFileOra = ora('Installing required library...').start()
if (!existsSync(libFile)) {
const sharedFileOra = ora('Installing required module...').start() const libFileContentResponse = await fetch(registry.base + registry.paths.lib)
const requiredVersion = await getComponentLibVersion(registry, resolvedName) if (!libFileContentResponse.ok) {
if (!requiredVersion.ok) { libFileOra.fail(
sharedFileOra.fail(`Registry error: there is no lib version ${requiredVersion.libVersion}`) `Error while fetching library content: ${libFileContentResponse.status} ${libFileContentResponse.statusText}`,
return
}
const sharedFile = sharedFileBeforeResolve.replace('version', requiredVersion.libVersion)
if (!existsSync(sharedFile)) {
const sharedFileContentResponse = await fetch(await getLibURL(registry, requiredVersion.libVersion))
if (!sharedFileContentResponse.ok) {
sharedFileOra.fail(
`Error while fetching shared module content: ${sharedFileContentResponse.status} ${sharedFileContentResponse.statusText}`,
) )
return return
} }
const sharedFileContent = await sharedFileContentResponse.text() const libFileContent = await libFileContentResponse.text()
await writeFile(sharedFile, sharedFileContent) await writeFile(libFile, libFileContent)
sharedFileOra.succeed('Shared module is successfully installed!') libFileOra.succeed('Library is successfully installed!')
} else { } else {
sharedFileOra.succeed('Shared module is already installed!') libFileOra.succeed('Library is already installed!')
} }
const componentFileOra = ora(`Installing ${name} component...`).start() const componentFileOra = ora(`Installing ${name} component...`).start()
@ -223,8 +207,8 @@ export default class Add extends Command {
return return
} }
const componentFileContent = (await componentFileContentResponse.text()).replaceAll( const componentFileContent = (await componentFileContentResponse.text()).replaceAll(
/import\s+{[^}]*}\s+from\s+"@pswui-lib\/shared@[0-9.]+"/g, /import\s+{[^}]*}\s+from\s+"@pswui-lib"/g,
(match) => match.replace(/@pswui-lib\/(shared@[0-9.]+)/, `${resolvedConfig.import.lib}/$1`), (match) => match.replace(/@pswui-lib/, resolvedConfig.import.lib),
) )
await writeFile(componentFile, componentFileContent) await writeFile(componentFile, componentFileContent)
componentFileOra.succeed('Component is successfully installed!') componentFileOra.succeed('Component is successfully installed!')