[gn] sub-recipes!

a-type · Jan 23, 2025 · dfc3332 · dfc3332
1 parent 4f197d1
commit dfc3332
Show file tree

Hide file tree

Showing 60 changed files with 2,320 additions and 690 deletions.
diff --git a/apps/gnocchi/conversion/src/lib/sanitize.ts b/apps/gnocchi/conversion/src/lib/sanitize.ts
@@ -13,4 +13,30 @@ export function sanitize(text: string) {
 }
 
 const removeLeadingChars = ['-', '*'];
-const removeCharsAnywhere = ['•', '□', '▪', '▫', '▢', '\n', '\r', '\t'];
+const removeCharsAnywhere = [
+	'•',
+	'□',
+	'▪',
+	'▫',
+	'▢',
+	'\n',
+	'\r',
+	'\t',
+	'▢',
+	'▣',
+	'▪',
+	'▫',
+	'◉',
+	'○',
+	'◌',
+	'●',
+	'◦',
+	'◯',
+	'◻',
+	'◼',
+	'◽',
+	'◾',
+	'☐',
+	'☑',
+	'☒',
+];
diff --git a/apps/gnocchi/conversion/src/lib/units.ts b/apps/gnocchi/conversion/src/lib/units.ts
@@ -22,8 +22,15 @@ export function lookupUnit(unitName: string | null): UnitDescription | null {
     return (
       unitName.toLowerCase() === abbr ||
       unitName.toLowerCase() === singular.toLowerCase() ||
-      unitName.toLowerCase() === plural.toLowerCase()
+      unitName.toLowerCase() === plural.toLowerCase() ||
+      unitName.toLowerCase() === translateBritish(singular.toLowerCase())
     );
   });
   return match || null;
 }
+
+function translateBritish(word: string) {
+  if (word.endsWith('re')) {
+    return word.slice(0, -2) + 'er';
+  }
+}
diff --git a/apps/gnocchi/verdant/src/client/client.d.ts b/apps/gnocchi/verdant/src/client/client.d.ts
@@ -882,6 +882,12 @@ export type RecipeLastCookedAt = number;
 export type RecipeLastAddedAt = number;
 export type RecipeAddIntervalGuess = number;
 export type RecipePinnedAt = number;
+export type RecipeSubRecipeMultipliers = ObjectEntity<
+  RecipeSubRecipeMultipliersInit,
+  RecipeSubRecipeMultipliersDestructured,
+  RecipeSubRecipeMultipliersSnapshot
+>;
+export type RecipeSubRecipeMultipliersValue = number;
 export type RecipeInit = {
   id?: string;
   slug?: string;
@@ -906,6 +912,7 @@ export type RecipeInit = {
   lastAddedAt?: number | null;
   addIntervalGuess?: number | null;
   pinnedAt?: number | null;
+  subRecipeMultipliers?: RecipeSubRecipeMultipliersInit;
 };
 
 export type RecipeIngredientsItemCommentsInit = string[];
@@ -936,6 +943,9 @@ export type RecipeSessionInit = {
   ingredientAssignments?: RecipeSessionIngredientAssignmentsInit;
 } | null;
 export type RecipeTagsInit = string[];
+export type RecipeSubRecipeMultipliersInit = {
+  [key: string]: RecipeSubRecipeMultipliersValueInit;
+};
 export type RecipeDestructured = {
   id: string;
   slug: string;
@@ -960,6 +970,7 @@ export type RecipeDestructured = {
   lastAddedAt: number | null;
   addIntervalGuess: number | null;
   pinnedAt: number | null;
+  subRecipeMultipliers: RecipeSubRecipeMultipliers;
 };
 
 export type RecipeIngredientsItemCommentsDestructured = string[];
@@ -990,6 +1001,9 @@ export type RecipeSessionDestructured = {
   ingredientAssignments: RecipeSessionIngredientAssignments;
 };
 export type RecipeTagsDestructured = string[];
+export type RecipeSubRecipeMultipliersDestructured = {
+  [key: string]: RecipeSubRecipeMultipliersValue | undefined;
+};
 export type RecipeSnapshot = {
   id: string;
   slug: string;
@@ -1014,6 +1028,7 @@ export type RecipeSnapshot = {
   lastAddedAt: number | null;
   addIntervalGuess: number | null;
   pinnedAt: number | null;
+  subRecipeMultipliers: RecipeSubRecipeMultipliersSnapshot;
 };
 
 export type RecipeIngredientsItemCommentsSnapshot = string[];
@@ -1044,6 +1059,9 @@ export type RecipeSessionSnapshot = {
   ingredientAssignments: RecipeSessionIngredientAssignmentsSnapshot;
 } | null;
 export type RecipeTagsSnapshot = string[];
+export type RecipeSubRecipeMultipliersSnapshot = {
+  [key: string]: RecipeSubRecipeMultipliersValueSnapshot;
+};
 
 /** Index filters for Recipe **/
 

diff --git a/apps/gnocchi/verdant/src/client/schema.d.ts b/apps/gnocchi/verdant/src/client/schema.d.ts
@@ -1,2 +1,2 @@
-export * from "./schemaVersions/v44.js";
-export { default } from "./schemaVersions/v44.js";
+export * from "./schemaVersions/v45.js";
+export { default } from "./schemaVersions/v45.js";
diff --git a/apps/gnocchi/verdant/src/client/schema.js b/apps/gnocchi/verdant/src/client/schema.js
@@ -1,3 +1,3 @@
-import schema from './schemaVersions/v44.js';
+import schema from './schemaVersions/v45.js';
 	const finalSchema = { wip: false, ...schema };
 	export default finalSchema;
diff --git a/apps/gnocchi/verdant/src/client/schemaVersions/index.js b/apps/gnocchi/verdant/src/client/schemaVersions/index.js
@@ -46,6 +46,7 @@ import v41 from './v41.js';
 import v42 from './v42.js';
 import v43 from './v43.js';
 import v44 from './v44.js';
+import v45 from './v45.js';
 
-export default [v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44]
+export default [v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45]