tenniscommon 1.0.5 → 1.0.8

package/dist/cjs/common/matchplay/validation.d.ts

@@ -42,7 +42,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetWon: string;
     firstSet: string;
     secondSet: string;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -51,6 +50,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -68,7 +68,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     date?: unknown;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -77,6 +76,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -94,7 +94,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetWon: string;
     firstSet: string;
     secondSet: string;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -103,6 +102,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -120,7 +120,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     date?: unknown;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -129,6 +128,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -146,7 +146,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetWon: string;
     firstSet: string;
     secondSet: string;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -155,6 +154,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -172,7 +172,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     date?: unknown;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -181,6 +180,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -198,7 +198,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetWon: string;
     firstSet: string;
     secondSet: string;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -207,6 +206,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -224,7 +224,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     date?: unknown;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -233,6 +232,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -250,7 +250,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetWon: string;
     firstSet: string;
     secondSet: string;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -259,6 +258,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -276,7 +276,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     date?: unknown;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -285,6 +284,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -302,7 +302,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetWon: string;
     firstSet: string;
     secondSet: string;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -311,6 +310,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -328,7 +328,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     date?: unknown;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -337,6 +336,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -354,7 +354,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetWon: string;
     firstSet: string;
     secondSet: string;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -363,6 +362,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -380,7 +380,6 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     date?: unknown;
-    comment?: string | undefined;
     partnerId?: string | undefined;
     opponentIdTeo?: string | undefined;
     decidingSetFormat?: string | undefined;
@@ -389,6 +388,7 @@ export declare const singlesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>;
 export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodEffects<z.ZodObject<{
     playerId: z.ZodString;
@@ -435,13 +435,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     opponentIdTwo: string;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -461,13 +461,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSet: string;
     opponentIdTwo: string;
     date?: unknown;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -487,13 +487,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     opponentIdTwo: string;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -513,13 +513,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSet: string;
     opponentIdTwo: string;
     date?: unknown;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -539,13 +539,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     opponentIdTwo: string;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -565,13 +565,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSet: string;
     opponentIdTwo: string;
     date?: unknown;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -591,13 +591,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     opponentIdTwo: string;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -617,13 +617,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSet: string;
     opponentIdTwo: string;
     date?: unknown;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -643,13 +643,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     opponentIdTwo: string;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -669,13 +669,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSet: string;
     opponentIdTwo: string;
     date?: unknown;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -695,13 +695,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     opponentIdTwo: string;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -721,13 +721,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSet: string;
     opponentIdTwo: string;
     date?: unknown;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>, {
     date: Date;
     playerId: string;
@@ -747,13 +747,13 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     firstSet: string;
     secondSet: string;
     opponentIdTwo: string;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }, {
     playerId: string;
     tournamentId: string;
@@ -773,11 +773,11 @@ export declare const doublesMatchplayItemSchema: z.ZodEffects<z.ZodEffects<z.Zod
     secondSet: string;
     opponentIdTwo: string;
     date?: unknown;
-    comment?: string | undefined;
     decidingSetFormat?: string | undefined;
     decidingSetWon?: string | undefined;
     firstSetTieBreak?: string | undefined;
     secondSetTieBreak?: string | undefined;
     decidingSet?: string | undefined;
     decidingSetTieBreak?: string | undefined;
+    comment?: string | undefined;
 }>;

package/dist/cjs/common/player/initialData.d.ts

@@ -1,4 +1,4 @@
-import { PlayerConfig, PlayerData } from './interfaces';
+import { PlayerConfig } from './interfaces';
 import { ValueOf } from '../general';
 export declare const GLOBAL: {
     TIME: {
@@ -34,4 +34,12 @@ export declare const GLOBAL_ARRAYS: {
     AGE: GLOBAL_SET_UNION[];
 };
 export declare const createInitialPlayerConfig: (born: number) => PlayerConfig;
-export declare const createInitialPlayerData: () => Omit<PlayerData, "_id">;
+export declare const createInitialPlayerData: () => {
+    _id: string;
+    firstname: string;
+    lastname: string;
+    born: number;
+    password: string;
+    email: string;
+    config: PlayerConfig;
+};

package/dist/cjs/common/player/initialData.js

@@ -50,6 +50,7 @@ const createInitialPlayerConfig = (born) => ({
 exports.createInitialPlayerConfig = createInitialPlayerConfig;
 // Factory function for PlayerData
 const createInitialPlayerData = () => ({
+    _id: '',
     firstname: '',
     lastname: '',
     born: new Date().getFullYear() - 18,

package/dist/cjs/common/player/interfaces.d.ts

@@ -1,7 +1,6 @@
-import { ObjectId } from 'mongodb';
 import { SpendingCosts } from '../spending';
 export interface PlayerData {
-    _id?: ObjectId;
+    _id: string;
     firstname: string;
     lastname: string;
     born: number;

package/dist/cjs/common/player/validation.d.ts

@@ -27,7 +27,6 @@ export declare const playerConfigSchema: z.ZodObject<{
     globalFilterSetFormat: z.ZodString;
     globalFilterAgeGroup: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    born: number;
     theme: string;
     dataTableRows: number;
     budget: number;
@@ -39,6 +38,7 @@ export declare const playerConfigSchema: z.ZodObject<{
         error: string;
     };
     calendarDefaultDate: Date;
+    born: number;
     spendingCosts: [{
         cost: number;
         category: string;
@@ -51,11 +51,11 @@ export declare const playerConfigSchema: z.ZodObject<{
     globalFilterSetFormat: string;
     globalFilterAgeGroup: string;
 }, {
-    born: number;
     theme: string;
     dataTableRows: number;
     budget: number;
     calendarUseToday: string;
+    born: number;
     spendingCosts: [{
         cost: number;
         category: string;
@@ -103,7 +103,6 @@ export declare const playerDataSchema: z.ZodObject<{
         globalFilterSetFormat: z.ZodString;
         globalFilterAgeGroup: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        born: number;
         theme: string;
         dataTableRows: number;
         budget: number;
@@ -115,6 +114,7 @@ export declare const playerDataSchema: z.ZodObject<{
             error: string;
         };
         calendarDefaultDate: Date;
+        born: number;
         spendingCosts: [{
             cost: number;
             category: string;
@@ -127,11 +127,11 @@ export declare const playerDataSchema: z.ZodObject<{
         globalFilterSetFormat: string;
         globalFilterAgeGroup: string;
     }, {
-        born: number;
         theme: string;
         dataTableRows: number;
         budget: number;
         calendarUseToday: string;
+        born: number;
         spendingCosts: [{
             cost: number;
             category: string;
@@ -147,11 +147,10 @@ export declare const playerDataSchema: z.ZodObject<{
     }>;
 }, "strip", z.ZodTypeAny, {
     email: string;
+    born: number;
     firstname: string;
     lastname: string;
-    born: number;
     config: {
-        born: number;
         theme: string;
         dataTableRows: number;
         budget: number;
@@ -163,6 +162,7 @@ export declare const playerDataSchema: z.ZodObject<{
             error: string;
         };
         calendarDefaultDate: Date;
+        born: number;
         spendingCosts: [{
             cost: number;
             category: string;
@@ -178,15 +178,15 @@ export declare const playerDataSchema: z.ZodObject<{
     password?: string | undefined;
 }, {
     email: string;
+    born: number;
     firstname: string;
     lastname: string;
-    born: number;
     config: {
-        born: number;
         theme: string;
         dataTableRows: number;
         budget: number;
         calendarUseToday: string;
+        born: number;
         spendingCosts: [{
             cost: number;
             category: string;

package/dist/cjs/common/spending/initialStats.d.ts

@@ -1,2 +1,4 @@
-import { SpendingTotals } from './interfaces';
-export declare const createDefaultSpendingTotal: (budget?: number) => SpendingTotals;
+import { SpendingGroups, SpendingStats, SpendingType } from './interfaces';
+export declare const createDefaultSpendingStats: (budget?: number) => SpendingStats;
+export declare const createSpendingType: () => SpendingType;
+export declare const createSpendingGroups: () => SpendingGroups;

package/dist/cjs/common/spending/initialStats.js

@@ -1,29 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDefaultSpendingTotal = void 0;
+exports.createSpendingGroups = exports.createSpendingType = exports.createDefaultSpendingStats = void 0;
 const interfaces_1 = require("./interfaces");
 const general_1 = require("../general");
-const createDefaultSpendingTotal = (budget = 0) => {
+const createDefaultSpendingStats = (budget = 0) => {
     const costPerType = {};
     const costPerMonth = {};
-    const costPerMonthPerType = {};
+    // Initialize costPerType with 0 for each spending type
     interfaces_1.SPENDING_ARRAYS.TYPE.forEach(type => (costPerType[type] = 0));
+    // Initialize costPerMonth with 0 for each month
     general_1.COMMONS_ARRAYS.MONTH.forEach(month => {
         costPerMonth[month] = 0;
-        costPerMonthPerType[month] = {};
-        interfaces_1.SPENDING_ARRAYS.TYPE.forEach(type => {
-            costPerMonthPerType[month][type] = 0;
-        });
     });
+    // Initialize the new costPerTypePerMonth structure
+    const costPerTypePerMonth = Object.fromEntries(interfaces_1.SPENDING_ARRAYS.TYPE.map(type => [type, Object.fromEntries(general_1.COMMONS_ARRAYS.MONTH.map(month => [month, 0]))]));
     return {
         totalCost: 0,
+        averageSpendingPerMonth: 0,
         budget,
         budgetRemaining: budget,
-        costPerType,
+        mostExpensiveType: (0, exports.createSpendingType)(),
+        spendingGroups: (0, exports.createSpendingGroups)(),
         costPerMonth,
-        costPerMonthPerType,
-        totalCostLastMonth: 0,
-        averageSpendingPerMonth: 0
+        costPerType,
+        costPerTypePerMonth, // The new and correct structure
+    };
+};
+exports.createDefaultSpendingStats = createDefaultSpendingStats;
+const createSpendingType = () => {
+    return {
+        type: '',
+        cost: 0,
+        percentage: 0,
+        perMonth: {},
     };
 };
-exports.createDefaultSpendingTotal = createDefaultSpendingTotal;
+exports.createSpendingType = createSpendingType;
+const createSpendingGroups = () => ({
+    direct: 0,
+    training: 0,
+    directPercentage: 0,
+    trainingPercentage: 0,
+    onCourt: 0,
+    onCourtPercentage: 0,
+    tournament: 0,
+    tournamentPercentage: 0,
+    equipment: 0,
+    equipmentPercentage: 0,
+    other: 0,
+    otherPercentage: 0,
+});
+exports.createSpendingGroups = createSpendingGroups;

package/dist/cjs/common/spending/interfaces.d.ts

@@ -32,21 +32,44 @@ export interface SpendingItem {
     cost: number;
     linkedToTraining: boolean;
 }
-export interface SpendingTotals {
+export interface SpendingType {
+    type: string;
+    cost: number;
+    percentage: number;
+    perMonth: {
+        [month: string]: number;
+    };
+}
+export interface SpendingGroups {
+    direct: number;
+    training: number;
+    directPercentage: number;
+    trainingPercentage: number;
+    onCourt: number;
+    onCourtPercentage: number;
+    tournament: number;
+    tournamentPercentage: number;
+    equipment: number;
+    equipmentPercentage: number;
+    other: number;
+    otherPercentage: number;
+}
+export interface SpendingStats {
     totalCost: number;
-    totalCostLastMonth: number;
     averageSpendingPerMonth: number;
     budget: number;
     budgetRemaining: number;
+    mostExpensiveType: SpendingType;
+    spendingGroups: SpendingGroups;
     costPerType: {
         [type: string]: number;
     };
     costPerMonth: {
         [month: string]: number;
     };
-    costPerMonthPerType: {
-        [month: string]: {
-            [type: string]: number;
+    costPerTypePerMonth: {
+        [type: string]: {
+            [month: string]: number;
         };
     };
 }

package/dist/cjs/common/tournament/interfaces.d.ts

@@ -8,7 +8,7 @@ export declare const TOURNAMENT: {
         readonly BelfastAndDistrictLeague: "Belfast And District League";
     };
     readonly CATEGORY: {
-        readonly WTN: "WTN Only";
+        readonly WTN: "WTN";
         readonly T100: "T100";
         readonly T200: "T200";
         readonly T500: "T500";

package/dist/cjs/common/tournament/interfaces.js

@@ -8,7 +8,7 @@ exports.TOURNAMENT = {
         BelfastAndDistrictLeague: 'Belfast And District League',
     },
     CATEGORY: {
-        WTN: 'WTN Only',
+        WTN: 'WTN',
         T100: 'T100',
         T200: 'T200',
         T500: 'T500',