Arnaud
afff6cf9eb
- Substitute finder never applied the user's BYOK/admin AI key (only fell back to raw process.env), so it silently failed whenever the key was stored via settings rather than a literal env var. Now resolves via getDefaultProviderWithKey like every other AI route. Popover also surfaces real error messages instead of swallowing failures. - Ingredients with quantity 0 (salt, pepper, "to taste") rendered the literal digit "0" in cooking mode, print view, public recipe page, shopping lists, and serving scaler — several sites relied on generic truthiness/filter(Boolean), which doesn't catch a stored "0" string. Added a shared hasQuantity() helper and applied it everywhere quantity is rendered, plus in the AI recipe-chat context sent to the model. - Recipe chat panel rendered a duplicate close button on top of shadcn Sheet's own built-in close X, producing a garbled overlapping glyph. Removed the duplicate. - Recipe chat assistant replies are markdown from the model but were rendered as raw text; added react-markdown so formatting actually renders. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
53 lines
1.3 KiB
TypeScript
53 lines
1.3 KiB
TypeScript
const FRACTIONS: [number, string][] = [
|
|
[1 / 8, "⅛"],
|
|
[1 / 4, "¼"],
|
|
[1 / 3, "⅓"],
|
|
[3 / 8, "⅜"],
|
|
[1 / 2, "½"],
|
|
[5 / 8, "⅝"],
|
|
[2 / 3, "⅔"],
|
|
[3 / 4, "¾"],
|
|
[7 / 8, "⅞"],
|
|
];
|
|
|
|
export function formatQuantity(value: number): string {
|
|
if (value === 0) return "0";
|
|
|
|
const whole = Math.floor(value);
|
|
const decimal = value - whole;
|
|
|
|
if (decimal < 0.05) return whole === 0 ? "0" : String(whole);
|
|
if (decimal > 0.95) return String(whole + 1);
|
|
|
|
let bestFraction = "";
|
|
let bestDiff = Infinity;
|
|
for (const [frac, symbol] of FRACTIONS) {
|
|
const diff = Math.abs(decimal - frac);
|
|
if (diff < bestDiff) {
|
|
bestDiff = diff;
|
|
bestFraction = symbol;
|
|
}
|
|
}
|
|
|
|
if (bestDiff > 0.06) {
|
|
return value.toFixed(1);
|
|
}
|
|
|
|
return whole === 0 ? bestFraction : `${whole} ${bestFraction}`;
|
|
}
|
|
|
|
export function hasQuantity(quantity: string | null | undefined): boolean {
|
|
if (!quantity) return false;
|
|
const raw = parseFloat(quantity);
|
|
return !isNaN(raw) && raw !== 0;
|
|
}
|
|
|
|
export function scaleQuantity(baseQuantity: string | null, base: number, desired: number): string {
|
|
if (!baseQuantity) return "";
|
|
const raw = parseFloat(baseQuantity);
|
|
if (isNaN(raw)) return baseQuantity;
|
|
if (raw === 0) return "";
|
|
const scale = base === 0 ? 1 : desired / base;
|
|
return formatQuantity(raw * scale);
|
|
}
|