@gamepark/rules-api 6.7.0 → 6.8.0

package/dist/Competitive.d.ts

@@ -1,12 +1,13 @@
 import { Rules } from './Rules';
-import { MaterialGame, MaterialRules } from './material';
-export interface Competitive<Game, Move = string, PlayerId = number> extends Rules<Game, Move, PlayerId> {
-    rankPlayers(playerA: PlayerId, playerB: PlayerId): number;
+export declare type Competitive<Game = any, Move = any, PlayerId = any> = CompetitiveScore<Game, Move, PlayerId> | CompetitiveRank<Game, Move, PlayerId>;
+export interface CompetitiveScore<Game = any, Move = any, PlayerId = any> extends Rules<Game, Move, PlayerId> {
+    getScore(playerId: PlayerId): number;
+    getTieBreaker?(tieBreaker: number, playerId: PlayerId): number | undefined;
 }
-export interface CompetitiveScore<Game, Move = string, PlayerId = number> extends Competitive<Game, Move, PlayerId> {
-    getScore(playerId: PlayerId, tieBreaker?: number): number | undefined;
+export interface CompetitiveRank<Game = any, Move = any, PlayerId = any> extends Rules<Game, Move, PlayerId> {
+    rankPlayers(playerA: PlayerId, playerB: PlayerId): number;
 }
 export declare function isCompetitive<Game, Move, PlayerId>(rules: Rules<any, any, PlayerId>): rules is Competitive<Game, Move, PlayerId>;
 export declare function isCompetitiveScore<Game, Move, PlayerId>(rules: Rules<any, any, PlayerId>): rules is CompetitiveScore<Game, Move, PlayerId>;
-export declare const rankByScore: <PlayerId = number>(playerA: PlayerId, playerB: PlayerId, getScore: (playerId: PlayerId, tieBreaker?: number) => number | undefined) => number;
-export declare const getWinners: <PlayerId extends number = number>(rules: MaterialRules<PlayerId, number, number> & CompetitiveScore<MaterialGame<PlayerId, number, number>, any, PlayerId>) => PlayerId[];
+export declare function isCompetitiveRank<Game, Move, PlayerId>(rules: Rules<any, any, PlayerId>): rules is CompetitiveRank<Game, Move, PlayerId>;
+export declare const rankPlayers: <PlayerId = number>(rules: Rules<any, any, PlayerId>, playerA: PlayerId, playerB: PlayerId) => number;

package/dist/Competitive.js

@@ -1,50 +1,43 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWinners = exports.rankByScore = exports.isCompetitiveScore = exports.isCompetitive = void 0;
+exports.rankPlayers = exports.isCompetitiveRank = exports.isCompetitiveScore = exports.isCompetitive = void 0;
 function isCompetitive(rules) {
-    return rules.rankPlayers !== undefined;
+    return isCompetitiveScore(rules) || isCompetitiveRank(rules);
 }
 exports.isCompetitive = isCompetitive;
 function isCompetitiveScore(rules) {
-    return isCompetitive(rules) && rules.rankPlayers !== undefined;
+    return typeof rules.getScore === 'function';
 }
 exports.isCompetitiveScore = isCompetitiveScore;
-var rankByScore = function (playerA, playerB, getScore) {
-    var result = undefined;
-    var tieBreaker = 0;
-    while (result === undefined) {
-        var scoreA = getScore(playerA, tieBreaker);
-        var scoreB = getScore(playerB, tieBreaker);
-        if (scoreA === undefined || scoreB === undefined) {
-            result = 0;
-        }
-        else if (scoreA !== scoreB) {
-            result = scoreB - scoreA;
+function isCompetitiveRank(rules) {
+    return typeof rules.rankPlayers === 'function';
+}
+exports.isCompetitiveRank = isCompetitiveRank;
+var rankPlayers = function (rules, playerA, playerB) {
+    if (isCompetitiveRank(rules)) {
+        return rules.rankPlayers(playerA, playerB);
+    }
+    if (isCompetitiveScore(rules)) {
+        var scoreA = rules.getScore(playerA);
+        var scoreB = rules.getScore(playerB);
+        if (scoreA !== scoreB) {
+            return scoreB - scoreA;
         }
-        else {
-            tieBreaker++;
+        if (rules.getTieBreaker) {
+            for (var tieBreaker = 1; tieBreaker <= 10; tieBreaker++) {
+                var tieBreakerA = rules.getTieBreaker(tieBreaker, playerA);
+                var tieBreakerB = rules.getTieBreaker(tieBreaker, playerB);
+                if (tieBreakerA === undefined || tieBreakerB === undefined) {
+                    return 0;
+                }
+                if (tieBreakerA !== tieBreakerB) {
+                    return tieBreakerB - tieBreakerA;
+                }
+            }
+            console.error('getTieBreaker must return "undefined" after the last tie breaker is still a tie!');
         }
     }
-    return result;
-};
-exports.rankByScore = rankByScore;
-var getWinners = function (rules) {
-    var playersLeft = rules.players;
-    var tieBreaker = 0;
-    var _loop_1 = function () {
-        var scores = playersLeft.map(function (player) { return rules.getScore(player, tieBreaker); });
-        if (scores.some(function (score) { return score === undefined; }))
-            return { value: playersLeft };
-        var maxScore = Math.max.apply(Math, scores);
-        playersLeft = playersLeft.filter(function (_, index) { return scores[index] === maxScore; });
-        tieBreaker++;
-    };
-    while (playersLeft.length > 1) {
-        var state_1 = _loop_1();
-        if (typeof state_1 === "object")
-            return state_1.value;
-    }
-    return playersLeft;
+    return 0;
 };
-exports.getWinners = getWinners;
+exports.rankPlayers = rankPlayers;
 //# sourceMappingURL=Competitive.js.map

package/dist/Competitive.js.map

@@ -1 +1 @@
-{"version":3,"file":"Competitive.js","sourceRoot":"","sources":["../src/Competitive.ts"],"names":[],"mappings":";;;AAWA,SAAgB,aAAa,CAAuB,KAAgC;IAClF,OAAQ,KAA2C,CAAC,WAAW,KAAK,SAAS,CAAA;AAC/E,CAAC;AAFD,sCAEC;AAED,SAAgB,kBAAkB,CAAuB,KAAgC;IACvF,OAAO,aAAa,CAAC,KAAK,CAAC,IAAK,KAAgD,CAAC,WAAW,KAAK,SAAS,CAAA;AAC5G,CAAC;AAFD,gDAEC;AAEM,IAAM,WAAW,GAAG,UACzB,OAAiB,EAAE,OAAiB,EAAE,QAAyE;IAE/G,IAAI,MAAM,GAAuB,SAAS,CAAA;IAC1C,IAAI,UAAU,GAAG,CAAC,CAAA;IAClB,OAAO,MAAM,KAAK,SAAS,EAAE;QAC3B,IAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;QAC5C,IAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;QAC5C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,EAAE;YAChD,MAAM,GAAG,CAAC,CAAA;SACX;aAAM,IAAI,MAAM,KAAK,MAAM,EAAE;YAC5B,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;SACzB;aAAM;YACL,UAAU,EAAE,CAAA;SACb;KACF;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAjBY,QAAA,WAAW,eAiBvB;AAEM,IAAM,UAAU,GAAG,UACxB,KAAwF;IAExF,IAAI,WAAW,GAAG,KAAK,CAAC,OAAO,CAAA;IAC/B,IAAI,UAAU,GAAG,CAAC,CAAA;;QAEhB,IAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,UAAA,MAAM,IAAI,OAAA,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,EAAlC,CAAkC,CAAC,CAAA;QAC5E,IAAI,MAAM,CAAC,IAAI,CAAC,UAAA,KAAK,IAAI,OAAA,KAAK,KAAK,SAAS,EAAnB,CAAmB,CAAC;4BAAS,WAAW,GAAA;QACjE,IAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,OAAR,IAAI,EAAQ,MAAkB,CAAC,CAAA;QAChD,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,UAAC,CAAC,EAAE,KAAK,IAAK,OAAA,MAAM,CAAC,KAAK,CAAC,KAAK,QAAQ,EAA1B,CAA0B,CAAC,CAAA;QAC1E,UAAU,EAAE,CAAA;;IALd,OAAO,WAAW,CAAC,MAAM,GAAG,CAAC;;;;KAM5B;IACD,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AAbY,QAAA,UAAU,cAatB"}
+{"version":3,"file":"Competitive.js","sourceRoot":"","sources":["../src/Competitive.ts"],"names":[],"mappings":";;;AAcA,SAAgB,aAAa,CAAuB,KAAgC;IAClF,OAAO,kBAAkB,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,CAAA;AAC9D,CAAC;AAFD,sCAEC;AAED,SAAgB,kBAAkB,CAAuB,KAAgC;IACvF,OAAO,OAAQ,KAAgD,CAAC,QAAQ,KAAK,UAAU,CAAA;AACzF,CAAC;AAFD,gDAEC;AAED,SAAgB,iBAAiB,CAAuB,KAAgC;IACtF,OAAO,OAAQ,KAA+C,CAAC,WAAW,KAAK,UAAU,CAAA;AAC3F,CAAC;AAFD,8CAEC;AAEM,IAAM,WAAW,GAAG,UAAoB,KAAgC,EAAE,OAAiB,EAAE,OAAiB;IACnH,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE;QAC5B,OAAO,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;KAC3C;IACD,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE;QAC7B,IAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACtC,IAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QACtC,IAAI,MAAM,KAAK,MAAM,EAAE;YACrB,OAAO,MAAM,GAAG,MAAM,CAAA;SACvB;QACD,IAAI,KAAK,CAAC,aAAa,EAAE;YACvB,KAAK,IAAI,UAAU,GAAG,CAAC,EAAE,UAAU,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE;gBACvD,IAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;gBAC5D,IAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;gBAC5D,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE;oBAC1D,OAAO,CAAC,CAAA;iBACT;gBACD,IAAI,WAAW,KAAK,WAAW,EAAE;oBAC/B,OAAO,WAAW,GAAG,WAAW,CAAA;iBACjC;aACF;YACD,OAAO,CAAC,KAAK,CAAC,kFAAkF,CAAC,CAAA;SAClG;KACF;IACD,OAAO,CAAC,CAAA;AACV,CAAC,CAAA;AAzBY,QAAA,WAAW,eAyBvB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gamepark/rules-api",
-  "version": "6.7.0",
+  "version": "6.8.0",
   "description": "API to implement the rules of a board game",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -29,5 +29,5 @@
     "@types/lodash": "^4.14.195",
     "i18next": ">=21.3.0"
   },
-  "gitHead": "038bbd531491e786c2633f551159ce992d111742"
+  "gitHead": "c362418fd6230ead89ca8696f780ec254f52d424"
 }