midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix indexes in script

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-11-13 12:15:27 +01:00
parent 3334bfb8ca
commit b80a41245c
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Models/ThemeConfig/Conversion/Conversion.ts
View file

@ -110,7 +110,7 @@ export class Each<X, Y> extends Conversion<X[], Y[]> {
values[i]?.["id"] !== undefined ? values[i]?.["id"] : "" values[i]?.["id"] !== undefined ? values[i]?.["id"] : ""
) )
} }
const context_ = c.enter(i - 1) const context_ = c.enter(i)
const r = step.convert(values[i], context_) const r = step.convert(values[i], context_)
result.push(r) result.push(r)
} }

11
src/Models/ThemeConfig/Conversion/ConversionContext.ts
View file

@ -25,7 +25,14 @@ export class ConversionContext {
if (this.path.some((p) => typeof p === "object" || p === "[object Object]")) { if (this.path.some((p) => typeof p === "object" || p === "[object Object]")) {
throw "ConversionMessage: got an object as path entry:" + JSON.stringify(path) throw "ConversionMessage: got an object as path entry:" + JSON.stringify(path)
} }
if (this.path.some((p) => typeof p === "number" && p < 0)) {
if (!ConversionContext.reported) {
ConversionContext.reported = true
console.trace("ConversionContext: got a path containing a negative number")
} }
}
}
private static reported = false
public static construct(path: (string | number)[], operation: string[]) { public static construct(path: (string | number)[], operation: string[]) {
return new ConversionContext([], [...path], [...operation]) return new ConversionContext([], [...path], [...operation])
@ -71,6 +78,10 @@ export class ConversionContext {
public enter(key: string | number | (string | number)[]) { public enter(key: string | number | (string | number)[]) {
if (!Array.isArray(key)) { if (!Array.isArray(key)) {
if (typeof key === "number" && key < 0) {
console.trace("Invalid key")
throw "Invalid key: <0"
}
return new ConversionContext(this.messages, [...this.path, key], this.operation) return new ConversionContext(this.messages, [...this.path, key], this.operation)
} }
return new ConversionContext(this.messages, [...this.path, ...key], this.operation) return new ConversionContext(this.messages, [...this.path, ...key], this.operation)