Maintain strict tagging of GameVersion

This commit is contained in:
Cooldude2606 committed 2026-07-02 00:08:09 +01:00
1 parent 8029ad3b2d
commit 2e27c4f499
8 files changed
+37 -45

No files matched your search

+8 -6
View File
@@ -8,8 +8,8 @@ import { findRoot } from "../zip_ops";
import { ModRecord } from "./ModPack";
import {
MajorMinorVersion, normaliseMajorMinorVersion, integerMajorMinorVersion,
GameVersion, GameVersionSchema, normaliseGameVersion, integerGameVersion,
MajorMinorVersion, MajorMinorVersionSchema, normaliseMajorMinorVersion, integerMajorMinorVersion,
GameVersion, GameVersionSchema, isGameVersion, normaliseGameVersion, integerGameVersion,
ModVersionEquality,
} from "./version";
@@ -143,6 +143,10 @@ export default class ModInfo {
return integerGameVersion(this.version);
}
get normalisedVersion() {
return normaliseGameVersion(this.version);
}
/**
* Display name of the mod.
* Sourced from info.json.
@@ -283,9 +287,7 @@ export default class ModInfo {
// info.json fields
if (json.name) { modInfo.name = json.name; }
if (json.version) {
// Validate that the raw version can be read, but keep it verbatim so
// it still matches the mod's file name on disk and the portal.
if (normaliseGameVersion(json.version) === undefined) {
if (!isGameVersion(json.version)) {
throw new Error(`Invalid mod version "${json.version}"`);
}
modInfo.version = json.version;
@@ -330,7 +332,7 @@ export default class ModInfo {
if (this.contact) { json.contact = this.contact; }
if (this.homepage) { json.homepage = this.homepage; }
if (this.description) { json.description = this.description; }
if (this.factorioVersion !== "0.12") { json.factorio_version = this.factorioVersion; }
if (this.factorioVersion !== "0.12") { json.factorio_version = this.factorioVersion as GameVersion; }
if (this.dependencies.length !== 1 || this.dependencies[0].name !== "base") {
json.dependencies = this.dependencySpecifications;
}