tenniscommon 1.1.32 → 1.1.34

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

@@ -1,4 +1,8 @@
 import { SpendingCosts } from '../spending';
+export interface PlayerRegistrationRequest {
+    player: PlayerData;
+    inviteCode: string;
+}
 export interface PlayerData {
     _id: string;
     firstname: string;

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

@@ -8,7 +8,8 @@ function createInitialTrainingItem(playerId, date) {
         _id: '',
         playerId: playerId,
         date: date,
-        type: interfaces_1.TRAINING.ACTIVITY.Individual,
+        format: interfaces_1.TRAINING.FORMAT.Lesson,
+        type: interfaces_1.TRAINING.ACTIVITY.Forehand,
         time: 1,
     };
 }

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

@@ -1,23 +1,37 @@
 import { ValueOf } from '../general';
 export declare const TRAINING: {
     readonly ACTIVITY: {
+        readonly MatchPractice: "Match-Practice";
+        readonly Physical: "Physical";
+        readonly Serve: "Serve";
+        readonly Return: "Return";
+        readonly Forehand: "Forehand";
+        readonly Backhand: "Backhand";
+        readonly Slice: "Slice";
+        readonly Volley: "Volley";
+        readonly Overhead: "Overhead";
+        readonly DropShot: "Drop Shot";
+        readonly Tactical: "Tactical";
+        readonly Footwork: "Footwork";
+    };
+    readonly FORMAT: {
         readonly Squad: "Squad";
         readonly Individual: "Individual";
         readonly Lesson: "Lesson";
         readonly Hit: "Hit";
-        readonly MatchPractice: "Match-Practice";
-        readonly Physical: "Physical";
-        readonly OtherSports: "Other Sports";
     };
 };
 export type TRAINING_ACTIVITY_UNION = ValueOf<typeof TRAINING.ACTIVITY>;
+export type TRAINING_FORMAT_UNION = ValueOf<typeof TRAINING.FORMAT>;
 export declare const TRAINING_ARRAYS: {
     ACTIVITY: TRAINING_ACTIVITY_UNION[];
+    FORMAT: TRAINING_FORMAT_UNION[];
 };
 export interface TrainingItem {
     _id: string;
     playerId: string;
     date: Date;
+    format: TRAINING_FORMAT_UNION;
     type: TRAINING_ACTIVITY_UNION;
     time: number;
     spendingId?: string;

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

@@ -3,15 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TRAINING_ARRAYS = exports.TRAINING = void 0;
 exports.TRAINING = {
     ACTIVITY: {
+        MatchPractice: 'Match-Practice',
+        Physical: 'Physical',
+        Serve: 'Serve',
+        Return: 'Return',
+        Forehand: 'Forehand',
+        Backhand: 'Backhand',
+        Slice: 'Slice',
+        Volley: 'Volley',
+        Overhead: 'Overhead',
+        DropShot: 'Drop Shot',
+        Tactical: 'Tactical',
+        Footwork: 'Footwork',
+    },
+    FORMAT: {
         Squad: 'Squad',
         Individual: 'Individual',
         Lesson: 'Lesson',
         Hit: 'Hit',
-        MatchPractice: 'Match-Practice',
-        Physical: 'Physical',
-        OtherSports: 'Other Sports',
     },
 };
 exports.TRAINING_ARRAYS = {
     ACTIVITY: Object.values(exports.TRAINING.ACTIVITY),
+    FORMAT: Object.values(exports.TRAINING.FORMAT),
 };

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

@@ -2,7 +2,8 @@ import { z } from 'zod';
 export declare const trainingItemSchema: z.ZodObject<{
     playerId: z.ZodString;
     date: z.ZodEffects<z.ZodEffects<z.ZodDate, Date, Date>, Date, unknown>;
-    type: z.ZodString;
+    format: z.ZodEffects<z.ZodString, string, string>;
+    type: z.ZodEffects<z.ZodString, string, string>;
     time: z.ZodNumber;
     spendingId: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -10,11 +11,13 @@ export declare const trainingItemSchema: z.ZodObject<{
     time: number;
     date: Date;
     playerId: string;
+    format: string;
     spendingId?: string | undefined;
 }, {
     type: string;
     time: number;
     playerId: string;
+    format: string;
     date?: unknown;
     spendingId?: string | undefined;
 }>;

package/dist/cjs/common/training/validation.js

@@ -2,10 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trainingItemSchema = void 0;
 const zod_1 = require("zod");
-exports.trainingItemSchema = zod_1.z.object({
+const interfaces_1 = require("./interfaces");
+exports.trainingItemSchema = zod_1.z
+    .object({
     playerId: zod_1.z.string().min(1, 'PlayerId is required.'),
-    date: zod_1.z.preprocess((arg) => (typeof arg === 'string' || arg instanceof Date ? new Date(arg) : undefined), zod_1.z.date().refine(date => !isNaN(date.getTime()), 'Invalid date.')),
-    type: zod_1.z.string().min(1, 'Type is required.'),
+    date: zod_1.z.preprocess((arg) => (typeof arg === 'string' || arg instanceof Date ? new Date(arg) : undefined), zod_1.z.date().refine((date) => !isNaN(date.getTime()), 'Invalid date.')),
+    format: zod_1.z
+        .string()
+        .min(1, 'Format is required.')
+        .refine((val) => interfaces_1.TRAINING_ARRAYS.FORMAT.includes(val), 'Invalid training format.'),
+    type: zod_1.z
+        .string()
+        .min(1, 'Type is required.')
+        .refine((val) => interfaces_1.TRAINING_ARRAYS.ACTIVITY.includes(val), 'Invalid training type.'),
     time: zod_1.z.number().nonnegative('Time must be a non-negative number.'),
-    spendingId: zod_1.z.string().optional()
+    spendingId: zod_1.z.string().optional(),
 });

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

@@ -9,9 +9,10 @@ function createInitialTrainingWeeklyItem(playerId) {
         _id: '',
         playerId: playerId,
         day: general_1.COMMONS.WEEKDAY.Monday,
-        type: training_1.TRAINING.ACTIVITY.Individual,
+        format: training_1.TRAINING.FORMAT.Lesson,
+        type: training_1.TRAINING.ACTIVITY.Forehand,
         time: 1,
-        spendingType: spending_1.SPENDING.TYPE.CourtHire,
+        spendingType: spending_1.SPENDING.TYPE.Lesson,
         cost: 0,
     };
 }

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

@@ -1,10 +1,11 @@
-import { TRAINING_ACTIVITY_UNION } from '../training';
+import { TRAINING_ACTIVITY_UNION, TRAINING_FORMAT_UNION } from '../training';
 import { SPENDING_TYPE_UNION } from '../spending';
 import { WEEKDAY_UNION } from '../general';
 export interface TrainingWeeklyItem {
     _id: string;
     playerId: string;
     day: WEEKDAY_UNION;
+    format: TRAINING_FORMAT_UNION;
     type: TRAINING_ACTIVITY_UNION;
     time: number;
     spendingType: SPENDING_TYPE_UNION;

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

@@ -2,7 +2,8 @@ import { z } from 'zod';
 export declare const trainingWeeklyItemSchema: z.ZodObject<{
     playerId: z.ZodString;
     day: z.ZodString;
-    type: z.ZodString;
+    format: z.ZodEffects<z.ZodString, string, string>;
+    type: z.ZodEffects<z.ZodString, string, string>;
     time: z.ZodNumber;
     spendingType: z.ZodString;
     cost: z.ZodNumber;
@@ -12,6 +13,7 @@ export declare const trainingWeeklyItemSchema: z.ZodObject<{
     day: string;
     playerId: string;
     cost: number;
+    format: string;
     spendingType: string;
 }, {
     type: string;
@@ -19,5 +21,6 @@ export declare const trainingWeeklyItemSchema: z.ZodObject<{
     day: string;
     playerId: string;
     cost: number;
+    format: string;
     spendingType: string;
 }>;

package/dist/cjs/common/trainingWeekly/validation.js

@@ -2,10 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.trainingWeeklyItemSchema = void 0;
 const zod_1 = require("zod");
+const training_1 = require("../training");
 exports.trainingWeeklyItemSchema = zod_1.z.object({
     playerId: zod_1.z.string().min(1, 'PlayerId is required.'),
     day: zod_1.z.string().min(1, 'Day is required.'),
-    type: zod_1.z.string().min(1, 'Type is required.'),
+    format: zod_1.z
+        .string()
+        .min(1, 'Format is required.')
+        .refine((val) => training_1.TRAINING_ARRAYS.FORMAT.includes(val), 'Invalid training format.'),
+    type: zod_1.z
+        .string()
+        .min(1, 'Type is required.')
+        .refine((val) => training_1.TRAINING_ARRAYS.ACTIVITY.includes(val), 'Invalid training type.'),
     time: zod_1.z.number().nonnegative('Time must be a non-negative number.'),
     spendingType: zod_1.z.string().min(1, 'Spending Type is required.'),
     cost: zod_1.z.number().nonnegative('Cost must be a non-negative number.')

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

@@ -1,4 +1,8 @@
 import { SpendingCosts } from '../spending';
+export interface PlayerRegistrationRequest {
+    player: PlayerData;
+    inviteCode: string;
+}
 export interface PlayerData {
     _id: string;
     firstname: string;

package/dist/esm/common/training/initialData.js

@@ -5,7 +5,8 @@ export function createInitialTrainingItem(playerId, date) {
         _id: '',
         playerId: playerId,
         date: date,
-        type: TRAINING.ACTIVITY.Individual,
+        format: TRAINING.FORMAT.Lesson,
+        type: TRAINING.ACTIVITY.Forehand,
         time: 1,
     };
 }

package/dist/esm/common/training/interfaces.d.ts

@@ -1,23 +1,37 @@
 import { ValueOf } from '../general';
 export declare const TRAINING: {
     readonly ACTIVITY: {
+        readonly MatchPractice: "Match-Practice";
+        readonly Physical: "Physical";
+        readonly Serve: "Serve";
+        readonly Return: "Return";
+        readonly Forehand: "Forehand";
+        readonly Backhand: "Backhand";
+        readonly Slice: "Slice";
+        readonly Volley: "Volley";
+        readonly Overhead: "Overhead";
+        readonly DropShot: "Drop Shot";
+        readonly Tactical: "Tactical";
+        readonly Footwork: "Footwork";
+    };
+    readonly FORMAT: {
         readonly Squad: "Squad";
         readonly Individual: "Individual";
         readonly Lesson: "Lesson";
         readonly Hit: "Hit";
-        readonly MatchPractice: "Match-Practice";
-        readonly Physical: "Physical";
-        readonly OtherSports: "Other Sports";
     };
 };
 export type TRAINING_ACTIVITY_UNION = ValueOf<typeof TRAINING.ACTIVITY>;
+export type TRAINING_FORMAT_UNION = ValueOf<typeof TRAINING.FORMAT>;
 export declare const TRAINING_ARRAYS: {
     ACTIVITY: TRAINING_ACTIVITY_UNION[];
+    FORMAT: TRAINING_FORMAT_UNION[];
 };
 export interface TrainingItem {
     _id: string;
     playerId: string;
     date: Date;
+    format: TRAINING_FORMAT_UNION;
     type: TRAINING_ACTIVITY_UNION;
     time: number;
     spendingId?: string;

package/dist/esm/common/training/interfaces.js

@@ -1,14 +1,26 @@
 export const TRAINING = {
     ACTIVITY: {
+        MatchPractice: 'Match-Practice',
+        Physical: 'Physical',
+        Serve: 'Serve',
+        Return: 'Return',
+        Forehand: 'Forehand',
+        Backhand: 'Backhand',
+        Slice: 'Slice',
+        Volley: 'Volley',
+        Overhead: 'Overhead',
+        DropShot: 'Drop Shot',
+        Tactical: 'Tactical',
+        Footwork: 'Footwork',
+    },
+    FORMAT: {
         Squad: 'Squad',
         Individual: 'Individual',
         Lesson: 'Lesson',
         Hit: 'Hit',
-        MatchPractice: 'Match-Practice',
-        Physical: 'Physical',
-        OtherSports: 'Other Sports',
     },
 };
 export const TRAINING_ARRAYS = {
     ACTIVITY: Object.values(TRAINING.ACTIVITY),
+    FORMAT: Object.values(TRAINING.FORMAT),
 };

package/dist/esm/common/training/validation.d.ts

@@ -2,7 +2,8 @@ import { z } from 'zod';
 export declare const trainingItemSchema: z.ZodObject<{
     playerId: z.ZodString;
     date: z.ZodEffects<z.ZodEffects<z.ZodDate, Date, Date>, Date, unknown>;
-    type: z.ZodString;
+    format: z.ZodEffects<z.ZodString, string, string>;
+    type: z.ZodEffects<z.ZodString, string, string>;
     time: z.ZodNumber;
     spendingId: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -10,11 +11,13 @@ export declare const trainingItemSchema: z.ZodObject<{
     time: number;
     date: Date;
     playerId: string;
+    format: string;
     spendingId?: string | undefined;
 }, {
     type: string;
     time: number;
     playerId: string;
+    format: string;
     date?: unknown;
     spendingId?: string | undefined;
 }>;

package/dist/esm/common/training/validation.js

@@ -1,8 +1,17 @@
 import { z } from 'zod';
-export const trainingItemSchema = z.object({
+import { TRAINING_ARRAYS } from './interfaces';
+export const trainingItemSchema = z
+    .object({
     playerId: z.string().min(1, 'PlayerId is required.'),
-    date: z.preprocess((arg) => (typeof arg === 'string' || arg instanceof Date ? new Date(arg) : undefined), z.date().refine(date => !isNaN(date.getTime()), 'Invalid date.')),
-    type: z.string().min(1, 'Type is required.'),
+    date: z.preprocess((arg) => (typeof arg === 'string' || arg instanceof Date ? new Date(arg) : undefined), z.date().refine((date) => !isNaN(date.getTime()), 'Invalid date.')),
+    format: z
+        .string()
+        .min(1, 'Format is required.')
+        .refine((val) => TRAINING_ARRAYS.FORMAT.includes(val), 'Invalid training format.'),
+    type: z
+        .string()
+        .min(1, 'Type is required.')
+        .refine((val) => TRAINING_ARRAYS.ACTIVITY.includes(val), 'Invalid training type.'),
     time: z.number().nonnegative('Time must be a non-negative number.'),
-    spendingId: z.string().optional()
+    spendingId: z.string().optional(),
 });

package/dist/esm/common/trainingWeekly/initialData.js

@@ -6,9 +6,10 @@ export function createInitialTrainingWeeklyItem(playerId) {
         _id: '',
         playerId: playerId,
         day: COMMONS.WEEKDAY.Monday,
-        type: TRAINING.ACTIVITY.Individual,
+        format: TRAINING.FORMAT.Lesson,
+        type: TRAINING.ACTIVITY.Forehand,
         time: 1,
-        spendingType: SPENDING.TYPE.CourtHire,
+        spendingType: SPENDING.TYPE.Lesson,
         cost: 0,
     };
 }

package/dist/esm/common/trainingWeekly/interfaces.d.ts

@@ -1,10 +1,11 @@
-import { TRAINING_ACTIVITY_UNION } from '../training';
+import { TRAINING_ACTIVITY_UNION, TRAINING_FORMAT_UNION } from '../training';
 import { SPENDING_TYPE_UNION } from '../spending';
 import { WEEKDAY_UNION } from '../general';
 export interface TrainingWeeklyItem {
     _id: string;
     playerId: string;
     day: WEEKDAY_UNION;
+    format: TRAINING_FORMAT_UNION;
     type: TRAINING_ACTIVITY_UNION;
     time: number;
     spendingType: SPENDING_TYPE_UNION;

package/dist/esm/common/trainingWeekly/validation.d.ts

@@ -2,7 +2,8 @@ import { z } from 'zod';
 export declare const trainingWeeklyItemSchema: z.ZodObject<{
     playerId: z.ZodString;
     day: z.ZodString;
-    type: z.ZodString;
+    format: z.ZodEffects<z.ZodString, string, string>;
+    type: z.ZodEffects<z.ZodString, string, string>;
     time: z.ZodNumber;
     spendingType: z.ZodString;
     cost: z.ZodNumber;
@@ -12,6 +13,7 @@ export declare const trainingWeeklyItemSchema: z.ZodObject<{
     day: string;
     playerId: string;
     cost: number;
+    format: string;
     spendingType: string;
 }, {
     type: string;
@@ -19,5 +21,6 @@ export declare const trainingWeeklyItemSchema: z.ZodObject<{
     day: string;
     playerId: string;
     cost: number;
+    format: string;
     spendingType: string;
 }>;

package/dist/esm/common/trainingWeekly/validation.js

@@ -1,8 +1,16 @@
 import { z } from 'zod';
+import { TRAINING_ARRAYS } from '../training';
 export const trainingWeeklyItemSchema = z.object({
     playerId: z.string().min(1, 'PlayerId is required.'),
     day: z.string().min(1, 'Day is required.'),
-    type: z.string().min(1, 'Type is required.'),
+    format: z
+        .string()
+        .min(1, 'Format is required.')
+        .refine((val) => TRAINING_ARRAYS.FORMAT.includes(val), 'Invalid training format.'),
+    type: z
+        .string()
+        .min(1, 'Type is required.')
+        .refine((val) => TRAINING_ARRAYS.ACTIVITY.includes(val), 'Invalid training type.'),
     time: z.number().nonnegative('Time must be a non-negative number.'),
     spendingType: z.string().min(1, 'Spending Type is required.'),
     cost: z.number().nonnegative('Cost must be a non-negative number.')

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

@@ -1,4 +1,8 @@
 import { SpendingCosts } from '../spending';
+export interface PlayerRegistrationRequest {
+    player: PlayerData;
+    inviteCode: string;
+}
 export interface PlayerData {
     _id: string;
     firstname: string;

package/dist/types/common/training/interfaces.d.ts

@@ -1,23 +1,37 @@
 import { ValueOf } from '../general';
 export declare const TRAINING: {
     readonly ACTIVITY: {
+        readonly MatchPractice: "Match-Practice";
+        readonly Physical: "Physical";
+        readonly Serve: "Serve";
+        readonly Return: "Return";
+        readonly Forehand: "Forehand";
+        readonly Backhand: "Backhand";
+        readonly Slice: "Slice";
+        readonly Volley: "Volley";
+        readonly Overhead: "Overhead";
+        readonly DropShot: "Drop Shot";
+        readonly Tactical: "Tactical";
+        readonly Footwork: "Footwork";
+    };
+    readonly FORMAT: {
         readonly Squad: "Squad";
         readonly Individual: "Individual";
         readonly Lesson: "Lesson";
         readonly Hit: "Hit";
-        readonly MatchPractice: "Match-Practice";
-        readonly Physical: "Physical";
-        readonly OtherSports: "Other Sports";
     };
 };
 export type TRAINING_ACTIVITY_UNION = ValueOf<typeof TRAINING.ACTIVITY>;
+export type TRAINING_FORMAT_UNION = ValueOf<typeof TRAINING.FORMAT>;
 export declare const TRAINING_ARRAYS: {
     ACTIVITY: TRAINING_ACTIVITY_UNION[];
+    FORMAT: TRAINING_FORMAT_UNION[];
 };
 export interface TrainingItem {
     _id: string;
     playerId: string;
     date: Date;
+    format: TRAINING_FORMAT_UNION;
     type: TRAINING_ACTIVITY_UNION;
     time: number;
     spendingId?: string;

package/dist/types/common/training/validation.d.ts

@@ -2,7 +2,8 @@ import { z } from 'zod';
 export declare const trainingItemSchema: z.ZodObject<{
     playerId: z.ZodString;
     date: z.ZodEffects<z.ZodEffects<z.ZodDate, Date, Date>, Date, unknown>;
-    type: z.ZodString;
+    format: z.ZodEffects<z.ZodString, string, string>;
+    type: z.ZodEffects<z.ZodString, string, string>;
     time: z.ZodNumber;
     spendingId: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
@@ -10,11 +11,13 @@ export declare const trainingItemSchema: z.ZodObject<{
     time: number;
     date: Date;
     playerId: string;
+    format: string;
     spendingId?: string | undefined;
 }, {
     type: string;
     time: number;
     playerId: string;
+    format: string;
     date?: unknown;
     spendingId?: string | undefined;
 }>;

package/dist/types/common/trainingWeekly/interfaces.d.ts

@@ -1,10 +1,11 @@
-import { TRAINING_ACTIVITY_UNION } from '../training';
+import { TRAINING_ACTIVITY_UNION, TRAINING_FORMAT_UNION } from '../training';
 import { SPENDING_TYPE_UNION } from '../spending';
 import { WEEKDAY_UNION } from '../general';
 export interface TrainingWeeklyItem {
     _id: string;
     playerId: string;
     day: WEEKDAY_UNION;
+    format: TRAINING_FORMAT_UNION;
     type: TRAINING_ACTIVITY_UNION;
     time: number;
     spendingType: SPENDING_TYPE_UNION;

package/dist/types/common/trainingWeekly/validation.d.ts

@@ -2,7 +2,8 @@ import { z } from 'zod';
 export declare const trainingWeeklyItemSchema: z.ZodObject<{
     playerId: z.ZodString;
     day: z.ZodString;
-    type: z.ZodString;
+    format: z.ZodEffects<z.ZodString, string, string>;
+    type: z.ZodEffects<z.ZodString, string, string>;
     time: z.ZodNumber;
     spendingType: z.ZodString;
     cost: z.ZodNumber;
@@ -12,6 +13,7 @@ export declare const trainingWeeklyItemSchema: z.ZodObject<{
     day: string;
     playerId: string;
     cost: number;
+    format: string;
     spendingType: string;
 }, {
     type: string;
@@ -19,5 +21,6 @@ export declare const trainingWeeklyItemSchema: z.ZodObject<{
     day: string;
     playerId: string;
     cost: number;
+    format: string;
     spendingType: string;
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tenniscommon",
-  "version": "1.1.32",
+  "version": "1.1.34",
   "description": "Types for Tennis application",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",