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

More layout tweaks and fixes

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-06-18 19:40:50 +02:00
parent b678efffd1
commit 2019e6c34c
11 changed files with 161 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Models/ThemeConfig/Conversion/PrepareLayer.ts
View file

@ -748,7 +748,11 @@ export class RewriteSpecial extends DesugaringStep<TagRenderingConfigJson> {
)
}
private static escapeStr(v: string): string {
private static escapeStr(v: string, context: ConversionContext): string {
if(typeof v !== "string"){
context.err("Detected a non-string value where one expected a string: "+v)
return RewriteSpecial.escapeStr(""+v, context)
}
return v
.replace(/,/g, "&COMMA")
.replace(/\{/g, "&LBRACE")
@ -930,7 +934,7 @@ export class RewriteSpecial extends DesugaringStep<TagRenderingConfigJson> {
if (foundLanguages.size === 0) {
const args = argNamesList
.map((nm) => RewriteSpecial.escapeStr(special[nm] ?? ""))
.map((nm) => RewriteSpecial.escapeStr(special[nm] ?? "", context))
.join(",")
return {
"*": `{${type}(${args})${clss}}`
@ -949,7 +953,7 @@ export class RewriteSpecial extends DesugaringStep<TagRenderingConfigJson> {
}
if (typeof v === "string") {
args.push(RewriteSpecial.escapeStr(v))
args.push(RewriteSpecial.escapeStr(v, context))
} else if (typeof v === "object") {
args.push(JSON.stringify(v))
} else {