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

feat(cli): make getRegistry take custom branch

Browse Source
This commit is contained in:
p-sw 2024-06-15 01:45:00 +09:00
parent c1d5c5d06b
commit 7d2453b4cf
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,7 +85,7 @@ export default class Add extends Command {
static override examples = ['<%= config.bin %> <%= command.id %>'] static override examples = ['<%= config.bin %> <%= command.id %>']
static override flags = { static override flags = {
registry: Flags.string({char: 'r', description: 'override registry url'}), branch: Flags.string({char: 'r', description: 'use other branch instead of main'}),
force: Flags.boolean({char: 'f', description: 'override the existing file'}), force: Flags.boolean({char: 'f', description: 'override the existing file'}),
config: Flags.string({char: 'p', description: 'path to config'}), config: Flags.string({char: 'p', description: 'path to config'}),
shared: Flags.string({char: 's', description: 'place for installation of shared.ts'}), shared: Flags.string({char: 's', description: 'place for installation of shared.ts'}),
@ -110,9 +110,9 @@ export default class Add extends Command {
const loadRegistryOra = ora('Fetching registry...').start() const loadRegistryOra = ora('Fetching registry...').start()
if (flags.registry) { if (flags.registry) {
this.log(`Using ${flags.registry} for registry.`) this.log(`Using ${flags.branch} for branch.`)
} }
const unsafeRegistry = await getRegistry(flags.registry) const unsafeRegistry = await getRegistry(flags.branch)
if (!unsafeRegistry.ok) { if (!unsafeRegistry.ok) {
loadRegistryOra.fail(unsafeRegistry.message) loadRegistryOra.fail(unsafeRegistry.message)
return return

8
packages/cli/src/commands/search.tsx
View File

@ -10,7 +10,7 @@ export default class Search extends Command {
} }
static override flags = { static override flags = {
registry: Flags.string({char: 'r', description: 'override registry url'}) branch: Flags.string({char: 'r', description: 'use other branch instead of main'}),
} }
static override description = 'Search components.' static override description = 'Search components.'
@ -20,10 +20,10 @@ export default class Search extends Command {
public async run(): Promise<void> { public async run(): Promise<void> {
const {args, flags} = await this.parse(Search) const {args, flags} = await this.parse(Search)
if (flags.registry) { if (flags.branch) {
this.log(`Using ${flags.registry} for registry.`) this.log(`Using ${flags.branch} for registry.`)
} }
const registryResult = await getRegistry(flags.registry) const registryResult = await getRegistry(flags.branch)
if (!registryResult.ok) { if (!registryResult.ok) {
this.error(registryResult.message) this.error(registryResult.message)
} }

2
packages/cli/src/const.ts
View File

@ -1,6 +1,6 @@
import {z} from 'zod' import {z} from 'zod'
export const REGISTRY_URL = 'https://raw.githubusercontent.com/pswui/ui/main/registry.json' export const REGISTRY_URL = (branch: string) => `https://raw.githubusercontent.com/pswui/ui/${branch}/registry.json`
export const CONFIG_DEFAULT_PATH = 'pswui.config.js' export const CONFIG_DEFAULT_PATH = 'pswui.config.js'
type RegistryComponent = type RegistryComponent =

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

@ -3,14 +3,17 @@ import fetch from 'node-fetch'
import {REGISTRY_URL, Registry} from '../const.js' import {REGISTRY_URL, Registry} from '../const.js'
export async function getRegistry( export async function getRegistry(
REGISTRY_OVERRIDE_URL?: string, branch?: string,
): Promise<{message: string; ok: false} | {ok: true; registry: Registry}> { ): Promise<{message: string; ok: false} | {ok: true; registry: Registry}> {
const registryResponse = await fetch(REGISTRY_OVERRIDE_URL ?? REGISTRY_URL) const registryResponse = await fetch(REGISTRY_URL(branch ?? 'main'))
if (registryResponse.ok) { if (registryResponse.ok) {
const registryJson = (await registryResponse.json()) as Registry
registryJson.base = registryJson.base.replace('{branch}', branch ?? 'main')
return { return {
ok: true, ok: true,
registry: (await registryResponse.json()) as Registry, registry: registryJson,
} }
} }