@@ -2,7 +2,6 @@ import "#core/temporal";
22import childProcess from "node:child_process" ;
33import fs from "node:fs" ;
44import path from "node:path" ;
5- import Ajv from "#core/ajv" ;
65import ansi from "#core/ansi" ;
76import GitHubApi from "#core/api/github" ;
87import { readConfig , readConfigSync , writeConfigSync } from "#core/config" ;
@@ -15,17 +14,15 @@ import GlobPatterns from "#core/glob/patterns";
1514import Locale from "#core/locale" ;
1615import SemanticVersion from "#core/semantic-version" ;
1716import Table from "#core/text/table" ;
18- import { confirm , mergeObjects , objectIsEmpty , repeatAction } from "#core/utils" ;
17+ import { confirm , objectIsEmpty , repeatAction } from "#core/utils" ;
1918import yaml from "#core/yaml" ;
2019import Git from "#lib/git" ;
2120import lintFile from "#lib/lint/file" ;
2221import Dependencies from "#lib/package/dependencies" ;
2322import Docs from "#lib/package/docs" ;
2423import Localization from "#lib/package/localization" ;
2524import Wiki from "#lib/package/wiki" ;
26-
27- const validateCliConfig = new Ajv ( ) . compileFile ( import . meta. resolve ( "#resources/schemas/cli.config.schema.yaml" ) ) ,
28- defaultCliConfig = await readConfig ( "#resources/cli.config.yaml" , { "resolve" : import . meta. url } ) ;
25+ import { getCliConfig } from "#lib/utils" ;
2926
3027export default class Package {
3128 #root;
@@ -153,15 +150,9 @@ export default class Package {
153150
154151 get cliConfig ( ) {
155152 if ( this . #cliConfig === undefined ) {
156- this . #cliConfig = null ;
157-
158- if ( fs . existsSync ( this . root + "/cli.config.yaml" ) ) {
159- const cliConfig = mergeObjects ( { } , defaultCliConfig , readConfigSync ( this . root + "/cli.config.yaml" ) ) ;
160-
161- if ( ! validateCliConfig ( cliConfig ) ) throw `CLI config is not valid:\n${ validateCliConfig . errors } ` ;
162-
163- this . #cliConfig = cliConfig ;
164- }
153+ this . #cliConfig = getCliConfig ( this . root + "/cli.config.yaml" , {
154+ "validate" : true ,
155+ } ) ;
165156 }
166157
167158 return this . #cliConfig;
0 commit comments