Move domain models into domain package with schemas and validate with zod + elysia. Some maintenence as well

This commit is contained in:
Dominic Ferrando
2026-06-22 13:59:04 -04:00
parent ed5abac209
commit 6fa3d78571
16 changed files with 220 additions and 166 deletions
+9 -16
View File
@@ -2,17 +2,18 @@ import {
Activity,
Attribute,
Gender,
getAvgWeight,
kgToLb,
lbToKg,
range,
type Metrics,
type ActivityPerformance,
type Player,
type StandardUnit,
} from "../src/util";
} from "@blade-and-brawn/domain";
import { levenbergMarquardt as LM } from "ml-levenberg-marquardt";
import defaultConfig from "./config.json" assert { type: "json" };
import defaultStandardsJson from "./data/default-standards.json" assert { type: "json" };
import { getAvgWeight } from "./avg-weights";
// SOURCES
// Squat, Bench, Dead Lift:
@@ -24,8 +25,6 @@ import defaultStandardsJson from "./data/default-standards.json" assert { type:
// 3 Cone drill:
// https://nflsavant.com/combine.php?utm_source=chatgpt.com
export * from "./util";
export type LevelCalculatorOutput = {
player: number;
attributes: Record<Attribute, number>;
@@ -33,12 +32,6 @@ export type LevelCalculatorOutput = {
export type Levels = Record<string, number>;
export interface Metrics {
age: number;
weight: number;
gender: Gender;
}
type NumberMetric = Extract<keyof Metrics, "age" | "weight">;
export interface Standard {
@@ -72,7 +65,7 @@ const metricPriority = (m: NumberMetric) => {
export const DEFAULT_STANDARDS_DATA = defaultStandardsJson as StandardsData;
export class LevelCalculator {
standards: Standards;
readonly standards: Standards;
public constructor(standards: Standards) {
this.standards = standards;
@@ -191,7 +184,7 @@ export class LevelCalculator {
const activityLevelsAvg = Math.round(
activityLevels.reduce((sum, curr) => sum + curr, 0) /
activityLevels.length,
activityLevels.length,
);
return activityLevelsAvg;
@@ -392,9 +385,9 @@ export class Standards {
// generate data
const allGenerators = this.cfg.activity[activity].enableGeneration
? this.standardsData[activity].metadata.generators.sort(
(a, b) =>
metricPriority(a.metric) - metricPriority(b.metric),
)
(a, b) =>
metricPriority(a.metric) - metricPriority(b.metric),
)
: [];
for (const generator of allGenerators) {
@@ -664,7 +657,7 @@ export class Standards {
weightUpper === weightLower
? 1
: (metrics.weight - weightLower) /
(weightUpper - weightLower);
(weightUpper - weightLower);
weightRatio = Math.max(0, Math.min(1, weightRatio));
// metrics.weight = lowerAgeWeightStandard.metrics.weight + (upperAgeWeightStandard.metrics.weight - lowerAgeWeightStandard.metrics.weight) * weightRatio;