@racedayready/workouts 0.1.8 → 0.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/workouts/base-workout-types.d.ts +2 -0
- package/dist/workouts/base-workout-types.d.ts.map +1 -1
- package/dist/workouts/base-workout-types.js +12 -2
- package/dist/workouts/base-workout-types.js.map +1 -1
- package/dist/workouts/bike-workout-types.js +3 -3
- package/dist/workouts/bike-workout-types.js.map +1 -1
- package/dist/workouts/bike-workout-types.test.js +18 -0
- package/dist/workouts/bike-workout-types.test.js.map +1 -1
- package/dist/workouts/run-workout-types.js +3 -3
- package/dist/workouts/run-workout-types.js.map +1 -1
- package/dist/workouts/run-workout-types.test.js +25 -0
- package/dist/workouts/run-workout-types.test.js.map +1 -1
- package/dist/workouts/swim-workout-types.js +3 -3
- package/dist/workouts/swim-workout-types.js.map +1 -1
- package/dist/workouts/swim-workout-types.test.js +19 -0
- package/dist/workouts/swim-workout-types.test.js.map +1 -1
- package/dist/workouts/workout-utils.d.ts +2 -2
- package/dist/workouts/workout-utils.d.ts.map +1 -1
- package/dist/workouts/workout-utils.js +3 -3
- package/dist/workouts/workout-utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
/** Zone: supports up to 2 decimal places (e.g. 2, 3.5, 4.25) */
|
|
3
|
+
export declare function zone(min: number, max: number): z.ZodNumber;
|
|
2
4
|
export declare const WorkoutIndividualItemBaseSchema: z.ZodObject<{
|
|
3
5
|
type: z.ZodLiteral<"individual">;
|
|
4
6
|
id: z.ZodDefault<z.ZodString>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-workout-types.d.ts","sourceRoot":"","sources":["../../src/workouts/base-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,+BAA+B;;;;;;;iBAQ1C,CAAC"}
|
|
1
|
+
{"version":3,"file":"base-workout-types.d.ts","sourceRoot":"","sources":["../../src/workouts/base-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,gEAAgE;AAChE,wBAAgB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,eAQ5C;AAED,eAAO,MAAM,+BAA+B;;;;;;;iBAQ1C,CAAC"}
|
|
@@ -1,12 +1,22 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { generateWorkoutItemId } from './workout-utils';
|
|
3
|
+
/** Zone: supports up to 2 decimal places (e.g. 2, 3.5, 4.25) */
|
|
4
|
+
export function zone(min, max) {
|
|
5
|
+
return z
|
|
6
|
+
.number()
|
|
7
|
+
.min(min)
|
|
8
|
+
.max(max)
|
|
9
|
+
.refine((v) => Number.isFinite(v) && Math.round(v * 100) === v * 100, {
|
|
10
|
+
message: 'Zone must have at most 2 decimal places',
|
|
11
|
+
});
|
|
12
|
+
}
|
|
3
13
|
export const WorkoutIndividualItemBaseSchema = z.object({
|
|
4
14
|
type: z.literal('individual'),
|
|
5
15
|
id: z.string().default(generateWorkoutItemId),
|
|
6
16
|
name: z.string(),
|
|
7
17
|
target_duration_seconds: z.number().min(0).optional(),
|
|
8
18
|
// Discipline-specific ranges are enforced in discipline-specific schemas
|
|
9
|
-
zone:
|
|
10
|
-
toZone:
|
|
19
|
+
zone: zone(1, Infinity),
|
|
20
|
+
toZone: zone(1, Infinity).optional(),
|
|
11
21
|
});
|
|
12
22
|
//# sourceMappingURL=base-workout-types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-workout-types.js","sourceRoot":"","sources":["../../src/workouts/base-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC;IACtD,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;IAC7B,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC;IAC7C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,uBAAuB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrD,yEAAyE;IACzE,IAAI,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"base-workout-types.js","sourceRoot":"","sources":["../../src/workouts/base-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAExD,gEAAgE;AAChE,MAAM,UAAU,IAAI,CAAC,GAAW,EAAE,GAAW;IAC3C,OAAO,CAAC;SACL,MAAM,EAAE;SACR,GAAG,CAAC,GAAG,CAAC;SACR,GAAG,CAAC,GAAG,CAAC;SACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,EAAE;QACpE,OAAO,EAAE,yCAAyC;KACnD,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC;IACtD,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;IAC7B,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC;IAC7C,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;IAChB,uBAAuB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACrD,yEAAyE;IACzE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC;IACvB,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE;CACrC,CAAC,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { WorkoutIndividualItemBaseSchema } from './base-workout-types';
|
|
2
|
+
import { WorkoutIndividualItemBaseSchema, zone } from './base-workout-types';
|
|
3
3
|
export const BikeWorkoutIndividualItemSchema = WorkoutIndividualItemBaseSchema.extend({
|
|
4
4
|
discipline: z.literal('bike'),
|
|
5
|
-
zone:
|
|
6
|
-
toZone:
|
|
5
|
+
zone: zone(1, 7),
|
|
6
|
+
toZone: zone(1, 7).optional(),
|
|
7
7
|
// Bike-specific
|
|
8
8
|
target_power_watts: z.number().min(0).optional(),
|
|
9
9
|
target_cadence_rpm: z.number().min(0).optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bike-workout-types.js","sourceRoot":"","sources":["../../src/workouts/bike-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"bike-workout-types.js","sourceRoot":"","sources":["../../src/workouts/bike-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,+BAA+B,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,CAAC,MAAM,+BAA+B,GAAG,+BAA+B,CAAC,MAAM,CAAC;IACpF,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IAChB,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7B,gBAAgB;IAChB,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChD,kBAAkB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CACjD,CAAC,CAAC"}
|
|
@@ -17,5 +17,23 @@ describe('BikeWorkoutIndividualItemSchema', () => {
|
|
|
17
17
|
zone: 8,
|
|
18
18
|
}).success).toBe(false);
|
|
19
19
|
});
|
|
20
|
+
it('accepts decimal zones up to 2 decimal places', () => {
|
|
21
|
+
expect(BikeWorkoutIndividualItemSchema.safeParse({
|
|
22
|
+
type: 'individual',
|
|
23
|
+
id: 'bike-decimal',
|
|
24
|
+
name: 'Sweet Spot',
|
|
25
|
+
discipline: 'bike',
|
|
26
|
+
zone: 4.5,
|
|
27
|
+
}).success).toBe(true);
|
|
28
|
+
});
|
|
29
|
+
it('rejects zones with more than 2 decimal places', () => {
|
|
30
|
+
expect(BikeWorkoutIndividualItemSchema.safeParse({
|
|
31
|
+
type: 'individual',
|
|
32
|
+
id: 'bike-bad-decimal',
|
|
33
|
+
name: 'Too Precise',
|
|
34
|
+
discipline: 'bike',
|
|
35
|
+
zone: 4.125,
|
|
36
|
+
}).success).toBe(false);
|
|
37
|
+
});
|
|
20
38
|
});
|
|
21
39
|
//# sourceMappingURL=bike-workout-types.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bike-workout-types.test.js","sourceRoot":"","sources":["../../src/workouts/bike-workout-types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"bike-workout-types.test.js","sourceRoot":"","sources":["../../src/workouts/bike-workout-types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,cAAc;YAClB,IAAI,EAAE,YAAY;YAClB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,GAAG;SACV,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,kBAAkB;YACtB,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { WorkoutIndividualItemBaseSchema } from './base-workout-types';
|
|
2
|
+
import { WorkoutIndividualItemBaseSchema, zone } from './base-workout-types';
|
|
3
3
|
export const RunWorkoutIndividualItemSchema = WorkoutIndividualItemBaseSchema.extend({
|
|
4
4
|
discipline: z.literal('run'),
|
|
5
|
-
zone:
|
|
6
|
-
toZone:
|
|
5
|
+
zone: zone(1, 5),
|
|
6
|
+
toZone: zone(1, 5).optional(),
|
|
7
7
|
// Run-specific
|
|
8
8
|
target_distance_meters: z.number().min(0).optional(),
|
|
9
9
|
target_pace_seconds_per_km: z.number().min(0).optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-workout-types.js","sourceRoot":"","sources":["../../src/workouts/run-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"run-workout-types.js","sourceRoot":"","sources":["../../src/workouts/run-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,+BAA+B,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,CAAC,MAAM,8BAA8B,GAAG,+BAA+B,CAAC,MAAM,CAAC;IACnF,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IAChB,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7B,eAAe;IACf,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACpD,0BAA0B,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CACzD,CAAC,CAAC"}
|
|
@@ -17,5 +17,30 @@ describe('RunWorkoutIndividualItemSchema', () => {
|
|
|
17
17
|
zone: 6,
|
|
18
18
|
}).success).toBe(false);
|
|
19
19
|
});
|
|
20
|
+
it('accepts decimal zones up to 2 decimal places', () => {
|
|
21
|
+
expect(RunWorkoutIndividualItemSchema.safeParse({
|
|
22
|
+
type: 'individual',
|
|
23
|
+
id: 'run-decimal',
|
|
24
|
+
name: 'Tempo',
|
|
25
|
+
discipline: 'run',
|
|
26
|
+
zone: 3.5,
|
|
27
|
+
}).success).toBe(true);
|
|
28
|
+
expect(RunWorkoutIndividualItemSchema.safeParse({
|
|
29
|
+
type: 'individual',
|
|
30
|
+
id: 'run-decimal-2',
|
|
31
|
+
name: 'Tempo',
|
|
32
|
+
discipline: 'run',
|
|
33
|
+
zone: 2.75,
|
|
34
|
+
}).success).toBe(true);
|
|
35
|
+
});
|
|
36
|
+
it('rejects zones with more than 2 decimal places', () => {
|
|
37
|
+
expect(RunWorkoutIndividualItemSchema.safeParse({
|
|
38
|
+
type: 'individual',
|
|
39
|
+
id: 'run-bad-decimal',
|
|
40
|
+
name: 'Too Precise',
|
|
41
|
+
discipline: 'run',
|
|
42
|
+
zone: 3.125,
|
|
43
|
+
}).success).toBe(false);
|
|
44
|
+
});
|
|
20
45
|
});
|
|
21
46
|
//# sourceMappingURL=run-workout-types.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-workout-types.test.js","sourceRoot":"","sources":["../../src/workouts/run-workout-types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAErE,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,CACJ,8BAA8B,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,KAAK;YACjB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CACJ,8BAA8B,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,KAAK;YACjB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"run-workout-types.test.js","sourceRoot":"","sources":["../../src/workouts/run-workout-types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,qBAAqB,CAAC;AAErE,QAAQ,CAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC5C,MAAM,CACJ,8BAA8B,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,KAAK;YACjB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CACJ,8BAA8B,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,KAAK;YACjB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CACJ,8BAA8B,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,aAAa;YACjB,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,KAAK;YACjB,IAAI,EAAE,GAAG;SACV,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CACJ,8BAA8B,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,eAAe;YACnB,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,KAAK;YACjB,IAAI,EAAE,IAAI;SACX,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,CACJ,8BAA8B,CAAC,SAAS,CAAC;YACvC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,iBAAiB;YACrB,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,KAAK;YACjB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import { WorkoutIndividualItemBaseSchema } from './base-workout-types';
|
|
2
|
+
import { WorkoutIndividualItemBaseSchema, zone } from './base-workout-types';
|
|
3
3
|
export const SwimStrokeSchema = z.enum(['free', 'kick', 'drill', 'choice']);
|
|
4
4
|
export const SwimWorkoutIndividualItemSchema = WorkoutIndividualItemBaseSchema.extend({
|
|
5
5
|
discipline: z.literal('swim'),
|
|
6
|
-
zone:
|
|
7
|
-
toZone:
|
|
6
|
+
zone: zone(1, 4),
|
|
7
|
+
toZone: zone(1, 4).optional(),
|
|
8
8
|
// Swim-specific
|
|
9
9
|
target_distance_meters: z.number().min(0).optional(),
|
|
10
10
|
stroke: SwimStrokeSchema.optional(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swim-workout-types.js","sourceRoot":"","sources":["../../src/workouts/swim-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"swim-workout-types.js","sourceRoot":"","sources":["../../src/workouts/swim-workout-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,+BAA+B,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAE7E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;AAG5E,MAAM,CAAC,MAAM,+BAA+B,GAAG,+BAA+B,CAAC,MAAM,CAAC;IACpF,UAAU,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IAC7B,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;IAChB,MAAM,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7B,gBAAgB;IAChB,sBAAsB,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACpD,MAAM,EAAE,gBAAgB,CAAC,QAAQ,EAAE;IACnC,YAAY,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAC"}
|
|
@@ -18,5 +18,24 @@ describe('SwimWorkoutIndividualItemSchema', () => {
|
|
|
18
18
|
zone: 5,
|
|
19
19
|
}).success).toBe(false);
|
|
20
20
|
});
|
|
21
|
+
it('accepts decimal zones up to 2 decimal places', () => {
|
|
22
|
+
expect(SwimWorkoutIndividualItemSchema.safeParse({
|
|
23
|
+
type: 'individual',
|
|
24
|
+
id: 'swim-decimal',
|
|
25
|
+
name: 'Swim Set',
|
|
26
|
+
discipline: 'swim',
|
|
27
|
+
zone: 2.5,
|
|
28
|
+
toZone: 3.25,
|
|
29
|
+
}).success).toBe(true);
|
|
30
|
+
});
|
|
31
|
+
it('rejects zones with more than 2 decimal places', () => {
|
|
32
|
+
expect(SwimWorkoutIndividualItemSchema.safeParse({
|
|
33
|
+
type: 'individual',
|
|
34
|
+
id: 'swim-bad-decimal',
|
|
35
|
+
name: 'Too Precise',
|
|
36
|
+
discipline: 'swim',
|
|
37
|
+
zone: 2.125,
|
|
38
|
+
}).success).toBe(false);
|
|
39
|
+
});
|
|
21
40
|
});
|
|
22
41
|
//# sourceMappingURL=swim-workout-types.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swim-workout-types.test.js","sourceRoot":"","sources":["../../src/workouts/swim-workout-types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,eAAe;YACrB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,CAAC;SACV,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"swim-workout-types.test.js","sourceRoot":"","sources":["../../src/workouts/swim-workout-types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,+BAA+B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC7C,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,eAAe;YACrB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,CAAC;YACP,MAAM,EAAE,CAAC;SACV,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,UAAU;YACd,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,CAAC;SACR,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;QACtD,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,cAAc;YAClB,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,GAAG;YACT,MAAM,EAAE,IAAI;SACb,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACvD,MAAM,CACJ,+BAA+B,CAAC,SAAS,CAAC;YACxC,IAAI,EAAE,YAAY;YAClB,EAAE,EAAE,kBAAkB;YACtB,IAAI,EAAE,aAAa;YACnB,UAAU,EAAE,MAAM;YAClB,IAAI,EAAE,KAAK;SACZ,CAAC,CAAC,OAAO,CACX,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { WorkoutSegmentItem } from './workout-types';
|
|
1
|
+
import type { WorkoutIndividualItem, WorkoutSegmentItem } from './workout-types';
|
|
2
2
|
export declare const generateWorkoutItemId: () => string;
|
|
3
3
|
/**
|
|
4
4
|
* Individual item utils
|
|
@@ -13,5 +13,5 @@ export declare function getTotalDistanceMeters(segments: WorkoutSegmentItem[]):
|
|
|
13
13
|
export declare function getTotalSegmentCount(segments: WorkoutSegmentItem[]): number;
|
|
14
14
|
export declare function getTotalDurationSeconds(segments: WorkoutSegmentItem[]): number;
|
|
15
15
|
export declare function getTotalWeight(segments: WorkoutSegmentItem[]): number;
|
|
16
|
-
export declare function flattenSegmentItems(segments: WorkoutSegmentItem[]):
|
|
16
|
+
export declare function flattenSegmentItems(segments: WorkoutSegmentItem[]): WorkoutIndividualItem[];
|
|
17
17
|
//# sourceMappingURL=workout-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workout-utils.d.ts","sourceRoot":"","sources":["../../src/workouts/workout-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"workout-utils.d.ts","sourceRoot":"","sources":["../../src/workouts/workout-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,eAAO,MAAM,qBAAqB,cAAmD,CAAC;AAEtF;;GAEG;AAEH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAWlE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAWnE;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,kBAAkB,GAAG,MAAM,CAY1D;AAED;;GAEG;AAEH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAE7E;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAO3E;AAED,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAE9E;AAGD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAErE;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,EAAE,GAAG,qBAAqB,EAAE,CAQ3F"}
|
|
@@ -16,12 +16,12 @@ export function getDurationSeconds(item) {
|
|
|
16
16
|
}
|
|
17
17
|
export function getWeight(item) {
|
|
18
18
|
if (item.type === 'group') {
|
|
19
|
-
return item.segments.reduce((total, segment) => total + getWeight(segment), 0);
|
|
19
|
+
return (item.segments.reduce((total, segment) => total + getWeight(segment), 0) * item.repeatCount);
|
|
20
20
|
}
|
|
21
21
|
if (item.discipline === 'swim') {
|
|
22
|
-
return
|
|
22
|
+
return getDistanceMeters(item);
|
|
23
23
|
}
|
|
24
|
-
return
|
|
24
|
+
return getDurationSeconds(item);
|
|
25
25
|
}
|
|
26
26
|
/**
|
|
27
27
|
* Aggregates
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workout-utils.js","sourceRoot":"","sources":["../../src/workouts/workout-utils.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAEtF;;GAEG;AAEH,MAAM,UAAU,iBAAiB,CAAC,IAAwB;IACxD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,CACL,IAAI,CAAC,QAAQ,CAAC,MAAM,CAClB,CAAC,GAAW,EAAE,IAAwB,EAAE,EAAE,CAAC,GAAG,GAAG,iBAAiB,CAAC,IAAI,CAAC,EACxE,CAAC,CACF,GAAG,IAAI,CAAC,WAAW,CACrB,CAAC;IACJ,CAAC;IAED,OAAO,wBAAwB,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,sBAAsB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAwB;IACzD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,CACL,IAAI,CAAC,QAAQ,CAAC,MAAM,CAClB,CAAC,GAAW,EAAE,IAAwB,EAAE,EAAE,CAAC,GAAG,GAAG,kBAAkB,CAAC,IAAI,CAAC,EACzE,CAAC,CACF,GAAG,IAAI,CAAC,WAAW,CACrB,CAAC;IACJ,CAAC;IAED,OAAO,yBAAyB,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,uBAAuB,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACrF,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAwB;IAChD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"workout-utils.js","sourceRoot":"","sources":["../../src/workouts/workout-utils.ts"],"names":[],"mappings":"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"}
|