@plus45/types 1.1.33 → 1.1.35

package/index.ts

@@ -1,48 +1,48 @@
-import { Exercise } from "./types/exercise/exercise";
-import ExerciseType from "./types/exercise/exercise_types";
-import { AccessToken } from "./types/user/access_token";
-import { User } from "./types/user/user";
-import {
-   DistanceUnits,
-   ExerciseUnit,
-   TimeUnits,
-   WeightUnits
-} from "./types/exercise/exercise_units";
-import { Workout } from "./types/workout/workout";
-import { Schedule } from "./types/schedule/schedule";
-import { ScheduleDay } from "./types/schedule/schedule_days";
-import { ScheduleRecurrence } from "./types/schedule/schedule_recurrence";
-import { UserSessionInfo } from "./types/user/session_info";
-import {
-   CompletedExercise,
-   WorkoutExecution
-} from "./types/workout/workout_execution";
-
-export {
-   // User Type Structures
-   type User,
-   type UserSessionInfo,
-   type AccessToken,
-
-   // Exercise Type Structures
-   type Exercise,
-   type CompletedExercise,
-
-   // Workout Type Structures
-   type Workout,
-   type WorkoutExecution,
-
-   // Schedule Type Structures
-   type Schedule,
-
-   // Enums
-   ExerciseType,
-   ExerciseUnit,
-   ScheduleDay,
-   ScheduleRecurrence,
-
-   // Collections
-   WeightUnits,
-   DistanceUnits,
-   TimeUnits
-};
+import { Exercise } from "./types/exercise/exercise";
+import ExerciseType from "./types/exercise/exercise_types";
+import { AccessToken } from "./types/user/access_token";
+import { User } from "./types/user/user";
+import {
+   DistanceUnits,
+   ExerciseUnit,
+   TimeUnits,
+   WeightUnits
+} from "./types/exercise/exercise_units";
+import { Workout } from "./types/workout/workout";
+import { Schedule } from "./types/schedule/schedule";
+import { ScheduleDay } from "./types/schedule/schedule_days";
+import { ScheduleRecurrence } from "./types/schedule/schedule_recurrence";
+import { UserSessionInfo } from "./types/user/session_info";
+import {
+   CompletedExercise,
+   WorkoutExecution
+} from "./types/workout/workout_execution";
+
+export {
+   // User Type Structures
+   type User,
+   type UserSessionInfo,
+   type AccessToken,
+
+   // Exercise Type Structures
+   type Exercise,
+   type CompletedExercise,
+
+   // Workout Type Structures
+   type Workout,
+   type WorkoutExecution,
+
+   // Schedule Type Structures
+   type Schedule,
+
+   // Enums
+   ExerciseType,
+   ExerciseUnit,
+   ScheduleDay,
+   ScheduleRecurrence,
+
+   // Collections
+   WeightUnits,
+   DistanceUnits,
+   TimeUnits
+};

package/package.json

@@ -1,6 +1,6 @@
-{
-   "name": "@plus45/types",
-   "version": "1.1.33",
-   "main": "index.ts",
-   "types": "index.ts"
-}
+{
+   "name": "@plus45/types",
+   "version": "1.1.35",
+   "main": "index.ts",
+   "types": "index.ts"
+}

package/types/schedule/schedule.ts

@@ -3,9 +3,15 @@ export type Schedule = {
    user_id: string;
    workout_id: string;
    days_of_week: number[];
-   start_time: string | null;
-   recurrence: number;
    created_at: string;
    start_week: number;
    start_year: number;
 };
+
+export type AssignedSchedule = {
+   schedule_id: string;
+   schedule: Schedule;
+   user_id: string;
+   start_time: Date;
+   recurrence: number;
+};

package/types/workout/workout_execution.ts

@@ -9,11 +9,12 @@ export type WorkoutExecution = {
    /**
     * Completions are a record that point the exercise id (as the key) to the completion containing the value entered as well as the unit.
     */
-   completions: Record<string, CompletedExercise>;
+   completions: Record<number, CompletedExercise>;
    completed?: boolean;
 } & Workout;
 
 export type CompletedExercise = {
+   id: string;
    value?: number;
    unit?: ExerciseUnit;
 };