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

feat(cli): add support for different config file formats

Browse Source 
Modified the 'loadConfig' method to support '.cjs' and '.mjs' config files. Also, a 'changeExtension' function is added to helpers/path.ts to manipulate file extensions. An error will be thrown if a specified user config file is not found. The application defaults to the default config file if no user config file is provided.
This commit is contained in:
p-sw 2024-06-07 00:33:52 +09:00
parent 263bbcbaa4
commit c5bf5c69b3
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/cli/src/helpers/config.ts
View File

@ -2,15 +2,32 @@ import {CONFIG_DEFAULT_PATH, DEFAULT_CONFIG, ResolvedConfig} from '../const.js'
import {configZod} from '../const.js' import {configZod} from '../const.js'
import {join} from 'node:path' import {join} from 'node:path'
import {existsSync} from 'node:fs' import {existsSync} from 'node:fs'
import {changeExtension} from './path.js'
export async function loadConfig(config?: string): Promise<unknown> { export async function loadConfig(config?: string): Promise<unknown> {
const configPath = join(process.cwd(), config ?? CONFIG_DEFAULT_PATH) const userConfigPath = config ? join(process.cwd(), config) : null
const defaultConfigPath = join(process.cwd(), CONFIG_DEFAULT_PATH)
const cjsConfigPath = join(process.cwd(), await changeExtension(CONFIG_DEFAULT_PATH, '.cjs'))
const mjsConfigPath = join(process.cwd(), await changeExtension(CONFIG_DEFAULT_PATH, '.mjs'))
if (existsSync(configPath)) { if (userConfigPath) {
return (await import(configPath)).default if (existsSync(userConfigPath)) {
return (await import(userConfigPath)).default
} else { } else {
return DEFAULT_CONFIG throw new Error(`Error: config ${userConfigPath} not found.`)
} }
}
if (existsSync(defaultConfigPath)) {
return (await import(defaultConfigPath)).default
}
if (existsSync(cjsConfigPath)) {
return (await import(cjsConfigPath)).default
}
if (existsSync(mjsConfigPath)) {
return (await import(mjsConfigPath)).default
}
return DEFAULT_CONFIG
} }
export async function validateConfig(log: (message: string) => void, config?: unknown): Promise<ResolvedConfig> { export async function validateConfig(log: (message: string) => void, config?: unknown): Promise<ResolvedConfig> {

6
packages/cli/src/helpers/path.ts
View File

@ -1,7 +1,7 @@
import {ResolvedConfig} from '../const.js' import {ResolvedConfig} from '../const.js'
import {readdir} from 'node:fs/promises' import {readdir} from 'node:fs/promises'
import {existsSync} from 'node:fs' import {existsSync} from 'node:fs'
import {join} from 'node:path' import {basename, dirname, extname, join} from 'node:path'
export async function getComponentsInstalled(components: string[], config: ResolvedConfig) { export async function getComponentsInstalled(components: string[], config: ResolvedConfig) {
const componentPath = join(process.cwd(), config.paths.components) const componentPath = join(process.cwd(), config.paths.components)
@ -12,3 +12,7 @@ export async function getComponentsInstalled(components: string[], config: Resol
return [] return []
} }
} }
export async function changeExtension(path: string, extension: string): Promise<string> {
return join(dirname(path), basename(path, extname(path)) + extension)
}