@strong-together/shared 2.1.0 → 2.2.0

package/dist/index.cjs

@@ -1516,7 +1516,7 @@ var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_worko
   orderIndex: (0, import_pg_core31.bigint)("order_index", {
     mode: "number"
   }),
-  setOrderIndex: (0, import_pg_core32.integer)("set_order_index"),
+  setIndex: (0, import_pg_core32.integer)("set_index"),
   createdAt: (0, import_pg_core31.timestamp)("created_at", {
     withTimezone: true
   }),
@@ -1532,7 +1532,7 @@ var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_worko
       ex.name AS exercise,
       ws.name AS workout_split,
       workout_set.reps AS reps,
-      workout_set.order_index AS set_order_index,
+      workout_set.order_index AS set_index,
       ews.order_index,
       ews.created_at,
       ews.is_active
@@ -1566,6 +1566,7 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
   exerciseToSplitId: (0, import_pg_core33.bigint)("exercise_to_split_id", {
     mode: "number"
   }),
+  isAssignedToSplit: (0, import_pg_core33.boolean)("is_assigned_to_split"),
   weight: (0, import_pg_core33.real)("weight"),
   reps: (0, import_pg_core33.bigint)("reps", {
     mode: "number"
@@ -1593,6 +1594,10 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
     SELECT
       et.id,
       et.exercise_to_split_id,
+      CASE
+        WHEN et.exercise_to_split_id IS NOT NULL THEN TRUE
+        WHEN et.exercise_id IS NOT NULL THEN FALSE
+      END AS is_assigned_to_split,
       tracking_set.weight AS weight,
       tracking_set.reps AS reps,
       tracking_set.set_index AS set_index,
@@ -2160,12 +2165,20 @@ var addWorkoutContract = {
 
 // src/modules/workout/tracking/tracking.dtos.ts
 var import_v418 = require("zod/v4");
-var finishedWorkoutEntryQueryDtoSchema = import_v418.z.object({
-  exerciseToSplitId: exerciseToWorkoutSplitDbSchema.shape.id,
-  weight: import_v418.z.array(trackingSetDbSchema.shape.weight),
-  reps: import_v418.z.array(trackingSetDbSchema.shape.reps),
+var trackedSetQueryDtoSchema = import_v418.z.object({
+  reps: trackingSetDbSchema.shape.reps,
+  weight: trackingSetDbSchema.shape.weight,
+  setIndex: trackingSetDbSchema.shape.setIndex
+});
+var finishedWorkoutEntryBaseQueryDtoSchema = import_v418.z.object({
+  trackedSets: import_v418.z.array(trackedSetQueryDtoSchema),
   notes: exerciseTrackingDbSchema.shape.notes.optional()
 });
+var finishedWorkoutEntryQueryDtoSchema = finishedWorkoutEntryBaseQueryDtoSchema.extend({
+  isExerciseAssignedToSplit: import_v418.z.boolean(),
+  exerciseToSplitId: exerciseTrackingDbSchema.shape.exerciseToSplitId,
+  exerciseId: exerciseTrackingDbSchema.shape.exerciseId
+});
 var exerciseMetadataQueryDtoSchema = import_v418.z.object({
   targetMuscle: exerciseDbSchema.shape.targetMuscle,
   specificTargetMuscle: exerciseDbSchema.shape.specificTargetMuscle

package/dist/index.d.cts

@@ -2505,8 +2505,8 @@ declare const exerciseToWorkoutSplitExpandedViewDbSchema: drizzle_zod.BuildSchem
         identity: undefined;
         generated: undefined;
     }, {}, {}>;
-    setOrderIndex: drizzle_orm_pg_core.PgColumn<{
-        name: "set_order_index";
+    setIndex: drizzle_orm_pg_core.PgColumn<{
+        name: "set_index";
         tableName: "v_exercise_to_workout_split_expanded";
         dataType: "number";
         columnType: "PgInteger";
@@ -3356,6 +3356,23 @@ declare const exerciseTrackingExpandedViewDbSchema: drizzle_zod.BuildSchema<"sel
         identity: undefined;
         generated: undefined;
     }, {}, {}>;
+    isAssignedToSplit: drizzle_orm_pg_core.PgColumn<{
+        name: "is_assigned_to_split";
+        tableName: "v_exercise_tracking_expanded";
+        dataType: "boolean";
+        columnType: "PgBoolean";
+        data: boolean;
+        driverParam: boolean;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}, {}>;
     weight: drizzle_orm_pg_core.PgColumn<{
         name: "weight";
         tableName: "v_exercise_tracking_expanded";
@@ -5793,10 +5810,15 @@ declare const getExerciseTrackingContract: {
 declare const finishWorkoutRequestSchema: z.ZodObject<{
     body: z.ZodObject<{
         workout: z.ZodArray<z.ZodObject<{
-            exerciseToSplitId: z.ZodInt;
-            weight: z.ZodArray<z.ZodNumber>;
-            reps: z.ZodArray<z.ZodInt>;
+            trackedSets: z.ZodArray<z.ZodObject<{
+                reps: z.ZodInt;
+                weight: z.ZodNumber;
+                setIndex: z.ZodInt;
+            }, z.core.$strip>>;
             notes: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+            isExerciseAssignedToSplit: z.ZodBoolean;
+            exerciseToSplitId: z.ZodNullable<z.ZodInt>;
+            exerciseId: z.ZodNullable<z.ZodInt>;
         }, z.core.$strip>>;
         tz: z.ZodOptional<z.ZodString>;
         workoutStartUtc: z.ZodString;
@@ -5884,10 +5906,15 @@ declare const finishUserWorkoutContract: {
     request: z.ZodObject<{
         body: z.ZodObject<{
             workout: z.ZodArray<z.ZodObject<{
-                exerciseToSplitId: z.ZodInt;
-                weight: z.ZodArray<z.ZodNumber>;
-                reps: z.ZodArray<z.ZodInt>;
+                trackedSets: z.ZodArray<z.ZodObject<{
+                    reps: z.ZodInt;
+                    weight: z.ZodNumber;
+                    setIndex: z.ZodInt;
+                }, z.core.$strip>>;
                 notes: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+                isExerciseAssignedToSplit: z.ZodBoolean;
+                exerciseToSplitId: z.ZodNullable<z.ZodInt>;
+                exerciseId: z.ZodNullable<z.ZodInt>;
             }, z.core.$strip>>;
             tz: z.ZodOptional<z.ZodString>;
             workoutStartUtc: z.ZodString;
@@ -5977,12 +6004,16 @@ type GetExerciseTrackingResponse = ResponseOf<typeof getExerciseTrackingContract
 type FinishUserWorkoutBody = BodyOf<typeof finishUserWorkoutContract>;
 type FinishUserWorkoutResponse = ResponseOf<typeof finishUserWorkoutContract>;
 
-/** Finished exercise entry consumed by the workout-insertion query. */
 declare const finishedWorkoutEntryQueryDtoSchema: z.ZodObject<{
-    exerciseToSplitId: z.ZodInt;
-    weight: z.ZodArray<z.ZodNumber>;
-    reps: z.ZodArray<z.ZodInt>;
+    trackedSets: z.ZodArray<z.ZodObject<{
+        reps: z.ZodInt;
+        weight: z.ZodNumber;
+        setIndex: z.ZodInt;
+    }, z.core.$strip>>;
     notes: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    isExerciseAssignedToSplit: z.ZodBoolean;
+    exerciseToSplitId: z.ZodNullable<z.ZodInt>;
+    exerciseId: z.ZodNullable<z.ZodInt>;
 }, z.core.$strip>;
 /** Target-muscle metadata nested in a tracking-map item. */
 declare const exerciseMetadataQueryDtoSchema: z.ZodObject<{

package/dist/index.d.ts

@@ -2505,8 +2505,8 @@ declare const exerciseToWorkoutSplitExpandedViewDbSchema: drizzle_zod.BuildSchem
         identity: undefined;
         generated: undefined;
     }, {}, {}>;
-    setOrderIndex: drizzle_orm_pg_core.PgColumn<{
-        name: "set_order_index";
+    setIndex: drizzle_orm_pg_core.PgColumn<{
+        name: "set_index";
         tableName: "v_exercise_to_workout_split_expanded";
         dataType: "number";
         columnType: "PgInteger";
@@ -3356,6 +3356,23 @@ declare const exerciseTrackingExpandedViewDbSchema: drizzle_zod.BuildSchema<"sel
         identity: undefined;
         generated: undefined;
     }, {}, {}>;
+    isAssignedToSplit: drizzle_orm_pg_core.PgColumn<{
+        name: "is_assigned_to_split";
+        tableName: "v_exercise_tracking_expanded";
+        dataType: "boolean";
+        columnType: "PgBoolean";
+        data: boolean;
+        driverParam: boolean;
+        notNull: false;
+        hasDefault: false;
+        isPrimaryKey: false;
+        isAutoincrement: false;
+        hasRuntimeDefault: false;
+        enumValues: undefined;
+        baseColumn: never;
+        identity: undefined;
+        generated: undefined;
+    }, {}, {}>;
     weight: drizzle_orm_pg_core.PgColumn<{
         name: "weight";
         tableName: "v_exercise_tracking_expanded";
@@ -5793,10 +5810,15 @@ declare const getExerciseTrackingContract: {
 declare const finishWorkoutRequestSchema: z.ZodObject<{
     body: z.ZodObject<{
         workout: z.ZodArray<z.ZodObject<{
-            exerciseToSplitId: z.ZodInt;
-            weight: z.ZodArray<z.ZodNumber>;
-            reps: z.ZodArray<z.ZodInt>;
+            trackedSets: z.ZodArray<z.ZodObject<{
+                reps: z.ZodInt;
+                weight: z.ZodNumber;
+                setIndex: z.ZodInt;
+            }, z.core.$strip>>;
             notes: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+            isExerciseAssignedToSplit: z.ZodBoolean;
+            exerciseToSplitId: z.ZodNullable<z.ZodInt>;
+            exerciseId: z.ZodNullable<z.ZodInt>;
         }, z.core.$strip>>;
         tz: z.ZodOptional<z.ZodString>;
         workoutStartUtc: z.ZodString;
@@ -5884,10 +5906,15 @@ declare const finishUserWorkoutContract: {
     request: z.ZodObject<{
         body: z.ZodObject<{
             workout: z.ZodArray<z.ZodObject<{
-                exerciseToSplitId: z.ZodInt;
-                weight: z.ZodArray<z.ZodNumber>;
-                reps: z.ZodArray<z.ZodInt>;
+                trackedSets: z.ZodArray<z.ZodObject<{
+                    reps: z.ZodInt;
+                    weight: z.ZodNumber;
+                    setIndex: z.ZodInt;
+                }, z.core.$strip>>;
                 notes: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+                isExerciseAssignedToSplit: z.ZodBoolean;
+                exerciseToSplitId: z.ZodNullable<z.ZodInt>;
+                exerciseId: z.ZodNullable<z.ZodInt>;
             }, z.core.$strip>>;
             tz: z.ZodOptional<z.ZodString>;
             workoutStartUtc: z.ZodString;
@@ -5977,12 +6004,16 @@ type GetExerciseTrackingResponse = ResponseOf<typeof getExerciseTrackingContract
 type FinishUserWorkoutBody = BodyOf<typeof finishUserWorkoutContract>;
 type FinishUserWorkoutResponse = ResponseOf<typeof finishUserWorkoutContract>;
 
-/** Finished exercise entry consumed by the workout-insertion query. */
 declare const finishedWorkoutEntryQueryDtoSchema: z.ZodObject<{
-    exerciseToSplitId: z.ZodInt;
-    weight: z.ZodArray<z.ZodNumber>;
-    reps: z.ZodArray<z.ZodInt>;
+    trackedSets: z.ZodArray<z.ZodObject<{
+        reps: z.ZodInt;
+        weight: z.ZodNumber;
+        setIndex: z.ZodInt;
+    }, z.core.$strip>>;
     notes: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    isExerciseAssignedToSplit: z.ZodBoolean;
+    exerciseToSplitId: z.ZodNullable<z.ZodInt>;
+    exerciseId: z.ZodNullable<z.ZodInt>;
 }, z.core.$strip>;
 /** Target-muscle metadata nested in a tracking-map item. */
 declare const exerciseMetadataQueryDtoSchema: z.ZodObject<{

package/dist/index.js

@@ -1310,7 +1310,7 @@ var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_worko
   orderIndex: bigint12("order_index", {
     mode: "number"
   }),
-  setOrderIndex: integer5("set_order_index"),
+  setIndex: integer5("set_index"),
   createdAt: timestamp11("created_at", {
     withTimezone: true
   }),
@@ -1326,7 +1326,7 @@ var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_worko
       ex.name AS exercise,
       ws.name AS workout_split,
       workout_set.reps AS reps,
-      workout_set.order_index AS set_order_index,
+      workout_set.order_index AS set_index,
       ews.order_index,
       ews.created_at,
       ews.is_active
@@ -1351,7 +1351,7 @@ var exerciseToWorkoutSplitExpandedView = workoutSchema.view("v_exercise_to_worko
 
 // ../../src/infrastructure/db/schema/drizzle/analytics/views/exercise-tracking-expanded.view.ts
 import { sql as drizzleSql26 } from "drizzle-orm";
-import { bigint as bigint13, real as real2, text as text10, timestamp as timestamp12, uuid as uuid12 } from "drizzle-orm/pg-core";
+import { bigint as bigint13, boolean as boolean8, real as real2, text as text10, timestamp as timestamp12, uuid as uuid12 } from "drizzle-orm/pg-core";
 import { integer as integer6 } from "drizzle-orm/pg-core";
 var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_expanded", {
   id: bigint13("id", {
@@ -1360,6 +1360,7 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
   exerciseToSplitId: bigint13("exercise_to_split_id", {
     mode: "number"
   }),
+  isAssignedToSplit: boolean8("is_assigned_to_split"),
   weight: real2("weight"),
   reps: bigint13("reps", {
     mode: "number"
@@ -1387,6 +1388,10 @@ var exerciseTrackingExpandedView = analyticsSchema.view("v_exercise_tracking_exp
     SELECT
       et.id,
       et.exercise_to_split_id,
+      CASE
+        WHEN et.exercise_to_split_id IS NOT NULL THEN TRUE
+        WHEN et.exercise_id IS NOT NULL THEN FALSE
+      END AS is_assigned_to_split,
       tracking_set.weight AS weight,
       tracking_set.reps AS reps,
       tracking_set.set_index AS set_index,
@@ -1954,12 +1959,20 @@ var addWorkoutContract = {
 
 // src/modules/workout/tracking/tracking.dtos.ts
 import { z as z18 } from "zod/v4";
-var finishedWorkoutEntryQueryDtoSchema = z18.object({
-  exerciseToSplitId: exerciseToWorkoutSplitDbSchema.shape.id,
-  weight: z18.array(trackingSetDbSchema.shape.weight),
-  reps: z18.array(trackingSetDbSchema.shape.reps),
+var trackedSetQueryDtoSchema = z18.object({
+  reps: trackingSetDbSchema.shape.reps,
+  weight: trackingSetDbSchema.shape.weight,
+  setIndex: trackingSetDbSchema.shape.setIndex
+});
+var finishedWorkoutEntryBaseQueryDtoSchema = z18.object({
+  trackedSets: z18.array(trackedSetQueryDtoSchema),
   notes: exerciseTrackingDbSchema.shape.notes.optional()
 });
+var finishedWorkoutEntryQueryDtoSchema = finishedWorkoutEntryBaseQueryDtoSchema.extend({
+  isExerciseAssignedToSplit: z18.boolean(),
+  exerciseToSplitId: exerciseTrackingDbSchema.shape.exerciseToSplitId,
+  exerciseId: exerciseTrackingDbSchema.shape.exerciseId
+});
 var exerciseMetadataQueryDtoSchema = z18.object({
   targetMuscle: exerciseDbSchema.shape.targetMuscle,
   specificTargetMuscle: exerciseDbSchema.shape.specificTargetMuscle

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strong-together/shared",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",