Skip to content

Upgrade jsdom to v28 and fix CSS selector scoping for spec compliance #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rweyrauch merged 3 commits into from
Mar 5, 2026
Merged

Upgrade jsdom to v28 and fix CSS selector scoping for spec compliance #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02a3ee5
Upgrade jsdom to v28 and fix CSS selector scoping for spec compliance
rweyrauch Mar 5, 2026
3b1440f
Potential fix for code scanning alert no. 5: Workflow does not contai…
rweyrauch Mar 5, 2026
ffd45a3
Remove stale webpack build files
rweyrauch Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,013 changes: 395 additions & 618 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
},
"devDependencies": {
"@types/jasmine": "^3.10.3",
"@types/jsdom": "^16.2.14",
"@types/jsdom": "^21.1.7",
"@types/jszip": "^3.4.1",
"jasmine": "^4.0.2",
"jasmine-spec-reporter": "^7.0.0",
"jsdom": "^19.0.0",
"jsdom": "^28.1.0",
"ts-node": "^10.4.0",
"typescript": "^4.5.5",
"vite": "^6.0.0"
Expand Down
4 changes: 2 additions & 2 deletions src/roster30k.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ function ParseForces(doc: XMLDocument, roster: Roster30k): void {

// Only include the allegiance rules once.
if (!DuplicateForce(f, roster)) {
const rules = root.querySelectorAll("force>rules>rule");
const rules = root.querySelectorAll("rules>rule");
for (let rule of rules) {
if (rule.hasAttribute("name")) {
let ruleName = rule.getAttributeNode("name")?.nodeValue;
Expand Down Expand Up @@ -279,7 +279,7 @@ function DuplicateForce(force: Force30k, roster: Roster30k): boolean {
}

function ParseUnits(root: Element, force: Force30k): void {
let selections = root.querySelectorAll("force>selections>selection");
let selections = root.querySelectorAll(":scope > selections > selection");
for (let selection of selections) {
let unit = CreateUnit(selection);
if (unit && unit._role != UnitRole30k.NONE) {
Expand Down
6 changes: 4 additions & 2 deletions src/roster40k.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ function ParseForces(doc: XMLDocument, roster: Roster40k, is40k: boolean): void

// Only include the allegiance rules once.
if (!DuplicateForce(f, roster)) {
const rules = root.querySelectorAll("force>rules>rule");
const rules = root.querySelectorAll("rules>rule");
for (let rule of rules) {
ExtractRuleDescription(rule, f._rules);
}
Expand All @@ -469,7 +469,9 @@ function ParseForces(doc: XMLDocument, roster: Roster40k, is40k: boolean): void
}

function ParseSelections(root: Element, force: Force, is40k: boolean): void {
let selections = root.querySelectorAll("force>selections>selection");
// Use combined selector: direct selections of this force element, plus direct selections of
// any nested force elements (for rosters that embed multiple detachments as nested forces).
let selections = root.querySelectorAll(":scope > selections > selection, force > selections > selection");

for (let selection of selections) {
// What kind of selection is this
Expand Down
4 changes: 2 additions & 2 deletions src/roster40k10th.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ function ParseForces(doc: XMLDocument, roster: Roster40k, is40k: boolean): void

// Only include the allegiance rules once.
if (!DuplicateForce(f, roster)) {
const rules = root.querySelectorAll("force>rules>rule");
const rules = root.querySelectorAll("rules>rule");
for (let rule of rules) {
ExtractRuleDescription(rule, f._rules);
}
Expand All @@ -511,7 +511,7 @@ function ParseForces(doc: XMLDocument, roster: Roster40k, is40k: boolean): void
}

function ParseSelections(root: Element, force: Force, is40k: boolean): void {
let selections = root.querySelectorAll("force>selections>selection");
let selections = root.querySelectorAll(":scope > selections > selection");

for (let selection of selections) {
// What kind of selection is this
Expand Down
4 changes: 2 additions & 2 deletions src/rosterAoS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ function ParseForces(doc: XMLDocument, roster: RosterAoS): void {
}

function ParseSelections(root: Element, force: AoSForce): void {
let selections = root.querySelectorAll("force>selections>selection");
let selections = root.querySelectorAll(":scope > selections > selection");

let unit_id = 0;
for (let selection of selections) {
Expand Down Expand Up @@ -394,7 +394,7 @@ function ParseSelections(root: Element, force: AoSForce): void {
}

function ParseRules(root: Element, force: AoSForce): void {
let rules = root.querySelectorAll("force>rules>rule");
let rules = root.querySelectorAll("rules>rule");

for (let rule of rules) {
let ruleName = rule.getAttributeNode("name")?.nodeValue;
Expand Down
4 changes: 2 additions & 2 deletions src/rosterAoS4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ function ParseForces(doc: XMLDocument, roster: RosterAoS4): void {
}

function ParseArmyConfig(root: Element, force: AoS4Force): void {
let selections = root.querySelectorAll("force>selections>selection");
let selections = root.querySelectorAll(":scope > selections > selection");

for (let selection of selections) {
let selectionName = selection.getAttributeNode("name")?.nodeValue;
Expand Down Expand Up @@ -400,7 +400,7 @@ function ParseSpellOrPrayerLore(selection: Element, abilityList: AoS4Ability[]):
}

function ParseRegimentSelections(root: Element, force: AoS4Force): void {
let selections = root.querySelectorAll("force>selections>selection");
let selections = root.querySelectorAll(":scope > selections > selection");
let unit_id = 0;
for (let selection of selections) {
let unit = ParseUnit(selection);
Expand Down
2 changes: 1 addition & 1 deletion src/rosterHH2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ export namespace HorusHeresy {

// Only include the allegiance rules once.
if (!DuplicateForce(force, roster)) {
const rules = root.querySelectorAll("force>rules>rule");
const rules = root.querySelectorAll("rules>rule");
for (let rule of rules) {
ExtractRuleDescription(rule, force._rules);
}
Expand Down
4 changes: 2 additions & 2 deletions src/rosterKT21.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ function ParseForces(doc: XMLDocument, roster: RosterKT21): void {

// Only include the allegiance rules once.
if (!DuplicateForce(f, roster)) {
var rules = root.querySelectorAll("force>rules>rule");
var rules = root.querySelectorAll("rules>rule");
for (let rule of rules) {
if (rule.hasAttribute("name")) {
let ruleName = rule.getAttributeNode("name")?.nodeValue;
Expand All @@ -267,7 +267,7 @@ function ParseForces(doc: XMLDocument, roster: RosterKT21): void {
}

function ParseSelections(root: Element, force: Force): void {
let selections = root.querySelectorAll("force>selections>selection");
let selections = root.querySelectorAll(":scope > selections > selection");

for (let selection of selections) {
// What kind of selection is this
Expand Down
2 changes: 1 addition & 1 deletion src/rosterWarcry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ function ParseAllegiance(root: Element, force: WarcryForce): void {
}

function ParseSelections(root: Element, force: WarcryForce): void {
let selections = root.querySelectorAll("force>selections>selection");
let selections = root.querySelectorAll(":scope > selections > selection");

for (let selection of selections) {
// What kind of selection is this
Expand Down