powergrid-viewer 2.0.9 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "powergrid-viewer",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/boardgamers/powergrid.git",
@@ -18,7 +18,7 @@
     "vue": "^2.6.11",
     "vue-class-component": "^7.2.3",
     "vue-property-decorator": "^8.4.2",
-    "powergrid-engine": "2.0.4"
+    "powergrid-engine": "2.0.5"
   },
   "devDependencies": {
     "@types/assert": "^1.4.7",

package/src/components/Game.vue

@@ -766,6 +766,7 @@ import { LogMove } from 'powergrid-engine/src/log';
 import { Phase, playerTimeUsed, PowerPlant, PowerPlantType, ResourceType } from 'powergrid-engine/src/gamestate';
 import { City } from 'powergrid-engine/src/maps';
 import { formatDuration } from '../util/time';
+import { playerOrderForDisplay } from '../util/player-order';
 
 // Portrait layout: the rows the scene is broken into, top to bottom. Slots on
 // the same row sit side by side and share one scale. Names map to the `slotX`
@@ -2355,19 +2356,7 @@ export default class Game extends Vue {
     }
 
     get adjustedPlayerOrder() {
-        if (!this.G) {
-            return [];
-        }
-
-        if (!this.preferences.adjustPlayerOrder) {
-            return this.G.players.map((_p, i) => i); // 0 1 2 3 ...
-        }
-
-        if (this.G.phase == Phase.Auction) {
-            return this.G.playerOrder;
-        }
-
-        return this.G.playerOrder.reverse();
+        return playerOrderForDisplay(this.G, this.preferences.adjustPlayerOrder);
     }
 
     getResourceResupply() {

package/src/util/player-order.ts

@@ -0,0 +1,44 @@
+// `Phase` comes from the package root (the built `dist`), never from
+// `powergrid-engine/src/gamestate`: webpack 4 parses the engine SOURCE for the
+// unit-test bundle and dies on its `??`. Game.vue can import the source because the
+// app build does not; a file with a spec beside it cannot.
+import type { GameState } from 'powergrid-engine';
+import { Phase } from 'powergrid-engine';
+
+/**
+ * The order the player boards are stacked in (`Game.vue`'s `adjustedPlayerOrder`).
+ *
+ * Two different orders sit on this board and they are easy to confuse -- the issue
+ * that produced this file (#141) was exactly that confusion:
+ *
+ *  - TABLE order: where a player sits. Fixed for the whole game. This is what the
+ *    boards show when the preference is off, and it is why bidding "out of turn
+ *    order" is usually not a bug at all.
+ *  - TURN order (`G.playerOrder`): recomputed every round from cities and largest
+ *    plant. The auction runs down it; resources and building run back UP it.
+ *
+ * Kept out of the component so it can be tested against a real engine state, the
+ * same way `util/resource-rows.ts` is -- and because the component version could not
+ * be tested at all, which is how it stayed wrong.
+ *
+ * Written without optional chaining: webpack 4 parses the unit-test bundle and
+ * rejects `?.` (same note as `util/turn-buffer.ts`).
+ */
+export function playerOrderForDisplay(G: GameState | null | undefined, adjustPlayerOrder: boolean): number[] {
+    if (!G) {
+        return [];
+    }
+
+    if (!adjustPlayerOrder) {
+        return G.players.map((_p, i) => i); // 0 1 2 3 ...
+    }
+
+    // Copy before reversing. `Array.reverse` works in place, so reading the order off
+    // the state used to rewrite it -- see `player-order.spec.ts`. The engine already
+    // spreads before it reverses, in both places it walks the order backwards.
+    if (G.phase == Phase.Auction) {
+        return [...G.playerOrder];
+    }
+
+    return [...G.playerOrder].reverse();
+}