ilja_space/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Fix tests

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-05-08 14:06:28 +02:00
parent 2bd3806f9a
commit c2a7f2adcd
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Models/ThemeConfig/Conversion/Validation.ts
View file

@ -562,14 +562,16 @@ export class DetectNonErasedKeysInMappings extends DesugaringStep<QuestionableTa
} }
export class DetectMappingsShadowedByCondition extends DesugaringStep<TagRenderingConfigJson> { export class DetectMappingsShadowedByCondition extends DesugaringStep<TagRenderingConfigJson> {
private readonly _forceError: boolean
constructor() { constructor(forceError: boolean = false) {
super("Checks that, if the tagrendering has a condition, that a mapping is not contradictory to it, i.e. that there are no dead mappings", [], "DetectMappingsShadowedByCondition") super("Checks that, if the tagrendering has a condition, that a mapping is not contradictory to it, i.e. that there are no dead mappings", [], "DetectMappingsShadowedByCondition")
this._forceError = forceError
} }
/** /**
* *
* const validator = new DetectMappingsShadowedByCondition() * const validator = new DetectMappingsShadowedByCondition(true)
* const ctx = ConversionContext.construct([],["test"]) * const ctx = ConversionContext.construct([],["test"])
* validator.convert({ * validator.convert({
* condition: "count>0", * condition: "count>0",
@ -602,7 +604,13 @@ export class DetectMappingsShadowedByCondition extends DesugaringStep<TagRenderi
const tagIf = TagUtils.Tag(mapping.if, context.path.join(".")) const tagIf = TagUtils.Tag(mapping.if, context.path.join("."))
const optimized = new And([tagIf, condition]).optimize() const optimized = new And([tagIf, condition]).optimize()
if(optimized === false){ if(optimized === false){
context.enters("mappings",i).warn("Detected a conflicting mapping and condition. The mapping requires tags " + tagIf.asHumanString()+", yet this can never happen because the set condition requires "+condition.asHumanString()) const msg = ("Detected a conflicting mapping and condition. The mapping requires tags " + tagIf.asHumanString() + ", yet this can never happen because the set condition requires " + condition.asHumanString())
const ctx = context.enters("mappings", i)
if (this._forceError) {
ctx.err(msg)
} else {
ctx.warn(msg)
}
} }
} }