90dc-core 1.12.10 → 1.12.12

package/dist/lib/dbmodels/diet/DietMeal.d.ts

@@ -19,10 +19,6 @@ export declare class DietMeal extends Model<DietMeal> {
     protein: number | null;
     fat: number | null;
     carbs: number | null;
-    ingredientOverrides: Array<{
-        ingredientUuid: string;
-        grams: number;
-    }> | null;
     selectedRecipeUuids: string[] | null;
 }
 //# sourceMappingURL=DietMeal.d.ts.map

package/dist/lib/dbmodels/diet/DietMeal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DietMeal.d.ts","sourceRoot":"","sources":["../../../../src/lib/dbmodels/diet/DietMeal.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,EAGN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,oBAAY,QAAQ;IAClB,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,qBACa,QAAS,SAAQ,KAAK,CAAC,QAAQ,CAAC;IAInC,IAAI,EAAE,MAAM,CAAC;IAKb,WAAW,EAAE,MAAM,CAAC;IAGpB,GAAG,EAAE,OAAO,CAAC;IAMb,OAAO,EAAE,cAAc,EAAE,CAAC;IAG1B,IAAI,EAAE,QAAQ,CAAC;IAGf,KAAK,EAAE,MAAM,CAAC;IAId,UAAU,EAAE,OAAO,CAAC;IAGpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAGxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAGvB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAGnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAGrB,mBAAmB,EAAE,KAAK,CAAC;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IAG7E,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC9C"}
+{"version":3,"file":"DietMeal.d.ts","sourceRoot":"","sources":["../../../../src/lib/dbmodels/diet/DietMeal.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,EAGN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,oBAAY,QAAQ;IAClB,SAAS,cAAc;IACvB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,qBACa,QAAS,SAAQ,KAAK,CAAC,QAAQ,CAAC;IAInC,IAAI,EAAE,MAAM,CAAC;IAKb,WAAW,EAAE,MAAM,CAAC;IAGpB,GAAG,EAAE,OAAO,CAAC;IAMb,OAAO,EAAE,cAAc,EAAE,CAAC;IAG1B,IAAI,EAAE,QAAQ,CAAC;IAGf,KAAK,EAAE,MAAM,CAAC;IAId,UAAU,EAAE,OAAO,CAAC;IAGpB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IAGxB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAGvB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAGnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAGrB,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC9C"}

package/dist/lib/dbmodels/diet/DietMeal.js

@@ -57,9 +57,6 @@ _ts_decorate([
 _ts_decorate([
     Column(DataType.FLOAT)
 ], DietMeal.prototype, "carbs", void 0);
-_ts_decorate([
-    Column(DataType.JSONB)
-], DietMeal.prototype, "ingredientOverrides", void 0);
 _ts_decorate([
     Column(DataType.JSONB)
 ], DietMeal.prototype, "selectedRecipeUuids", void 0);

package/dist/lib/dbmodels/diet/DietMeal.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/dbmodels/diet/DietMeal.ts"],"sourcesContent":["import {\n  BelongsTo,\n  Column,\n  DataType,\n  Default,\n  ForeignKey,\n  HasMany,\n  Index,\n  Model,\n  PrimaryKey,\n  Table,\n} from \"sequelize-typescript\";\nimport { DietDay } from \"./DietDay.js\";\nimport { DietMealRecipe } from \"./DietMealRecipe.js\";\n\nexport enum MealType {\n  BREAKFAST = \"breakfast\",\n  LUNCH = \"lunch\",\n  DINNER = \"dinner\",\n  SNACK = \"snack\",\n}\n\n@Table\nexport class DietMeal extends Model<DietMeal> {\n  @PrimaryKey\n  @Default(DataType.UUIDV4)\n  @Column(DataType.UUID)\n  declare uuid: string;\n\n  @Index\n  @ForeignKey(() => DietDay)\n  @Column(DataType.UUID)\n  declare dietDayUuid: string;\n\n  @BelongsTo(() => DietDay)\n  declare day: DietDay;\n\n  @HasMany(() => DietMealRecipe, {\n    foreignKey: \"dietMealUuid\",\n    onDelete: \"CASCADE\",\n  })\n  declare recipes: DietMealRecipe[];\n\n  @Column(DataType.ENUM(...Object.values(MealType)))\n  declare type: MealType;\n\n  @Column(DataType.INTEGER)\n  declare order: number;\n\n  @Default(false)\n  @Column(DataType.BOOLEAN)\n  declare isFinished: boolean;\n\n  @Column(DataType.INTEGER)\n  declare calories: number | null;\n\n  @Column(DataType.FLOAT)\n  declare protein: number | null;\n\n  @Column(DataType.FLOAT)\n  declare fat: number | null;\n\n  @Column(DataType.FLOAT)\n  declare carbs: number | null;\n\n  @Column(DataType.JSONB)\n  declare ingredientOverrides: Array<{ ingredientUuid: string; grams: number }> | null;\n\n  @Column(DataType.JSONB)\n  declare selectedRecipeUuids: string[] | null;\n}\n"],"names":["BelongsTo","Column","DataType","Default","ForeignKey","HasMany","Index","Model","PrimaryKey","Table","DietDay","DietMealRecipe","MealType","DietMeal","UUIDV4","UUID","foreignKey","onDelete","ENUM","values","INTEGER","BOOLEAN","FLOAT","JSONB"],"mappings":";;;;;;AAAA,SACEA,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,UAAU,EACVC,OAAO,EACPC,KAAK,EACLC,KAAK,EACLC,UAAU,EACVC,KAAK,QACA,uBAAuB;AAC9B,SAASC,OAAO,QAAQ,eAAe;AACvC,SAASC,cAAc,QAAQ,sBAAsB;AAErD,OAAO,IAAA,AAAKC,kCAAAA;;;;;WAAAA;MAKX;AAGD,OAAO,MAAMC,iBAAiBN;AA+C9B;;;qBA7CoBO;oBACDC;;;;mBAICL;oBACDK;;;kBAGAL;;;gBAGFC;QACbK,YAAY;QACZC,UAAU;;;;oBAIKC,eAAeC;;;oBAGfC;;;;oBAIAC;;;oBAGAD;;;oBAGAE;;;oBAGAA;;;oBAGAA;;;oBAGAC;;;oBAGAA"}
+{"version":3,"sources":["../../../../src/lib/dbmodels/diet/DietMeal.ts"],"sourcesContent":["import {\n  BelongsTo,\n  Column,\n  DataType,\n  Default,\n  ForeignKey,\n  HasMany,\n  Index,\n  Model,\n  PrimaryKey,\n  Table,\n} from \"sequelize-typescript\";\nimport { DietDay } from \"./DietDay.js\";\nimport { DietMealRecipe } from \"./DietMealRecipe.js\";\n\nexport enum MealType {\n  BREAKFAST = \"breakfast\",\n  LUNCH = \"lunch\",\n  DINNER = \"dinner\",\n  SNACK = \"snack\",\n}\n\n@Table\nexport class DietMeal extends Model<DietMeal> {\n  @PrimaryKey\n  @Default(DataType.UUIDV4)\n  @Column(DataType.UUID)\n  declare uuid: string;\n\n  @Index\n  @ForeignKey(() => DietDay)\n  @Column(DataType.UUID)\n  declare dietDayUuid: string;\n\n  @BelongsTo(() => DietDay)\n  declare day: DietDay;\n\n  @HasMany(() => DietMealRecipe, {\n    foreignKey: \"dietMealUuid\",\n    onDelete: \"CASCADE\",\n  })\n  declare recipes: DietMealRecipe[];\n\n  @Column(DataType.ENUM(...Object.values(MealType)))\n  declare type: MealType;\n\n  @Column(DataType.INTEGER)\n  declare order: number;\n\n  @Default(false)\n  @Column(DataType.BOOLEAN)\n  declare isFinished: boolean;\n\n  @Column(DataType.INTEGER)\n  declare calories: number | null;\n\n  @Column(DataType.FLOAT)\n  declare protein: number | null;\n\n  @Column(DataType.FLOAT)\n  declare fat: number | null;\n\n  @Column(DataType.FLOAT)\n  declare carbs: number | null;\n\n  @Column(DataType.JSONB)\n  declare selectedRecipeUuids: string[] | null;\n}\n"],"names":["BelongsTo","Column","DataType","Default","ForeignKey","HasMany","Index","Model","PrimaryKey","Table","DietDay","DietMealRecipe","MealType","DietMeal","UUIDV4","UUID","foreignKey","onDelete","ENUM","values","INTEGER","BOOLEAN","FLOAT","JSONB"],"mappings":";;;;;;AAAA,SACEA,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,UAAU,EACVC,OAAO,EACPC,KAAK,EACLC,KAAK,EACLC,UAAU,EACVC,KAAK,QACA,uBAAuB;AAC9B,SAASC,OAAO,QAAQ,eAAe;AACvC,SAASC,cAAc,QAAQ,sBAAsB;AAErD,OAAO,IAAA,AAAKC,kCAAAA;;;;;WAAAA;MAKX;AAGD,OAAO,MAAMC,iBAAiBN;AA4C9B;;;qBA1CoBO;oBACDC;;;;mBAICL;oBACDK;;;kBAGAL;;;gBAGFC;QACbK,YAAY;QACZC,UAAU;;;;oBAIKC,eAAeC;;;oBAGfC;;;;oBAIAC;;;oBAGAD;;;oBAGAE;;;oBAGAA;;;oBAGAA;;;oBAGAC"}

package/dist/lib/dbmodels/diet/DietMealRecipeIngredient.d.ts

@@ -19,5 +19,7 @@ export declare class DietMealRecipeIngredient extends Model<DietMealRecipeIngred
     ingredientUuid: string;
     ingredient: Ingredient;
     grams: number;
+    displayAmount: number;
+    displayUnit: string;
 }
 //# sourceMappingURL=DietMealRecipeIngredient.d.ts.map

package/dist/lib/dbmodels/diet/DietMealRecipeIngredient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DietMealRecipeIngredient.d.ts","sourceRoot":"","sources":["../../../../src/lib/dbmodels/diet/DietMealRecipeIngredient.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,EAGN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,qBACa,wBAAyB,SAAQ,KAAK,CAAC,wBAAwB,CAAC;IAInE,IAAI,EAAE,MAAM,CAAC;IAKb,kBAAkB,EAAE,MAAM,CAAC;IAG3B,cAAc,EAAE,cAAc,CAAC;IAK/B,cAAc,EAAE,MAAM,CAAC;IAGvB,UAAU,EAAE,UAAU,CAAC;IAGvB,KAAK,EAAE,MAAM,CAAC;CACvB"}
+{"version":3,"file":"DietMealRecipeIngredient.d.ts","sourceRoot":"","sources":["../../../../src/lib/dbmodels/diet/DietMealRecipeIngredient.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,KAAK,EAGN,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C;;;;;;;;;;GAUG;AACH,qBACa,wBAAyB,SAAQ,KAAK,CAAC,wBAAwB,CAAC;IAInE,IAAI,EAAE,MAAM,CAAC;IAKb,kBAAkB,EAAE,MAAM,CAAC;IAG3B,cAAc,EAAE,cAAc,CAAC;IAK/B,cAAc,EAAE,MAAM,CAAC;IAGvB,UAAU,EAAE,UAAU,CAAC;IAGvB,KAAK,EAAE,MAAM,CAAC;IAId,aAAa,EAAE,MAAM,CAAC;IAGtB,WAAW,EAAE,MAAM,CAAC;CAC7B"}

package/dist/lib/dbmodels/diet/DietMealRecipeIngredient.js

@@ -33,6 +33,12 @@ _ts_decorate([
 _ts_decorate([
     Column(DataType.FLOAT)
 ], DietMealRecipeIngredient.prototype, "grams", void 0);
+_ts_decorate([
+    Column(DataType.FLOAT)
+], DietMealRecipeIngredient.prototype, "displayAmount", void 0);
+_ts_decorate([
+    Column(DataType.STRING)
+], DietMealRecipeIngredient.prototype, "displayUnit", void 0);
 DietMealRecipeIngredient = _ts_decorate([
     Table
 ], DietMealRecipeIngredient);

package/dist/lib/dbmodels/diet/DietMealRecipeIngredient.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/lib/dbmodels/diet/DietMealRecipeIngredient.ts"],"sourcesContent":["import {\n  BelongsTo,\n  Column,\n  DataType,\n  Default,\n  ForeignKey,\n  Index,\n  Model,\n  PrimaryKey,\n  Table,\n} from \"sequelize-typescript\";\nimport { DietMealRecipe } from \"./DietMealRecipe.js\";\nimport { Ingredient } from \"./Ingredient.js\";\n\n/**\n * DietMealRecipeIngredient\n *\n * Stores scaled ingredient amounts for recipes in diet meal plans.\n * This replaces the JSONB recipeJson approach with proper normalized data.\n *\n * Example:\n * - Recipe originally has 100g chicken\n * - Recipe is scaled by 1.5x for user's macros\n * - This table stores 150g chicken for this specific diet meal recipe instance\n */\n@Table\nexport class DietMealRecipeIngredient extends Model<DietMealRecipeIngredient> {\n  @PrimaryKey\n  @Default(DataType.UUIDV4)\n  @Column(DataType.UUID)\n  declare uuid: string;\n\n  @Index\n  @ForeignKey(() => DietMealRecipe)\n  @Column(DataType.UUID)\n  declare dietMealRecipeUuid: string;\n\n  @BelongsTo(() => DietMealRecipe)\n  declare dietMealRecipe: DietMealRecipe;\n\n  @Index\n  @ForeignKey(() => Ingredient)\n  @Column(DataType.UUID)\n  declare ingredientUuid: string;\n\n  @BelongsTo(() => Ingredient)\n  declare ingredient: Ingredient;\n\n  @Column(DataType.FLOAT)\n  declare grams: number;\n}\n"],"names":["BelongsTo","Column","DataType","Default","ForeignKey","Index","Model","PrimaryKey","Table","DietMealRecipe","Ingredient","DietMealRecipeIngredient","UUIDV4","UUID","FLOAT"],"mappings":";;;;;;AAAA,SACEA,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,UAAU,EACVC,KAAK,EACLC,KAAK,EACLC,UAAU,EACVC,KAAK,QACA,uBAAuB;AAC9B,SAASC,cAAc,QAAQ,sBAAsB;AACrD,SAASC,UAAU,QAAQ,kBAAkB;AAc7C,OAAO,MAAMC,iCAAiCL;AAwB9C;;;qBAtBoBM;oBACDC;;;;mBAICJ;oBACDI;;;kBAGAJ;;;;mBAICC;oBACDG;;;kBAGAH;;;oBAGAI"}
+{"version":3,"sources":["../../../../src/lib/dbmodels/diet/DietMealRecipeIngredient.ts"],"sourcesContent":["import {\n  BelongsTo,\n  Column,\n  DataType,\n  Default,\n  ForeignKey,\n  Index,\n  Model,\n  PrimaryKey,\n  Table,\n} from \"sequelize-typescript\";\nimport { DietMealRecipe } from \"./DietMealRecipe.js\";\nimport { Ingredient } from \"./Ingredient.js\";\n\n/**\n * DietMealRecipeIngredient\n *\n * Stores scaled ingredient amounts for recipes in diet meal plans.\n * This replaces the JSONB recipeJson approach with proper normalized data.\n *\n * Example:\n * - Recipe originally has 100g chicken\n * - Recipe is scaled by 1.5x for user's macros\n * - This table stores 150g chicken for this specific diet meal recipe instance\n */\n@Table\nexport class DietMealRecipeIngredient extends Model<DietMealRecipeIngredient> {\n  @PrimaryKey\n  @Default(DataType.UUIDV4)\n  @Column(DataType.UUID)\n  declare uuid: string;\n\n  @Index\n  @ForeignKey(() => DietMealRecipe)\n  @Column(DataType.UUID)\n  declare dietMealRecipeUuid: string;\n\n  @BelongsTo(() => DietMealRecipe)\n  declare dietMealRecipe: DietMealRecipe;\n\n  @Index\n  @ForeignKey(() => Ingredient)\n  @Column(DataType.UUID)\n  declare ingredientUuid: string;\n\n  @BelongsTo(() => Ingredient)\n  declare ingredient: Ingredient;\n\n  @Column(DataType.FLOAT)\n  declare grams: number;\n\n  // Display fields for user-friendly units\n  @Column(DataType.FLOAT)\n  declare displayAmount: number; // e.g., 2 (for \"2 eggs\")\n\n  @Column(DataType.STRING)\n  declare displayUnit: string; // e.g., \"large eggs\", \"g\", \"tbsp\"\n}\n"],"names":["BelongsTo","Column","DataType","Default","ForeignKey","Index","Model","PrimaryKey","Table","DietMealRecipe","Ingredient","DietMealRecipeIngredient","UUIDV4","UUID","FLOAT","STRING"],"mappings":";;;;;;AAAA,SACEA,SAAS,EACTC,MAAM,EACNC,QAAQ,EACRC,OAAO,EACPC,UAAU,EACVC,KAAK,EACLC,KAAK,EACLC,UAAU,EACVC,KAAK,QACA,uBAAuB;AAC9B,SAASC,cAAc,QAAQ,sBAAsB;AACrD,SAASC,UAAU,QAAQ,kBAAkB;AAc7C,OAAO,MAAMC,iCAAiCL;AA+B9C;;;qBA7BoBM;oBACDC;;;;mBAICJ;oBACDI;;;kBAGAJ;;;;mBAICC;oBACDG;;;kBAGAH;;;oBAGAI;;;oBAIAA;;;oBAGAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "90dc-core",
-  "version": "1.12.10",
+  "version": "1.12.12",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",