Forgot to commit these a couple commits ago
This commit is contained in:
parent
e0bef49a84
commit
a602164c13
2 changed files with 28 additions and 12 deletions
|
@ -7,7 +7,7 @@ import { PathReporter } from "io-ts/lib/PathReporter";
|
||||||
import { deepKeyIntersect, isSnowflake, isUnicodeEmoji, resolveMember, resolveUser, UnknownUser } from "../utils";
|
import { deepKeyIntersect, isSnowflake, isUnicodeEmoji, resolveMember, resolveUser, UnknownUser } from "../utils";
|
||||||
import { Member, User } from "eris";
|
import { Member, User } from "eris";
|
||||||
import { performance } from "perf_hooks";
|
import { performance } from "perf_hooks";
|
||||||
import { decodeAndValidateStrict, StrictValidationErrors } from "../validatorUtils";
|
import { decodeAndValidateStrict, StrictValidationError } from "../validatorUtils";
|
||||||
import { mergeConfig } from "knub/dist/configUtils";
|
import { mergeConfig } from "knub/dist/configUtils";
|
||||||
|
|
||||||
const SLOW_RESOLVE_THRESHOLD = 1500;
|
const SLOW_RESOLVE_THRESHOLD = 1500;
|
||||||
|
@ -51,8 +51,8 @@ export class GlobalZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extend
|
||||||
: (options.overrides || []).concat(defaultOptions.overrides || []);
|
: (options.overrides || []).concat(defaultOptions.overrides || []);
|
||||||
|
|
||||||
const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig;
|
const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig;
|
||||||
if (decodedConfig instanceof StrictValidationErrors) {
|
if (decodedConfig instanceof StrictValidationError) {
|
||||||
throw new Error(decodedConfig.getErrors().join("\n"));
|
throw decodedConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
const decodedOverrides = [];
|
const decodedOverrides = [];
|
||||||
|
@ -61,8 +61,8 @@ export class GlobalZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extend
|
||||||
const decodedOverrideConfig = this.configSchema
|
const decodedOverrideConfig = this.configSchema
|
||||||
? decodeAndValidateStrict(this.configSchema, overrideConfigMergedWithBaseConfig)
|
? decodeAndValidateStrict(this.configSchema, overrideConfigMergedWithBaseConfig)
|
||||||
: overrideConfigMergedWithBaseConfig;
|
: overrideConfigMergedWithBaseConfig;
|
||||||
if (decodedOverrideConfig instanceof StrictValidationErrors) {
|
if (decodedOverrideConfig instanceof StrictValidationError) {
|
||||||
throw new Error(decodedConfig.getErrors().join("\n"));
|
throw decodedOverrideConfig;
|
||||||
}
|
}
|
||||||
decodedOverrides.push({ ...override, config: deepKeyIntersect(decodedOverrideConfig, override.config) });
|
decodedOverrides.push({ ...override, config: deepKeyIntersect(decodedOverrideConfig, override.config) });
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,15 @@ export class GlobalZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extend
|
||||||
public static validateOptions(options: any): string[] | null {
|
public static validateOptions(options: any): string[] | null {
|
||||||
// Validate config values
|
// Validate config values
|
||||||
if (this.configSchema) {
|
if (this.configSchema) {
|
||||||
this.mergeAndDecodeStaticOptions(options);
|
try {
|
||||||
|
this.mergeAndDecodeStaticOptions(options);
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof StrictValidationError) {
|
||||||
|
return e.getErrors();
|
||||||
|
}
|
||||||
|
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// No errors, return null
|
// No errors, return null
|
||||||
|
|
|
@ -15,7 +15,7 @@ import {
|
||||||
} from "../utils";
|
} from "../utils";
|
||||||
import { Member, User } from "eris";
|
import { Member, User } from "eris";
|
||||||
import { performance } from "perf_hooks";
|
import { performance } from "perf_hooks";
|
||||||
import { decodeAndValidateStrict, StrictValidationErrors } from "../validatorUtils";
|
import { decodeAndValidateStrict, StrictValidationError } from "../validatorUtils";
|
||||||
import { mergeConfig } from "knub/dist/configUtils";
|
import { mergeConfig } from "knub/dist/configUtils";
|
||||||
|
|
||||||
const SLOW_RESOLVE_THRESHOLD = 1500;
|
const SLOW_RESOLVE_THRESHOLD = 1500;
|
||||||
|
@ -73,8 +73,8 @@ export class ZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extends Plug
|
||||||
: (options.overrides || []).concat(defaultOptions.overrides || []);
|
: (options.overrides || []).concat(defaultOptions.overrides || []);
|
||||||
|
|
||||||
const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig;
|
const decodedConfig = this.configSchema ? decodeAndValidateStrict(this.configSchema, mergedConfig) : mergedConfig;
|
||||||
if (decodedConfig instanceof StrictValidationErrors) {
|
if (decodedConfig instanceof StrictValidationError) {
|
||||||
throw new Error(decodedConfig.getErrors().join("\n"));
|
throw decodedConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
const decodedOverrides = [];
|
const decodedOverrides = [];
|
||||||
|
@ -83,8 +83,8 @@ export class ZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extends Plug
|
||||||
const decodedOverrideConfig = this.configSchema
|
const decodedOverrideConfig = this.configSchema
|
||||||
? decodeAndValidateStrict(this.configSchema, overrideConfigMergedWithBaseConfig)
|
? decodeAndValidateStrict(this.configSchema, overrideConfigMergedWithBaseConfig)
|
||||||
: overrideConfigMergedWithBaseConfig;
|
: overrideConfigMergedWithBaseConfig;
|
||||||
if (decodedOverrideConfig instanceof StrictValidationErrors) {
|
if (decodedOverrideConfig instanceof StrictValidationError) {
|
||||||
throw new Error(decodedConfig.getErrors().join("\n"));
|
throw decodedOverrideConfig;
|
||||||
}
|
}
|
||||||
decodedOverrides.push({ ...override, config: deepKeyIntersect(decodedOverrideConfig, override.config || {}) });
|
decodedOverrides.push({ ...override, config: deepKeyIntersect(decodedOverrideConfig, override.config || {}) });
|
||||||
}
|
}
|
||||||
|
@ -114,7 +114,15 @@ export class ZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extends Plug
|
||||||
public static validateOptions(options: any): string[] | null {
|
public static validateOptions(options: any): string[] | null {
|
||||||
// Validate config values
|
// Validate config values
|
||||||
if (this.configSchema) {
|
if (this.configSchema) {
|
||||||
this.mergeAndDecodeStaticOptions(options);
|
try {
|
||||||
|
this.mergeAndDecodeStaticOptions(options);
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof StrictValidationError) {
|
||||||
|
return e.getErrors();
|
||||||
|
}
|
||||||
|
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// No errors, return null
|
// No errors, return null
|
||||||
|
|
Loading…
Add table
Reference in a new issue