gymmonk-schema 0.15.0 → 0.16.0
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/session.d.ts +54 -0
- package/dist/session.d.ts.map +1 -1
- package/dist/session.js +60 -0
- package/dist/session.js.map +1 -1
- package/package.json +1 -1
package/dist/session.d.ts
CHANGED
|
@@ -14,6 +14,39 @@ export declare const sessionStatusSchema: z.ZodEnum<{
|
|
|
14
14
|
completed: "completed";
|
|
15
15
|
}>;
|
|
16
16
|
export type SessionStatus = z.infer<typeof sessionStatusSchema>;
|
|
17
|
+
/**
|
|
18
|
+
* The member's own stopwatch, which is NOT the session clock.
|
|
19
|
+
*
|
|
20
|
+
* Home shows two running times and they measure different things. The session
|
|
21
|
+
* clock is "how long have you been in the gym" — it runs from `checkInAt`,
|
|
22
|
+
* cannot be paused, and is derived rather than stored. This one is "how long
|
|
23
|
+
* has this set taken", and the member starts, pauses and resets it freely.
|
|
24
|
+
*
|
|
25
|
+
* Stored as ACCUMULATED + STARTED-AT rather than as a running total, because a
|
|
26
|
+
* total would need the server to tick. Elapsed is
|
|
27
|
+
* `accumulatedSec + (running ? now - startedAt : 0)`, so a paused stopwatch is
|
|
28
|
+
* a plain number, a running one survives a refresh or a dead battery, and no
|
|
29
|
+
* job has to write to the database once a second.
|
|
30
|
+
*
|
|
31
|
+
* `startedAt` is null exactly when `running` is false; the pair is a small
|
|
32
|
+
* state machine, and the backend is the only writer.
|
|
33
|
+
*/
|
|
34
|
+
export declare const sessionStopwatchSchema: z.ZodObject<{
|
|
35
|
+
running: z.ZodBoolean;
|
|
36
|
+
accumulatedSec: z.ZodNumber;
|
|
37
|
+
startedAt: z.ZodNullable<z.ZodISODateTime>;
|
|
38
|
+
}, z.core.$strip>;
|
|
39
|
+
export type SessionStopwatch = z.infer<typeof sessionStopwatchSchema>;
|
|
40
|
+
/** A stopwatch that has never been started. */
|
|
41
|
+
export declare const IDLE_STOPWATCH: SessionStopwatch;
|
|
42
|
+
/**
|
|
43
|
+
* Resolve a stopwatch to whole seconds elapsed.
|
|
44
|
+
*
|
|
45
|
+
* Shared rather than reimplemented on each side: the backend needs it to bank
|
|
46
|
+
* time on pause, and the client needs it to render every tick. Two copies of
|
|
47
|
+
* this arithmetic would drift the moment one of them forgot the running run.
|
|
48
|
+
*/
|
|
49
|
+
export declare function stopwatchElapsedSec(stopwatch: SessionStopwatch, now?: Date): number;
|
|
17
50
|
export declare const workoutSessionSchema: z.ZodObject<{
|
|
18
51
|
id: z.ZodString;
|
|
19
52
|
userId: z.ZodString;
|
|
@@ -36,6 +69,11 @@ export declare const workoutSessionSchema: z.ZodObject<{
|
|
|
36
69
|
}>>;
|
|
37
70
|
completedExerciseIds: z.ZodArray<z.ZodString>;
|
|
38
71
|
totalExercises: z.ZodNumber;
|
|
72
|
+
stopwatch: z.ZodObject<{
|
|
73
|
+
running: z.ZodBoolean;
|
|
74
|
+
accumulatedSec: z.ZodNumber;
|
|
75
|
+
startedAt: z.ZodNullable<z.ZodISODateTime>;
|
|
76
|
+
}, z.core.$strip>;
|
|
39
77
|
}, z.core.$strip>;
|
|
40
78
|
export type WorkoutSession = z.infer<typeof workoutSessionSchema>;
|
|
41
79
|
/**
|
|
@@ -67,6 +105,22 @@ export declare const markExerciseDoneBodySchema: z.ZodObject<{
|
|
|
67
105
|
done: z.ZodBoolean;
|
|
68
106
|
}, z.core.$strip>;
|
|
69
107
|
export type MarkExerciseDoneBody = z.infer<typeof markExerciseDoneBodySchema>;
|
|
108
|
+
/**
|
|
109
|
+
* Drive the set stopwatch.
|
|
110
|
+
*
|
|
111
|
+
* An ACTION, not a state patch. The client says what the member pressed and the
|
|
112
|
+
* server computes the resulting `{ running, accumulatedSec, startedAt }` — which
|
|
113
|
+
* keeps the banking arithmetic in one place and means a client cannot post an
|
|
114
|
+
* arbitrary elapsed time to inflate a workout.
|
|
115
|
+
*/
|
|
116
|
+
export declare const stopwatchActionBodySchema: z.ZodObject<{
|
|
117
|
+
action: z.ZodEnum<{
|
|
118
|
+
start: "start";
|
|
119
|
+
pause: "pause";
|
|
120
|
+
reset: "reset";
|
|
121
|
+
}>;
|
|
122
|
+
}, z.core.$strip>;
|
|
123
|
+
export type StopwatchActionBody = z.infer<typeof stopwatchActionBodySchema>;
|
|
70
124
|
export declare const attendanceStatusSchema: z.ZodEnum<{
|
|
71
125
|
present: "present";
|
|
72
126
|
absent: "absent";
|
package/dist/session.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB,eAAO,MAAM,mBAAmB;;;;EAA0C,CAAC;AAC3E,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAIhE,eAAO,MAAM,oBAAoB
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAaxB,eAAO,MAAM,mBAAmB;;;;EAA0C,CAAC;AAC3E,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAIhE;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,sBAAsB;;;;iBAMjC,CAAC;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,+CAA+C;AAC/C,eAAO,MAAM,cAAc,EAAE,gBAI5B,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,gBAAgB,EAAE,GAAG,GAAE,IAAiB,GAAG,MAAM,CAO/F;AAID,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAY/B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAIlE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB;;iBAE5B,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,kBAAkB;;iBAE7B,CAAC;AACH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,0BAA0B;;;iBAGrC,CAAC;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E;;;;;;;GAOG;AACH,eAAO,MAAM,yBAAyB;;;;;;iBAEpC,CAAC;AACH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAI5E,eAAO,MAAM,sBAAsB;;;;EAAwC,CAAC;AAC5E,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAC;AAEtE,eAAO,MAAM,qBAAqB;;;;;;;;;iBAKhC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,eAAO,MAAM,qBAAqB;;;;;;iBAIhC,CAAC;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AAEpE,sEAAsE;AACtE,eAAO,MAAM,wBAAwB;;;;;;;;;;;iBAOnC,CAAC;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC"}
|
package/dist/session.js
CHANGED
|
@@ -13,6 +13,54 @@ import { isoDateSchema, isoDateTimeSchema, objectIdSchema, optionalTrimmedString
|
|
|
13
13
|
import { weekdaySchema } from './shared.js';
|
|
14
14
|
// ─── Live session widget status ──────────────────────────────────────────────
|
|
15
15
|
export const sessionStatusSchema = z.enum(['idle', 'active', 'completed']);
|
|
16
|
+
// ─── The set stopwatch ───────────────────────────────────────────────────────
|
|
17
|
+
/**
|
|
18
|
+
* The member's own stopwatch, which is NOT the session clock.
|
|
19
|
+
*
|
|
20
|
+
* Home shows two running times and they measure different things. The session
|
|
21
|
+
* clock is "how long have you been in the gym" — it runs from `checkInAt`,
|
|
22
|
+
* cannot be paused, and is derived rather than stored. This one is "how long
|
|
23
|
+
* has this set taken", and the member starts, pauses and resets it freely.
|
|
24
|
+
*
|
|
25
|
+
* Stored as ACCUMULATED + STARTED-AT rather than as a running total, because a
|
|
26
|
+
* total would need the server to tick. Elapsed is
|
|
27
|
+
* `accumulatedSec + (running ? now - startedAt : 0)`, so a paused stopwatch is
|
|
28
|
+
* a plain number, a running one survives a refresh or a dead battery, and no
|
|
29
|
+
* job has to write to the database once a second.
|
|
30
|
+
*
|
|
31
|
+
* `startedAt` is null exactly when `running` is false; the pair is a small
|
|
32
|
+
* state machine, and the backend is the only writer.
|
|
33
|
+
*/
|
|
34
|
+
export const sessionStopwatchSchema = z.object({
|
|
35
|
+
running: z.boolean(),
|
|
36
|
+
/** Seconds banked by previous runs, excluding any run in progress. */
|
|
37
|
+
accumulatedSec: z.number().int().nonnegative(),
|
|
38
|
+
/** When the current run began. Null while paused. */
|
|
39
|
+
startedAt: isoDateTimeSchema.nullable(),
|
|
40
|
+
});
|
|
41
|
+
/** A stopwatch that has never been started. */
|
|
42
|
+
export const IDLE_STOPWATCH = {
|
|
43
|
+
running: false,
|
|
44
|
+
accumulatedSec: 0,
|
|
45
|
+
startedAt: null,
|
|
46
|
+
};
|
|
47
|
+
/**
|
|
48
|
+
* Resolve a stopwatch to whole seconds elapsed.
|
|
49
|
+
*
|
|
50
|
+
* Shared rather than reimplemented on each side: the backend needs it to bank
|
|
51
|
+
* time on pause, and the client needs it to render every tick. Two copies of
|
|
52
|
+
* this arithmetic would drift the moment one of them forgot the running run.
|
|
53
|
+
*/
|
|
54
|
+
export function stopwatchElapsedSec(stopwatch, now = new Date()) {
|
|
55
|
+
if (!stopwatch.running || !stopwatch.startedAt)
|
|
56
|
+
return stopwatch.accumulatedSec;
|
|
57
|
+
const started = Date.parse(stopwatch.startedAt);
|
|
58
|
+
if (Number.isNaN(started))
|
|
59
|
+
return stopwatch.accumulatedSec;
|
|
60
|
+
// Floored at the banked value: a client clock behind the server's would
|
|
61
|
+
// otherwise make the number run backwards.
|
|
62
|
+
return stopwatch.accumulatedSec + Math.max(0, Math.floor((now.getTime() - started) / 1000));
|
|
63
|
+
}
|
|
16
64
|
// ─── Session entity ──────────────────────────────────────────────────────────
|
|
17
65
|
export const workoutSessionSchema = z.object({
|
|
18
66
|
id: objectIdSchema,
|
|
@@ -25,6 +73,7 @@ export const workoutSessionSchema = z.object({
|
|
|
25
73
|
planWeekday: weekdaySchema.nullable(),
|
|
26
74
|
completedExerciseIds: z.array(objectIdSchema),
|
|
27
75
|
totalExercises: z.number().int().nonnegative(),
|
|
76
|
+
stopwatch: sessionStopwatchSchema,
|
|
28
77
|
});
|
|
29
78
|
// ─── Session mutations ───────────────────────────────────────────────────────
|
|
30
79
|
/**
|
|
@@ -53,6 +102,17 @@ export const markExerciseDoneBodySchema = z.object({
|
|
|
53
102
|
exerciseId: objectIdSchema,
|
|
54
103
|
done: z.boolean(),
|
|
55
104
|
});
|
|
105
|
+
/**
|
|
106
|
+
* Drive the set stopwatch.
|
|
107
|
+
*
|
|
108
|
+
* An ACTION, not a state patch. The client says what the member pressed and the
|
|
109
|
+
* server computes the resulting `{ running, accumulatedSec, startedAt }` — which
|
|
110
|
+
* keeps the banking arithmetic in one place and means a client cannot post an
|
|
111
|
+
* arbitrary elapsed time to inflate a workout.
|
|
112
|
+
*/
|
|
113
|
+
export const stopwatchActionBodySchema = z.object({
|
|
114
|
+
action: z.enum(['start', 'pause', 'reset']),
|
|
115
|
+
});
|
|
56
116
|
// ─── Attendance ──────────────────────────────────────────────────────────────
|
|
57
117
|
export const attendanceStatusSchema = z.enum(['present', 'absent', 'rest']);
|
|
58
118
|
export const attendanceEntrySchema = z.object({
|
package/dist/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,cAAc,EACd,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,gFAAgF;AAEhF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC;AAG3E,gFAAgF;AAEhF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,EAAE,EAAE,cAAc;IAClB,MAAM,EAAE,cAAc;IACtB,QAAQ,EAAE,cAAc;IACxB,MAAM,EAAE,mBAAmB;IAC3B,SAAS,EAAE,iBAAiB;IAC5B,UAAU,EAAE,iBAAiB,CAAC,QAAQ,EAAE;IACxC,kEAAkE;IAClE,WAAW,EAAE,aAAa,CAAC,QAAQ,EAAE;IACrC,oBAAoB,EAAE,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC;IAC7C,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,EAAE;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * gymmonk-schema — Workout sessions, check-in & attendance\n * ========================================================\n * A member checks in to start a live session, marks exercises done, and checks\n * out. Sessions roll up into attendance records the owner can review, and can\n * also be recorded directly by an owner (manual attendance marking).\n *\n * @module gymmonk-schema/session\n */\n\nimport { z } from 'zod';\nimport { checkInCodeSchema } from './check-in.js';\nimport {\n isoDateSchema,\n isoDateTimeSchema,\n objectIdSchema,\n optionalTrimmedString,\n paginationSchema,\n} from './common.js';\nimport { weekdaySchema } from './shared.js';\n\n// ─── Live session widget status ──────────────────────────────────────────────\n\nexport const sessionStatusSchema = z.enum(['idle', 'active', 'completed']);\nexport type SessionStatus = z.infer<typeof sessionStatusSchema>;\n\n// ─── The set stopwatch ───────────────────────────────────────────────────────\n\n/**\n * The member's own stopwatch, which is NOT the session clock.\n *\n * Home shows two running times and they measure different things. The session\n * clock is \"how long have you been in the gym\" — it runs from `checkInAt`,\n * cannot be paused, and is derived rather than stored. This one is \"how long\n * has this set taken\", and the member starts, pauses and resets it freely.\n *\n * Stored as ACCUMULATED + STARTED-AT rather than as a running total, because a\n * total would need the server to tick. Elapsed is\n * `accumulatedSec + (running ? now - startedAt : 0)`, so a paused stopwatch is\n * a plain number, a running one survives a refresh or a dead battery, and no\n * job has to write to the database once a second.\n *\n * `startedAt` is null exactly when `running` is false; the pair is a small\n * state machine, and the backend is the only writer.\n */\nexport const sessionStopwatchSchema = z.object({\n running: z.boolean(),\n /** Seconds banked by previous runs, excluding any run in progress. */\n accumulatedSec: z.number().int().nonnegative(),\n /** When the current run began. Null while paused. */\n startedAt: isoDateTimeSchema.nullable(),\n});\nexport type SessionStopwatch = z.infer<typeof sessionStopwatchSchema>;\n\n/** A stopwatch that has never been started. */\nexport const IDLE_STOPWATCH: SessionStopwatch = {\n running: false,\n accumulatedSec: 0,\n startedAt: null,\n};\n\n/**\n * Resolve a stopwatch to whole seconds elapsed.\n *\n * Shared rather than reimplemented on each side: the backend needs it to bank\n * time on pause, and the client needs it to render every tick. Two copies of\n * this arithmetic would drift the moment one of them forgot the running run.\n */\nexport function stopwatchElapsedSec(stopwatch: SessionStopwatch, now: Date = new Date()): number {\n if (!stopwatch.running || !stopwatch.startedAt) return stopwatch.accumulatedSec;\n const started = Date.parse(stopwatch.startedAt);\n if (Number.isNaN(started)) return stopwatch.accumulatedSec;\n // Floored at the banked value: a client clock behind the server's would\n // otherwise make the number run backwards.\n return stopwatch.accumulatedSec + Math.max(0, Math.floor((now.getTime() - started) / 1000));\n}\n\n// ─── Session entity ──────────────────────────────────────────────────────────\n\nexport const workoutSessionSchema = z.object({\n id: objectIdSchema,\n userId: objectIdSchema,\n centerId: objectIdSchema,\n status: sessionStatusSchema,\n checkInAt: isoDateTimeSchema,\n checkOutAt: isoDateTimeSchema.nullable(),\n /** The plan weekday being trained, if the member is on a plan. */\n planWeekday: weekdaySchema.nullable(),\n completedExerciseIds: z.array(objectIdSchema),\n totalExercises: z.number().int().nonnegative(),\n stopwatch: sessionStopwatchSchema,\n});\nexport type WorkoutSession = z.infer<typeof workoutSessionSchema>;\n\n// ─── Session mutations ───────────────────────────────────────────────────────\n\n/**\n * Check in by scanning the gym's QR poster.\n *\n * `code` is REQUIRED and is the whole point: the center is resolved FROM the\n * scanned code, never from a client-supplied `centerId`. An earlier version of\n * this body took an optional `centerId`, which meant any authenticated member\n * could mark themselves present from their sofa. Presence has to be proven by\n * being close enough to the poster to photograph it.\n *\n * Staff marking someone present by hand is a different, authorised path —\n * `markAttendanceBodySchema` below.\n */\nexport const checkInBodySchema = z.object({\n code: checkInCodeSchema,\n});\nexport type CheckInBody = z.infer<typeof checkInBodySchema>;\n\n/**\n * Check out — the same poster, scanned again. Verified against the session's\n * OWN center, so a member cannot close a session by scanning a different gym.\n */\nexport const checkOutBodySchema = z.object({\n code: checkInCodeSchema,\n});\nexport type CheckOutBody = z.infer<typeof checkOutBodySchema>;\n\nexport const markExerciseDoneBodySchema = z.object({\n exerciseId: objectIdSchema,\n done: z.boolean(),\n});\nexport type MarkExerciseDoneBody = z.infer<typeof markExerciseDoneBodySchema>;\n\n/**\n * Drive the set stopwatch.\n *\n * An ACTION, not a state patch. The client says what the member pressed and the\n * server computes the resulting `{ running, accumulatedSec, startedAt }` — which\n * keeps the banking arithmetic in one place and means a client cannot post an\n * arbitrary elapsed time to inflate a workout.\n */\nexport const stopwatchActionBodySchema = z.object({\n action: z.enum(['start', 'pause', 'reset']),\n});\nexport type StopwatchActionBody = z.infer<typeof stopwatchActionBodySchema>;\n\n// ─── Attendance ──────────────────────────────────────────────────────────────\n\nexport const attendanceStatusSchema = z.enum(['present', 'absent', 'rest']);\nexport type AttendanceStatus = z.infer<typeof attendanceStatusSchema>;\n\nexport const attendanceEntrySchema = z.object({\n date: isoDateSchema,\n checkInAt: isoDateTimeSchema.nullable(),\n checkOutAt: isoDateTimeSchema.nullable(),\n status: attendanceStatusSchema,\n});\nexport type AttendanceEntry = z.infer<typeof attendanceEntrySchema>;\n\nexport const attendanceQuerySchema = paginationSchema.extend({\n userId: objectIdSchema.optional(),\n from: isoDateSchema.optional(),\n to: isoDateSchema.optional(),\n});\nexport type AttendanceQuery = z.infer<typeof attendanceQuerySchema>;\n\n/** Owner marking attendance for a member or staff member manually. */\nexport const markAttendanceBodySchema = z.object({\n userId: objectIdSchema,\n date: isoDateSchema.optional(),\n status: attendanceStatusSchema.default('present'),\n checkInAt: isoDateTimeSchema.optional(),\n checkOutAt: isoDateTimeSchema.optional(),\n note: optionalTrimmedString(160),\n});\nexport type MarkAttendanceBody = z.infer<typeof markAttendanceBodySchema>;\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gymmonk-schema",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.16.0",
|
|
4
4
|
"description": "Shared Zod schemas, enums and domain types for GymMonk (fitness SaaS) — single source of truth (SSOT) consumed by gymmonk-backend and gymmonk-web-client.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|