Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions packages/dashmate/src/config/Config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ export default class Config {
/**
* @param {string} name
* @param {Object} options
* @param {boolean} [skipValidation=false] - Skip schema validation (use with --force)
*/
constructor(name, options = {}) {
constructor(name, options = {}, skipValidation = false) {
this.name = name;
this.changed = false;

this.setOptions(options);
this.setOptions(options, skipValidation);
}

/**
Expand Down Expand Up @@ -122,22 +123,25 @@ export default class Config {
* Set options
*
* @param {Object} options
* @param {boolean} [skipValidation=false] - Skip schema validation (use with --force)
*
* @return {Config}
*/
setOptions(options) {
setOptions(options, skipValidation = false) {
const clonedOptions = lodashCloneDeep(options);

const isValid = Config.ajv.validate(configJsonSchema, clonedOptions);
if (!skipValidation) {
const isValid = Config.ajv.validate(configJsonSchema, clonedOptions);

if (!isValid) {
const message = Config.ajv.errorsText(undefined, { dataVar: 'config' });
if (!isValid) {
const message = Config.ajv.errorsText(undefined, { dataVar: 'config' });

throw new InvalidOptionsError(
clonedOptions,
Config.ajv.errors,
message,
);
throw new InvalidOptionsError(
clonedOptions,
Config.ajv.errors,
message,
);
}
}

this.options = clonedOptions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,12 @@ export default class ConfigFileJsonRepository {
/**
* Load configs from file
*
* @param {Object} [options={}]
* @param {boolean} [options.skipValidation=false] - Skip per-config schema validation
* @returns {ConfigFile}
*/
read() {
read(options = {}) {
const { skipValidation = false } = options;
if (!fs.existsSync(this.configFilePath)) {
throw new ConfigFileNotFoundError(this.configFilePath);
}
Expand Down Expand Up @@ -59,7 +62,7 @@ export default class ConfigFileJsonRepository {
let configs;
try {
configs = Object.entries(migratedConfigFileData.configs)
.map(([name, options]) => new Config(name, options));
.map(([name, opts]) => new Config(name, opts, skipValidation));
} catch (e) {
throw new InvalidConfigFileFormatError(this.configFilePath, e);
}
Expand Down
5 changes: 4 additions & 1 deletion packages/dashmate/src/oclif/command/BaseCommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ export default class BaseCommand extends Command {
let configFile;
try {
// Load config collection from config file
configFile = configFileRepository.read();
// Skip per-config validation when --force flag is passed (e.g., for reset command)
configFile = configFileRepository.read({
skipValidation: Boolean(this.parsedFlags.force),
});
} catch (e) {
// Create default config collection if config file is not present
// on the first start for example
Expand Down
Loading