@recipe-book/core 0.1.0 → 0.1.2

package/dist/quantity/parse.js

@@ -8,45 +8,9 @@ import { findUnit, suggestUnit } from "../units/lookup.js";
 import { units } from "../units/registry.js";
 import { asRecord, checkFields, error, toResult } from "../validation.js";
 import { isPositive } from "./amount.js";
-var VULGAR_FRACTIONS = {
-  "\xBC": [1, 4],
-  "\xBD": [1, 2],
-  "\xBE": [3, 4],
-  "\u2150": [1, 7],
-  "\u2151": [1, 9],
-  "\u2152": [1, 10],
-  "\u2153": [1, 3],
-  "\u2154": [2, 3],
-  "\u2155": [1, 5],
-  "\u2156": [2, 5],
-  "\u2157": [3, 5],
-  "\u2158": [4, 5],
-  "\u2159": [1, 6],
-  "\u215A": [5, 6],
-  "\u215B": [1, 8],
-  "\u215C": [3, 8],
-  "\u215D": [5, 8],
-  "\u215E": [7, 8]
-};
+var VULGAR = "[\xBC-\xBE\u2150-\u215E]";
 var ARTICLE = /^an?\s+(?=\D)/i;
-var patterns;
-function getPatterns() {
-  return patterns ?? (patterns = compilePatterns());
-}
-function compilePatterns() {
-  const vulgar = `[${Object.keys(VULGAR_FRACTIONS).join("")}]`;
-  const slash = "[/\u2044]";
-  const number = String.raw`(?:\d+\s+)?\d+\s*${slash}\s*\d+|(?:\d+\s*)?${vulgar}|\d+(?:\.\d+)?|\.\d+`;
-  return {
-    amount: new RegExp(
-      String.raw`^(${number})(?:\s*[-–—]\s*(${number})|\s+to\s+(${number}))?`,
-      "i"
-    ),
-    asciiFraction: new RegExp(
-      String.raw`^(?:(\d+)\s+)?(\d+)\s*${slash}\s*(\d+)$`
-    )
-  };
-}
+var amountPattern;
 function parseQuantity(text) {
   const issues = [];
   if (typeof text !== "string") {
@@ -63,7 +27,8 @@ function parseQuantity(text) {
 }
 function readQuantity(issues, value, path) {
   if (typeof value === "string") {
-    return readQuantityText(issues, value, path);
+    const quantity = readQuantityText(issues, value, path);
+    return quantity && readTextAmount(issues, quantity.amount, path) ? quantity : void 0;
   }
   if (typeof value === "number") {
     const amount = readPositive(issues, value, path);
@@ -71,7 +36,35 @@ function readQuantity(issues, value, path) {
   }
   const record = asRecord(value);
   if (record) {
-    return readQuantityObject(issues, record, path);
+    checkFields(issues, record, { amount: true, unit: true }, path);
+    const amount = readAmount(issues, record.amount, [...path, "amount"]);
+    const { unit } = record;
+    if (unit === void 0) {
+      return amount === void 0 ? void 0 : { amount };
+    }
+    if (typeof unit !== "string") {
+      return error(
+        issues,
+        "invalid_type",
+        [...path, "unit"],
+        `Expected a unit such as "g" or "cup", received ${describeValue(unit)}.`
+      );
+    }
+    const id = findUnit(unit);
+    if (!id) {
+      const problem = unknownUnit(
+        unit,
+        amount === void 0 ? void 0 : typeof amount === "number" ? String(amount) : `{ amount: { min: ${amount.min}, max: ${amount.max} } }`
+      );
+      return error(
+        issues,
+        problem.code,
+        [...path, "unit"],
+        problem.message,
+        problem.suggestion
+      );
+    }
+    return amount === void 0 ? void 0 : { amount, unit: id };
   }
   return error(
     issues,
@@ -126,12 +119,18 @@ function matchAmount(text, allowZero) {
   if (article) {
     return { amount: 1, amountText: "1", rest: text.slice(article[0].length) };
   }
-  const match = getPatterns().amount.exec(text);
+  if (!amountPattern) {
+    const number = String.raw`(?:\d+\s+)?\d+\s*[/⁄]\s*\d+|(?:\d+\s*)?${VULGAR}|\d+(?:\.\d+)?|\.\d+`;
+    amountPattern = new RegExp(
+      String.raw`^(${number})(?:(?:\s*[-–—]\s*|\s+to\s+)(${number}))?`,
+      "i"
+    );
+  }
+  const match = amountPattern.exec(text);
   if (!match) {
     return void 0;
   }
-  const [matched, lowText = "", highTextDash, highTextTo] = match;
-  const highText = highTextDash ?? highTextTo;
+  const [matched, lowText = "", highText] = match;
   const low = toNumber(lowText);
   const high = highText === void 0 ? low : toNumber(highText);
   if (low === Infinity || high === Infinity) {
@@ -177,50 +176,25 @@ function unreadable(text) {
     message: text === "" ? 'Expected a quantity such as "1 \xBD cups", received an empty string.' : `Couldn't read ${quote(text)}. Use a number or fraction, e.g. "1 \xBD cups".`
   };
 }
+var fractions = /* @__PURE__ */ new Map();
 function toNumber(text) {
-  const ascii = getPatterns().asciiFraction.exec(text);
+  const ascii = /^(?:(\d+)\s+)?(\d+)\s*[/⁄]\s*(\d+)$/.exec(text);
   if (ascii) {
     const [, whole = "0", numerator, denominator] = ascii;
     return Number(whole) + Number(numerator) / (Number(denominator) || NaN);
   }
-  const vulgar = VULGAR_FRACTIONS[text.slice(-1)];
-  if (vulgar) {
-    const [numerator, denominator] = vulgar;
-    return Number(text.slice(0, -1)) + numerator / denominator;
+  const last = text.slice(-1);
+  if (last > "9") {
+    let fraction = fractions.get(last);
+    if (fraction === void 0) {
+      const [numerator, denominator] = last.normalize("NFKD").split("\u2044");
+      fraction = Number(numerator) / Number(denominator);
+      fractions.set(last, fraction);
+    }
+    return Number(text.slice(0, -1)) + fraction;
   }
   return Number(text);
 }
-function readQuantityObject(issues, record, path) {
-  checkFields(issues, record, { amount: true, unit: true }, path);
-  const amount = readAmount(issues, record.amount, [...path, "amount"]);
-  const { unit } = record;
-  if (unit === void 0) {
-    return amount === void 0 ? void 0 : { amount };
-  }
-  if (typeof unit !== "string") {
-    return error(
-      issues,
-      "invalid_type",
-      [...path, "unit"],
-      `Expected a unit such as "g" or "cup", received ${describeValue(unit)}.`
-    );
-  }
-  const id = findUnit(unit);
-  if (!id) {
-    const problem = unknownUnit(
-      unit,
-      amount === void 0 ? void 0 : typeof amount === "number" ? String(amount) : `{ amount: { min: ${amount.min}, max: ${amount.max} } }`
-    );
-    return error(
-      issues,
-      problem.code,
-      [...path, "unit"],
-      problem.message,
-      problem.suggestion
-    );
-  }
-  return amount === void 0 ? void 0 : { amount, unit: id };
-}
 function readAmount(issues, value, path) {
   if (value === void 0) {
     return error(
@@ -259,16 +233,19 @@ function readAmount(issues, value, path) {
   );
 }
 function readPositive(issues, value, path) {
-  if (isPositive(value)) {
+  if (isPositive(value) && value >= 1e-300 && value <= 1e290) {
     return value;
   }
   return error(
     issues,
     typeof value === "number" ? "invalid_amount" : "invalid_type",
     path,
-    `Expected a positive number, received ${describeValue(value)}.`
+    isPositive(value) ? `Expected a number from 1e-300 to 1e290, received ${describeValue(value)}.` : `Expected a positive number, received ${describeValue(value)}.`
   );
 }
+function readTextAmount(issues, amount, path) {
+  return (typeof amount === "number" ? [amount] : [amount.min, amount.max]).every((end) => readPositive(issues, end, path) !== void 0);
+}
 export {
   matchAmount,
   parseQuantity,

package/dist/quantity/parse.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/quantity/parse.ts"],"sourcesContent":["import {\n  describeValue,\n  MAX_ECHOED,\n  type ParseResult,\n  quote,\n  type RecipeIssue,\n  type RecipeIssueCode,\n} from '../errors'\nimport type { Path } from '../issues'\nimport { findUnit, suggestUnit } from '../units/lookup'\nimport { units } from '../units/registry'\nimport { asRecord, checkFields, error, toResult } from '../validation'\nimport { isPositive } from './amount'\nimport type { Amount, Quantity } from './types'\n\nconst VULGAR_FRACTIONS: Readonly<Record<string, readonly [number, number]>> = {\n  '¼': [1, 4],\n  '½': [1, 2],\n  '¾': [3, 4],\n  '⅐': [1, 7],\n  '⅑': [1, 9],\n  '⅒': [1, 10],\n  '⅓': [1, 3],\n  '⅔': [2, 3],\n  '⅕': [1, 5],\n  '⅖': [2, 5],\n  '⅗': [3, 5],\n  '⅘': [4, 5],\n  '⅙': [1, 6],\n  '⅚': [5, 6],\n  '⅛': [1, 8],\n  '⅜': [3, 8],\n  '⅝': [5, 8],\n  '⅞': [7, 8],\n}\n\nconst ARTICLE = /^an?\\s+(?=\\D)/i\n\nlet patterns: ReturnType<typeof compilePatterns> | undefined\n\nfunction getPatterns() {\n  return (patterns ??= compilePatterns())\n}\n\nfunction compilePatterns() {\n  const vulgar = `[${Object.keys(VULGAR_FRACTIONS).join('')}]`\n  const slash = '[/⁄]'\n  // Alternatives are tried in order, so a fraction with an optional whole\n  // number, as in \"1 1/2\", \"1/2\", \"1½\" or \"½\", comes before decimals and\n  // integers.\n  const number = String.raw`(?:\\d+\\s+)?\\d+\\s*${slash}\\s*\\d+|(?:\\d+\\s*)?${vulgar}|\\d+(?:\\.\\d+)?|\\.\\d+`\n\n  return {\n    amount: new RegExp(\n      String.raw`^(${number})(?:\\s*[-–—]\\s*(${number})|\\s+to\\s+(${number}))?`,\n      'i',\n    ),\n    asciiFraction: new RegExp(\n      String.raw`^(?:(\\d+)\\s+)?(\\d+)\\s*${slash}\\s*(\\d+)$`,\n    ),\n  }\n}\n\nexport type Problem = {\n  code: RecipeIssueCode\n  message: string\n  suggestion?: string\n}\n\n/** An amount read from the start of text, as written, and the text after it. */\ntype AmountMatch = { amount: Amount; amountText: string; rest: string }\n\n/**\n * Parses quantity text, such as `'1 ½ cups'`, `'2-3 tbsp'`, `'a pinch'`, or\n * `'3'` for a bare count. Never throws.\n *\n * Accepts whole numbers, decimals, fractions (`1/2`, `½`, also with the\n * fraction slash `⁄`), mixed numbers (`1 1/2`, `1½`) and ranges (`2-3`, `2–3`,\n * `2 to 3`), each followed by an optional unit alias, and `a` or `an` for 1\n * before a unit alias, as in `'a pinch'`.\n *\n * @example\n * parseQuantity('1 ½ cups') // { success: true, data: { amount: 1.5, unit: 'cup' }, warnings: [] }\n *\n * const result = parseQuantity('2 cupz')\n * if (!result.success) {\n *   result.error.message // '\"2 cupz\" has 1 problem:\\n  ✖ (root)  Unknown unit \"cupz\". Did you mean \"cups\"?\\nSee https://recipe-book.siraj.page/errors/invalid_quantity'\n * }\n */\nexport function parseQuantity(text: string): ParseResult<Quantity> {\n  const issues: RecipeIssue[] = []\n\n  if (typeof text !== 'string') {\n    error(\n      issues,\n      'invalid_type',\n      [],\n      `Expected quantity text such as \"1 ½ cups\", received ${describeValue(text)}.`,\n    )\n    return toResult<Quantity>('invalid_quantity', undefined, issues)\n  }\n\n  const quantity = readQuantityText(issues, text, [])\n  return toResult('invalid_quantity', quantity, issues, quote(text))\n}\n\n/** Reads a quantity in any input form: text, a number, or `{ amount, unit }`. */\nexport function readQuantity(\n  issues: RecipeIssue[],\n  value: unknown,\n  path: Path,\n): Quantity | undefined {\n  if (typeof value === 'string') {\n    return readQuantityText(issues, value, path)\n  }\n\n  if (typeof value === 'number') {\n    const amount = readPositive(issues, value, path)\n    return amount === undefined ? undefined : { amount }\n  }\n\n  const record = asRecord(value)\n  if (record) {\n    return readQuantityObject(issues, record, path)\n  }\n\n  return error(\n    issues,\n    'invalid_type',\n    path,\n    `Expected a quantity such as \"2 cups\", 2, or { amount: 2, unit: \"cup\" }, received ${describeValue(value)}.`,\n  )\n}\n\nfunction readQuantityText(\n  issues: RecipeIssue[],\n  text: string,\n  path: Path,\n): Quantity | undefined {\n  const result = parseText(text.replace(/\\s+/g, ' ').trim())\n\n  if ('code' in result) {\n    return error(issues, result.code, path, result.message, result.suggestion)\n  }\n\n  return result\n}\n\nfunction parseText(text: string): Quantity | Problem {\n  const match = matchAmount(text)\n\n  if (!match) {\n    const unit = findUnit(text)\n    return unit\n      ? {\n          code: 'invalid_quantity',\n          message: `${quote(text)} has no amount. Write a full quantity, e.g. \"1 ${units[unit].labels.short.one}\".`,\n        }\n      : unreadable(text)\n  }\n\n  if ('code' in match) {\n    return match\n  }\n\n  const { amount, amountText, rest: unitText } = match\n\n  if (unitText === '') {\n    return { amount }\n  }\n\n  if (/\\d/.test(unitText) || !/\\p{L}/u.test(unitText)) {\n    return unreadable(text)\n  }\n\n  const unit = findUnit(unitText)\n  if (unit) {\n    return { amount, unit }\n  }\n\n  return unknownUnit(\n    unitText,\n    amountText.length <= MAX_ECHOED && /^\\d+(?:\\.\\d+)?$/.test(amountText)\n      ? amountText\n      : quote(amountText),\n  )\n}\n\n/**\n * Reads the amount that starts `text`, which is trimmed with single spaces: a\n * number, fraction, mixed number, range, or \"a\" or \"an\" for 1. A comma between\n * digits anywhere in the text, as in \"1,5\", is a problem. Otherwise returns\n * `undefined` when the text doesn't start with an amount, and a problem when\n * the amount is too large to read, isn't greater than 0 (0 is allowed with\n * `allowZero`), or is a range whose low end is above its high end.\n */\nexport function matchAmount(\n  text: string,\n  allowZero?: boolean,\n): AmountMatch | Problem | undefined {\n  // \"1,5\" is a decimal in much of Europe and \"1,500\" a thousands separator in\n  // the US, so neither is guessed.\n  if (/\\d,\\d/.test(text)) {\n    return {\n      code: 'invalid_quantity',\n      message: `Couldn't read ${quote(text)}. Write decimals with a period, e.g. \"1.5\", and leave out thousands separators.`,\n    }\n  }\n\n  const article = ARTICLE.exec(text)\n  if (article) {\n    return { amount: 1, amountText: '1', rest: text.slice(article[0].length) }\n  }\n\n  const match = getPatterns().amount.exec(text)\n  if (!match) {\n    return undefined\n  }\n\n  const [matched, lowText = '', highTextDash, highTextTo] = match\n  const highText = highTextDash ?? highTextTo\n  const low = toNumber(lowText)\n  const high = highText === undefined ? low : toNumber(highText)\n\n  if (low === Infinity || high === Infinity) {\n    return {\n      code: 'invalid_amount',\n      message: `${quote(text)} has an amount too large to read. Check it for extra digits.`,\n    }\n  }\n\n  if (\n    !(isPositive(low) || (allowZero && low === 0)) ||\n    !(isPositive(high) || (allowZero && high === 0))\n  ) {\n    return {\n      code: 'invalid_amount',\n      message: `Expected a positive amount, received ${quote(text)}.`,\n    }\n  }\n\n  if (low > high) {\n    const mixedHint =\n      /^\\d+$/.test(lowText) && high < 1\n        ? ` To write a mixed number, use ${quote(`${lowText} ${highText}`)}.`\n        : ''\n    return {\n      code: 'invalid_range',\n      message: `Range minimum (${truncateNumber(lowText)}) must be less than maximum (${truncateNumber(highText!)}).${mixedHint}`,\n    }\n  }\n\n  return {\n    amount: low === high ? low : { min: low, max: high },\n    amountText: matched,\n    rest: text.slice(matched.length).trim(),\n  }\n}\n\n/**\n * The `unknown_unit` problem. `quantity` is the line's quantity without the\n * unit, as it would be written in `RecipeInput`, for the \"move the word into\n * the name\" fix.\n */\nfunction unknownUnit(unitText: string, quantity: string | undefined): Problem {\n  const suggestion = suggestUnit(unitText)\n  const move =\n    quantity === undefined\n      ? 'move the word into the name'\n      : `move the word into the name: { name: ${quote(unitText)}, quantity: ${quantity} }`\n\n  return {\n    code: 'unknown_unit',\n    message: suggestion\n      ? `Unknown unit ${quote(unitText)}. Did you mean \"${suggestion}\"?`\n      : `Unknown unit ${quote(unitText)}. Use a known unit, or ${move}.`,\n    ...(suggestion && { suggestion }),\n  }\n}\n\nfunction truncateNumber(text: string): string {\n  return text.length > 20 ? `${text.slice(0, 19)}…` : text\n}\n\nfunction unreadable(text: string): Problem {\n  return {\n    code: 'invalid_quantity',\n    message:\n      text === ''\n        ? 'Expected a quantity such as \"1 ½ cups\", received an empty string.'\n        : `Couldn't read ${quote(text)}. Use a number or fraction, e.g. \"1 ½ cups\".`,\n  }\n}\n\nfunction toNumber(text: string): number {\n  const ascii = getPatterns().asciiFraction.exec(text)\n  if (ascii) {\n    const [, whole = '0', numerator, denominator] = ascii\n    // A zero denominator reads as NaN, not Infinity, so \"1/0\" isn't too large.\n    return Number(whole) + Number(numerator) / (Number(denominator) || NaN)\n  }\n\n  const vulgar = VULGAR_FRACTIONS[text.slice(-1)]\n  if (vulgar) {\n    const [numerator, denominator] = vulgar\n    // Before a glyph is a whole number and any spaces, or nothing, which\n    // Number reads as 0.\n    return Number(text.slice(0, -1)) + numerator / denominator\n  }\n\n  return Number(text)\n}\n\nfunction readQuantityObject(\n  issues: RecipeIssue[],\n  record: Record<string, unknown>,\n  path: Path,\n): Quantity | undefined {\n  checkFields(issues, record, { amount: true, unit: true }, path)\n\n  const amount = readAmount(issues, record.amount, [...path, 'amount'])\n  const { unit } = record\n\n  if (unit === undefined) {\n    return amount === undefined ? undefined : { amount }\n  }\n\n  if (typeof unit !== 'string') {\n    return error(\n      issues,\n      'invalid_type',\n      [...path, 'unit'],\n      `Expected a unit such as \"g\" or \"cup\", received ${describeValue(unit)}.`,\n    )\n  }\n\n  const id = findUnit(unit)\n\n  if (!id) {\n    const problem = unknownUnit(\n      unit,\n      amount === undefined\n        ? undefined\n        : typeof amount === 'number'\n          ? String(amount)\n          : `{ amount: { min: ${amount.min}, max: ${amount.max} } }`,\n    )\n    return error(\n      issues,\n      problem.code,\n      [...path, 'unit'],\n      problem.message,\n      problem.suggestion,\n    )\n  }\n\n  return amount === undefined ? undefined : { amount, unit: id }\n}\n\nfunction readAmount(\n  issues: RecipeIssue[],\n  value: unknown,\n  path: Path,\n): Amount | undefined {\n  if (value === undefined) {\n    return error(\n      issues,\n      'missing_field',\n      path,\n      'Add an amount, e.g. { amount: 2, unit: \"cup\" }.',\n    )\n  }\n\n  if (typeof value === 'number') {\n    return readPositive(issues, value, path)\n  }\n\n  const range = asRecord(value)\n  if (range && 'min' in range && 'max' in range) {\n    checkFields(issues, range, { min: true, max: true }, path)\n\n    const min = readPositive(issues, range.min, [...path, 'min'])\n    const max = readPositive(issues, range.max, [...path, 'max'])\n\n    if (min === undefined || max === undefined) {\n      return undefined\n    }\n\n    if (min > max) {\n      return error(\n        issues,\n        'invalid_range',\n        path,\n        `Range minimum (${min}) must be less than maximum (${max}).`,\n      )\n    }\n\n    return min === max ? min : { min, max }\n  }\n\n  return error(\n    issues,\n    'invalid_type',\n    path,\n    `Expected a number or { min, max }, received ${describeValue(value)}.`,\n  )\n}\n\nexport function readPositive(\n  issues: RecipeIssue[],\n  value: unknown,\n  path: Path,\n): number | undefined {\n  if (isPositive(value)) {\n    return value\n  }\n\n  return error(\n    issues,\n    typeof value === 'number' ? 'invalid_amount' : 'invalid_type',\n    path,\n    `Expected a positive number, received ${describeValue(value)}.`,\n  )\n}\n"],"mappings":"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","names":["unit"]}
+{"version":3,"sources":["../../src/quantity/parse.ts"],"sourcesContent":["import {\n  describeValue,\n  MAX_ECHOED,\n  type ParseResult,\n  quote,\n  type RecipeIssue,\n  type RecipeIssueCode,\n} from '../errors'\nimport type { Path } from '../issues'\nimport { findUnit, suggestUnit } from '../units/lookup'\nimport { units } from '../units/registry'\nimport { asRecord, checkFields, error, toResult } from '../validation'\nimport { isPositive } from './amount'\nimport type { Amount, Quantity } from './types'\n\n// ¼, ½, ¾ and ⅐ to ⅞, which decompose to their fractions, such as '½' to\n// '1⁄2'. ⅟ has no denominator, and ↉ is zero.\nconst VULGAR = '[¼-¾⅐-⅞]'\n\nconst ARTICLE = /^an?\\s+(?=\\D)/i\n\nlet amountPattern: RegExp | undefined\n\nexport type Problem = {\n  code: RecipeIssueCode\n  message: string\n  suggestion?: string\n}\n\n/**\n * Parses quantity text, such as `'1 ½ cups'`, `'2-3 tbsp'`, `'a pinch'`, or\n * `'3'` for a bare count. Never throws.\n *\n * Accepts whole numbers, decimals, fractions (`1/2`, `½`, also with the\n * fraction slash `⁄`), mixed numbers (`1 1/2`, `1½`) and ranges (`2-3`, `2–3`,\n * `2 to 3`), each followed by an optional unit alias, and `a` or `an` for 1\n * before a unit alias, as in `'a pinch'`.\n *\n * @example\n * parseQuantity('1 ½ cups') // { success: true, data: { amount: 1.5, unit: 'cup' }, warnings: [] }\n *\n * const result = parseQuantity('2 cupz')\n * if (!result.success) {\n *   result.error.message // '\"2 cupz\" has 1 problem:\\n  ✖ (root)  Unknown unit \"cupz\". Did you mean \"cups\"?\\nSee https://recipe-book.siraj.page/errors/invalid_quantity/'\n * }\n */\nexport function parseQuantity(text: string): ParseResult<Quantity> {\n  const issues: RecipeIssue[] = []\n\n  if (typeof text !== 'string') {\n    error(\n      issues,\n      'invalid_type',\n      [],\n      `Expected quantity text such as \"1 ½ cups\", received ${describeValue(text)}.`,\n    )\n    return toResult<Quantity>('invalid_quantity', undefined, issues)\n  }\n\n  const quantity = readQuantityText(issues, text, [])\n  return toResult('invalid_quantity', quantity, issues, quote(text))\n}\n\n/** Reads a quantity in any input form: text, a number, or `{ amount, unit }`. */\nexport function readQuantity(\n  issues: RecipeIssue[],\n  value: unknown,\n  path: Path,\n): Quantity | undefined {\n  if (typeof value === 'string') {\n    const quantity = readQuantityText(issues, value, path)\n    return quantity && readTextAmount(issues, quantity.amount, path)\n      ? quantity\n      : undefined\n  }\n\n  if (typeof value === 'number') {\n    const amount = readPositive(issues, value, path)\n    return amount === undefined ? undefined : { amount }\n  }\n\n  const record = asRecord(value)\n  if (record) {\n    checkFields(issues, record, { amount: true, unit: true }, path)\n\n    const amount = readAmount(issues, record.amount, [...path, 'amount'])\n    const { unit } = record\n\n    if (unit === undefined) {\n      return amount === undefined ? undefined : { amount }\n    }\n\n    if (typeof unit !== 'string') {\n      return error(\n        issues,\n        'invalid_type',\n        [...path, 'unit'],\n        `Expected a unit such as \"g\" or \"cup\", received ${describeValue(unit)}.`,\n      )\n    }\n\n    const id = findUnit(unit)\n\n    if (!id) {\n      const problem = unknownUnit(\n        unit,\n        amount === undefined\n          ? undefined\n          : typeof amount === 'number'\n            ? String(amount)\n            : `{ amount: { min: ${amount.min}, max: ${amount.max} } }`,\n      )\n      return error(\n        issues,\n        problem.code,\n        [...path, 'unit'],\n        problem.message,\n        problem.suggestion,\n      )\n    }\n\n    return amount === undefined ? undefined : { amount, unit: id }\n  }\n\n  return error(\n    issues,\n    'invalid_type',\n    path,\n    `Expected a quantity such as \"2 cups\", 2, or { amount: 2, unit: \"cup\" }, received ${describeValue(value)}.`,\n  )\n}\n\nfunction readQuantityText(\n  issues: RecipeIssue[],\n  text: string,\n  path: Path,\n): Quantity | undefined {\n  const result = parseText(text.replace(/\\s+/g, ' ').trim())\n\n  if ('code' in result) {\n    return error(issues, result.code, path, result.message, result.suggestion)\n  }\n\n  return result\n}\n\nfunction parseText(text: string): Quantity | Problem {\n  const match = matchAmount(text)\n\n  if (!match) {\n    const unit = findUnit(text)\n    return unit\n      ? {\n          code: 'invalid_quantity',\n          message: `${quote(text)} has no amount. Write a full quantity, e.g. \"1 ${units[unit].labels.short.one}\".`,\n        }\n      : unreadable(text)\n  }\n\n  if ('code' in match) {\n    return match\n  }\n\n  const { amount, amountText, rest: unitText } = match\n\n  if (unitText === '') {\n    return { amount }\n  }\n\n  if (/\\d/.test(unitText) || !/\\p{L}/u.test(unitText)) {\n    return unreadable(text)\n  }\n\n  const unit = findUnit(unitText)\n  if (unit) {\n    return { amount, unit }\n  }\n\n  return unknownUnit(\n    unitText,\n    amountText.length <= MAX_ECHOED && /^\\d+(?:\\.\\d+)?$/.test(amountText)\n      ? amountText\n      : quote(amountText),\n  )\n}\n\n/**\n * Reads the amount that starts `text`, which is trimmed with single spaces: a\n * number, fraction, mixed number, range, or \"a\" or \"an\" for 1. A comma between\n * digits anywhere in the text, as in \"1,5\", is a problem. Otherwise returns\n * `undefined` when the text doesn't start with an amount, and a problem when\n * the amount is too large to read, isn't greater than 0 (0 is allowed with\n * `allowZero`), or is a range whose low end is above its high end. When it\n * reads one, it returns the amount, its text as written, and the text after it.\n */\nexport function matchAmount(\n  text: string,\n  allowZero?: boolean,\n): { amount: Amount; amountText: string; rest: string } | Problem | undefined {\n  // \"1,5\" is a decimal in much of Europe and \"1,500\" a thousands separator in\n  // the US, so neither is guessed.\n  if (/\\d,\\d/.test(text)) {\n    return {\n      code: 'invalid_quantity',\n      message: `Couldn't read ${quote(text)}. Write decimals with a period, e.g. \"1.5\", and leave out thousands separators.`,\n    }\n  }\n\n  const article = ARTICLE.exec(text)\n  if (article) {\n    return { amount: 1, amountText: '1', rest: text.slice(article[0].length) }\n  }\n\n  if (!amountPattern) {\n    // Alternatives are tried in order, so a fraction with an optional whole\n    // number, as in \"1 1/2\", \"1/2\", \"1½\" or \"½\", comes before decimals and\n    // integers.\n    const number = String.raw`(?:\\d+\\s+)?\\d+\\s*[/⁄]\\s*\\d+|(?:\\d+\\s*)?${VULGAR}|\\d+(?:\\.\\d+)?|\\.\\d+`\n    amountPattern = new RegExp(\n      String.raw`^(${number})(?:(?:\\s*[-–—]\\s*|\\s+to\\s+)(${number}))?`,\n      'i',\n    )\n  }\n\n  const match = amountPattern.exec(text)\n  if (!match) {\n    return undefined\n  }\n\n  const [matched, lowText = '', highText] = match\n  const low = toNumber(lowText)\n  const high = highText === undefined ? low : toNumber(highText)\n\n  if (low === Infinity || high === Infinity) {\n    return {\n      code: 'invalid_amount',\n      message: `${quote(text)} has an amount too large to read. Check it for extra digits.`,\n    }\n  }\n\n  if (\n    !(isPositive(low) || (allowZero && low === 0)) ||\n    !(isPositive(high) || (allowZero && high === 0))\n  ) {\n    return {\n      code: 'invalid_amount',\n      message: `Expected a positive amount, received ${quote(text)}.`,\n    }\n  }\n\n  if (low > high) {\n    const mixedHint =\n      /^\\d+$/.test(lowText) && high < 1\n        ? ` To write a mixed number, use ${quote(`${lowText} ${highText}`)}.`\n        : ''\n    return {\n      code: 'invalid_range',\n      message: `Range minimum (${truncateNumber(lowText)}) must be less than maximum (${truncateNumber(highText!)}).${mixedHint}`,\n    }\n  }\n\n  return {\n    amount: low === high ? low : { min: low, max: high },\n    amountText: matched,\n    rest: text.slice(matched.length).trim(),\n  }\n}\n\n/**\n * The `unknown_unit` problem. `quantity` is the line's quantity without the\n * unit, as it would be written in `RecipeInput`, for the \"move the word into\n * the name\" fix.\n */\nfunction unknownUnit(unitText: string, quantity: string | undefined): Problem {\n  const suggestion = suggestUnit(unitText)\n  const move =\n    quantity === undefined\n      ? 'move the word into the name'\n      : `move the word into the name: { name: ${quote(unitText)}, quantity: ${quantity} }`\n\n  return {\n    code: 'unknown_unit',\n    message: suggestion\n      ? `Unknown unit ${quote(unitText)}. Did you mean \"${suggestion}\"?`\n      : `Unknown unit ${quote(unitText)}. Use a known unit, or ${move}.`,\n    ...(suggestion && { suggestion }),\n  }\n}\n\nfunction truncateNumber(text: string): string {\n  return text.length > 20 ? `${text.slice(0, 19)}…` : text\n}\n\nfunction unreadable(text: string): Problem {\n  return {\n    code: 'invalid_quantity',\n    message:\n      text === ''\n        ? 'Expected a quantity such as \"1 ½ cups\", received an empty string.'\n        : `Couldn't read ${quote(text)}. Use a number or fraction, e.g. \"1 ½ cups\".`,\n  }\n}\n\n// Decomposing a glyph is slow, so each glyph's value is read once.\nconst fractions = new Map<string, number>()\n\nfunction toNumber(text: string): number {\n  // The `[/⁄]` must match the one in `amountPattern`.\n  const ascii = /^(?:(\\d+)\\s+)?(\\d+)\\s*[/⁄]\\s*(\\d+)$/.exec(text)\n  if (ascii) {\n    const [, whole = '0', numerator, denominator] = ascii\n    // A zero denominator reads as NaN, not Infinity, so \"1/0\" isn't too large.\n    return Number(whole) + Number(numerator) / (Number(denominator) || NaN)\n  }\n\n  // Amounts end in a digit or a glyph.\n  const last = text.slice(-1)\n  if (last > '9') {\n    let fraction = fractions.get(last)\n    if (fraction === undefined) {\n      const [numerator, denominator] = last.normalize('NFKD').split('⁄')\n      fraction = Number(numerator) / Number(denominator)\n      fractions.set(last, fraction)\n    }\n    // Before a glyph is a whole number and any spaces, or nothing, which\n    // Number reads as 0.\n    return Number(text.slice(0, -1)) + fraction\n  }\n\n  return Number(text)\n}\n\nfunction readAmount(\n  issues: RecipeIssue[],\n  value: unknown,\n  path: Path,\n): Amount | undefined {\n  if (value === undefined) {\n    return error(\n      issues,\n      'missing_field',\n      path,\n      'Add an amount, e.g. { amount: 2, unit: \"cup\" }.',\n    )\n  }\n\n  if (typeof value === 'number') {\n    return readPositive(issues, value, path)\n  }\n\n  const range = asRecord(value)\n  if (range && 'min' in range && 'max' in range) {\n    checkFields(issues, range, { min: true, max: true }, path)\n\n    const min = readPositive(issues, range.min, [...path, 'min'])\n    const max = readPositive(issues, range.max, [...path, 'max'])\n\n    if (min === undefined || max === undefined) {\n      return undefined\n    }\n\n    if (min > max) {\n      return error(\n        issues,\n        'invalid_range',\n        path,\n        `Range minimum (${min}) must be less than maximum (${max}).`,\n      )\n    }\n\n    return min === max ? min : { min, max }\n  }\n\n  return error(\n    issues,\n    'invalid_type',\n    path,\n    `Expected a number or { min, max }, received ${describeValue(value)}.`,\n  )\n}\n\n/**\n * Reads a number from 1e-300 to 1e290. Scaling by 1e-6 to 1e6 and converting\n * between any two units in the registry keeps an amount in that range finite\n * and greater than 0.\n */\nexport function readPositive(\n  issues: RecipeIssue[],\n  value: unknown,\n  path: Path,\n): number | undefined {\n  if (isPositive(value) && value >= 1e-300 && value <= 1e290) {\n    return value\n  }\n\n  return error(\n    issues,\n    typeof value === 'number' ? 'invalid_amount' : 'invalid_type',\n    path,\n    isPositive(value)\n      ? `Expected a number from 1e-300 to 1e290, received ${describeValue(value)}.`\n      : `Expected a positive number, received ${describeValue(value)}.`,\n  )\n}\n\n/** Checks each end of an amount read from text with `readPositive`. */\nfunction readTextAmount(\n  issues: RecipeIssue[],\n  amount: Amount,\n  path: Path,\n): boolean {\n  return (\n    typeof amount === 'number' ? [amount] : [amount.min, amount.max]\n  ).every((end) => readPositive(issues, end, path) !== undefined)\n}\n"],"mappings":"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","names":["unit"]}

package/dist/quantity/scale.js

@@ -2,12 +2,15 @@
 import {
   checkFactor,
   checkQuantity,
+  checkResult,
   mapAmount
 } from "./amount.js";
 function scaleQuantity(quantity, factor) {
-  checkQuantity("scaleQuantity", quantity);
+  const amount = checkQuantity("scaleQuantity", quantity);
   checkFactor("scaleQuantity", "factor", factor);
-  return multiply(quantity, factor);
+  const result = multiply({ amount, unit: quantity.unit }, factor);
+  checkResult("scaleQuantity", result.amount);
+  return result;
 }
 function multiply(quantity, factor) {
   const amount = mapAmount(quantity.amount, (value) => value * factor);

package/dist/quantity/scale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/quantity/scale.ts"],"sourcesContent":["import type { UnitId } from '../units/registry'\nimport {\n  checkFactor,\n  checkQuantity,\n  mapAmount,\n  type SameAmount,\n} from './amount'\nimport type { Amount, Quantity } from './types'\n\n/**\n * Multiplies a quantity by `factor`. Both ends of a range scale, the unit is\n * kept, and nothing is rounded.\n *\n * @throws {RecipeBookError} `invalid_argument` when `factor` is not a finite\n *   number greater than 0, `quantity` isn't a quantity object, the amount is\n *   not a finite number greater than 0 or a range of them, a range's `min`\n *   isn't less than its `max`, or the quantity has `max` set, as a `Servings`\n *   or `Yield` has. `resolveRecipe` scales those. The unit isn't checked.\n *\n * @example\n * scaleQuantity({ amount: 1.5, unit: 'cup' }, 2) // { amount: 3, unit: 'cup' }\n * scaleQuantity({ amount: { min: 2, max: 3 }, unit: 'tbsp' }, 2) // { amount: { min: 4, max: 6 }, unit: 'tbsp' }\n */\nexport function scaleQuantity<A extends Amount>(\n  quantity: Quantity & { amount: A },\n  factor: number,\n): { amount: SameAmount<A>; unit?: UnitId | undefined } {\n  checkQuantity('scaleQuantity', quantity)\n  checkFactor('scaleQuantity', 'factor', factor)\n\n  return multiply(quantity, factor)\n}\n\n/** {@link scaleQuantity} without argument checks. */\nexport function multiply<A extends Amount>(\n  quantity: Quantity & { amount: A },\n  factor: number,\n): { amount: SameAmount<A>; unit?: UnitId | undefined } {\n  const amount = mapAmount(quantity.amount, (value) => value * factor)\n  return quantity.unit === undefined\n    ? { amount }\n    : { amount, unit: quantity.unit }\n}\n"],"mappings":";AACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AAiBA,SAAS,cACd,UACA,QACsD;AACtD,gBAAc,iBAAiB,QAAQ;AACvC,cAAY,iBAAiB,UAAU,MAAM;AAE7C,SAAO,SAAS,UAAU,MAAM;AAClC;AAGO,SAAS,SACd,UACA,QACsD;AACtD,QAAM,SAAS,UAAU,SAAS,QAAQ,CAAC,UAAU,QAAQ,MAAM;AACnE,SAAO,SAAS,SAAS,SACrB,EAAE,OAAO,IACT,EAAE,QAAQ,MAAM,SAAS,KAAK;AACpC;","names":[]}
+{"version":3,"sources":["../../src/quantity/scale.ts"],"sourcesContent":["import type { UnitId } from '../units/registry'\nimport {\n  checkFactor,\n  checkQuantity,\n  checkResult,\n  mapAmount,\n  type SameAmount,\n} from './amount'\nimport type { Amount, Quantity } from './types'\n\n/**\n * Multiplies a quantity by `factor`. Both ends of a range scale, the unit is\n * kept, and nothing is rounded.\n *\n * An error thrown by a getter or proxy in the input passes through.\n *\n * @throws {RecipeBookError} `invalid_argument` when `factor` is not a finite\n *   number greater than 0, `quantity` isn't a quantity object, the amount is\n *   not a finite number greater than 0 or a range of them, a range's `min`\n *   isn't less than its `max`, or the quantity has `max` set, as a `Servings`\n *   or `Yield` has. `resolveRecipe` scales those. The unit isn't checked.\n *   Also thrown when an end times `factor` overflows to `Infinity` or\n *   underflows to 0: past about 1.8e308, or below about 5e-324.\n *\n * @example\n * scaleQuantity({ amount: 1.5, unit: 'cup' }, 2) // { amount: 3, unit: 'cup' }\n * scaleQuantity({ amount: { min: 2, max: 3 }, unit: 'tbsp' }, 2) // { amount: { min: 4, max: 6 }, unit: 'tbsp' }\n */\nexport function scaleQuantity<A extends Amount>(\n  quantity: Quantity & { amount: A },\n  factor: number,\n): { amount: SameAmount<A>; unit?: UnitId | undefined } {\n  const amount = checkQuantity('scaleQuantity', quantity) as A\n  checkFactor('scaleQuantity', 'factor', factor)\n\n  const result = multiply({ amount, unit: quantity.unit }, factor)\n  checkResult('scaleQuantity', result.amount)\n  return result\n}\n\n/** {@link scaleQuantity} without argument checks. */\nexport function multiply<A extends Amount>(\n  quantity: Quantity & { amount: A },\n  factor: number,\n): { amount: SameAmount<A>; unit?: UnitId | undefined } {\n  const amount = mapAmount(quantity.amount, (value) => value * factor)\n  return quantity.unit === undefined\n    ? { amount }\n    : { amount, unit: quantity.unit }\n}\n"],"mappings":";AACA;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OAEK;AAqBA,SAAS,cACd,UACA,QACsD;AACtD,QAAM,SAAS,cAAc,iBAAiB,QAAQ;AACtD,cAAY,iBAAiB,UAAU,MAAM;AAE7C,QAAM,SAAS,SAAS,EAAE,QAAQ,MAAM,SAAS,KAAK,GAAG,MAAM;AAC/D,cAAY,iBAAiB,OAAO,MAAM;AAC1C,SAAO;AACT;AAGO,SAAS,SACd,UACA,QACsD;AACtD,QAAM,SAAS,UAAU,SAAS,QAAQ,CAAC,UAAU,QAAQ,MAAM;AACnE,SAAO,SAAS,SAAS,SACrB,EAAE,OAAO,IACT,EAAE,QAAQ,MAAM,SAAS,KAAK;AACpC;","names":[]}

package/dist/recipe/ids.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/recipe/ids.ts"],"sourcesContent":["import { quote, type RecipeIssue } from '../errors'\nimport { issue, type Path } from '../issues'\n\n/**\n * An id to assign. `position` is where the item's issues start in the issue\n * list, so a `duplicate_id` warning can be placed in input order.\n */\nexport type IdRequest = {\n  authored: string | undefined\n  derived: string\n  path: Path\n  position: number\n}\n\nexport type PendingIssue = { position: number; issue: RecipeIssue }\n\n/**\n * Lowercase words joined by hyphens, without accents on Latin letters:\n * \"Crème fraîche\" → \"creme-fraiche\", \"わさび\" → \"わさび\".\n */\nexport function slugify(text: string): string {\n  return (\n    text\n      .normalize('NFKD')\n      // Marks in other scripts are part of the letter: dropping them turns わさび into わさひ.\n      .replace(/(\\p{Script=Latin})\\p{M}+/gu, '$1')\n      // Lowercase before NFC: some Greek capitals with marks, such as Ϊ́, have no precomposed form but their lowercase does.\n      .toLowerCase()\n      .normalize('NFC')\n      // A mark with no letter before it, such as the variation selector in ❤️, would be invisible.\n      .replace(/(^|[^\\p{L}\\p{M}])\\p{M}+/gu, '$1')\n      .replace(/[^\\p{L}\\p{M}\\p{N}]+/gu, '-')\n      .replace(/^-+|-+$/g, '')\n  )\n}\n\n/**\n * Gives each request a unique id. Authored ids are claimed first, so a derived\n * id never takes one; a repeated authored id is renamed with a warning. Taken\n * ids get the next free suffix: `egg`, `egg-2`, `egg-3`.\n */\nexport function assignIds(\n  requests: readonly IdRequest[],\n  pending: PendingIssue[],\n): string[] {\n  const used = new Set<string>()\n  const nextSuffix = new Map<string, number>()\n  const ids = requests.map(({ authored }) => {\n    if (authored === undefined || used.has(authored)) {\n      return undefined\n    }\n    used.add(authored)\n    return authored\n  })\n\n  return requests.map((request, i) => {\n    const claimed = ids[i]\n    if (claimed !== undefined) {\n      return claimed\n    }\n\n    const base = request.authored ?? request.derived\n    let id = base\n    if (used.has(id)) {\n      // Resuming from the last suffix keeps many repeats of one id linear.\n      let n = nextSuffix.get(base) ?? 2\n      while (used.has((id = `${base}-${n}`))) {\n        n++\n      }\n      nextSuffix.set(base, n + 1)\n    }\n    used.add(id)\n\n    if (request.authored !== undefined) {\n      pending.push({\n        position: request.position,\n        issue: issue(\n          'warning',\n          'duplicate_id',\n          [...request.path, 'id'],\n          `${quote(request.authored)} is already used; renamed to ${quote(id)}.`,\n        ),\n      })\n    }\n\n    return id\n  })\n}\n\n/** Inserts pending issues at their positions, keeping input order. */\nexport function insertPending(\n  issues: RecipeIssue[],\n  pending: readonly PendingIssue[],\n): void {\n  if (pending.length === 0) {\n    return\n  }\n\n  const sorted = [...pending].sort((a, b) => a.position - b.position)\n  const original = issues.splice(0)\n  let next = 0\n  for (const { position, issue } of sorted) {\n    while (next < position) {\n      issues.push(original[next++]!)\n    }\n    issues.push(issue)\n  }\n  while (next < original.length) {\n    issues.push(original[next++]!)\n  }\n}\n"],"mappings":";AAAA,SAAS,aAA+B;AACxC,SAAS,aAAwB;AAmB1B,SAAS,QAAQ,MAAsB;AAC5C,SACE,KACG,UAAU,MAAM,EAEhB,QAAQ,8BAA8B,IAAI,EAE1C,YAAY,EACZ,UAAU,KAAK,EAEf,QAAQ,6BAA6B,IAAI,EACzC,QAAQ,yBAAyB,GAAG,EACpC,QAAQ,YAAY,EAAE;AAE7B;AAOO,SAAS,UACd,UACA,SACU;AACV,QAAM,OAAO,oBAAI,IAAY;AAC7B,QAAM,aAAa,oBAAI,IAAoB;AAC3C,QAAM,MAAM,SAAS,IAAI,CAAC,EAAE,SAAS,MAAM;AACzC,QAAI,aAAa,UAAa,KAAK,IAAI,QAAQ,GAAG;AAChD,aAAO;AAAA,IACT;AACA,SAAK,IAAI,QAAQ;AACjB,WAAO;AAAA,EACT,CAAC;AAED,SAAO,SAAS,IAAI,CAAC,SAAS,MAAM;AAClC,UAAM,UAAU,IAAI,CAAC;AACrB,QAAI,YAAY,QAAW;AACzB,aAAO;AAAA,IACT;AAEA,UAAM,OAAO,QAAQ,YAAY,QAAQ;AACzC,QAAI,KAAK;AACT,QAAI,KAAK,IAAI,EAAE,GAAG;AAEhB,UAAI,IAAI,WAAW,IAAI,IAAI,KAAK;AAChC,aAAO,KAAK,IAAK,KAAK,GAAG,IAAI,IAAI,CAAC,EAAG,GAAG;AACtC;AAAA,MACF;AACA,iBAAW,IAAI,MAAM,IAAI,CAAC;AAAA,IAC5B;AACA,SAAK,IAAI,EAAE;AAEX,QAAI,QAAQ,aAAa,QAAW;AAClC,cAAQ,KAAK;AAAA,QACX,UAAU,QAAQ;AAAA,QAClB,OAAO;AAAA,UACL;AAAA,UACA;AAAA,UACA,CAAC,GAAG,QAAQ,MAAM,IAAI;AAAA,UACtB,GAAG,MAAM,QAAQ,QAAQ,CAAC,gCAAgC,MAAM,EAAE,CAAC;AAAA,QACrE;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,EACT,CAAC;AACH;AAGO,SAAS,cACd,QACA,SACM;AACN,MAAI,QAAQ,WAAW,GAAG;AACxB;AAAA,EACF;AAEA,QAAM,SAAS,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ;AAClE,QAAM,WAAW,OAAO,OAAO,CAAC;AAChC,MAAI,OAAO;AACX,aAAW,EAAE,UAAU,OAAAA,OAAM,KAAK,QAAQ;AACxC,WAAO,OAAO,UAAU;AACtB,aAAO,KAAK,SAAS,MAAM,CAAE;AAAA,IAC/B;AACA,WAAO,KAAKA,MAAK;AAAA,EACnB;AACA,SAAO,OAAO,SAAS,QAAQ;AAC7B,WAAO,KAAK,SAAS,MAAM,CAAE;AAAA,EAC/B;AACF;","names":["issue"]}
+{"version":3,"sources":["../../src/recipe/ids.ts"],"sourcesContent":["import { quote, type RecipeIssue } from '../errors'\nimport { issue, type Path } from '../issues'\n\n/**\n * An id to assign. `position` is where the item's issues start in the issue\n * list, so a `duplicate_id` warning can be placed in input order.\n */\nexport type IdRequest = {\n  authored: string | undefined\n  derived: string\n  path: Path\n  position: number\n}\n\nexport type PendingIssue = { position: number; issue: RecipeIssue }\n\n/**\n * Lowercase words joined by hyphens, with compatibility characters spelled out\n * (`½` → `1-2`, `fig` → `fig`) and accents dropped from Latin letters:\n * \"Crème fraîche\" → \"creme-fraiche\", \"わさび\" → \"わさび\".\n */\nexport function slugify(text: string): string {\n  return (\n    text\n      .normalize('NFKD')\n      // Marks in other scripts are part of the letter: dropping them turns わさび into わさひ.\n      .replace(/(\\p{Script=Latin})\\p{M}+/gu, '$1')\n      // Lowercase before NFC: some Greek capitals with marks, such as Ϊ́, have no precomposed form but their lowercase does.\n      .toLowerCase()\n      .normalize('NFC')\n      // A mark with no letter before it, such as the variation selector in ❤️, would be invisible.\n      .replace(/(^|[^\\p{L}\\p{M}])\\p{M}+/gu, '$1')\n      .replace(/[^\\p{L}\\p{M}\\p{N}]+/gu, '-')\n      .replace(/^-+|-+$/g, '')\n  )\n}\n\n/**\n * Gives each request a unique id. Authored ids are claimed first, so a derived\n * id never takes one; a repeated authored id is renamed with a warning. Taken\n * ids get the next free suffix: `egg`, `egg-2`, `egg-3`.\n */\nexport function assignIds(\n  requests: readonly IdRequest[],\n  pending: PendingIssue[],\n): string[] {\n  const used = new Set<string>()\n  const nextSuffix = new Map<string, number>()\n  const ids = requests.map(({ authored }) => {\n    if (authored === undefined || used.has(authored)) {\n      return undefined\n    }\n    used.add(authored)\n    return authored\n  })\n\n  return requests.map((request, i) => {\n    const claimed = ids[i]\n    if (claimed !== undefined) {\n      return claimed\n    }\n\n    const base = request.authored ?? request.derived\n    let id = base\n    if (used.has(id)) {\n      // Resuming from the last suffix keeps many repeats of one id linear.\n      let n = nextSuffix.get(base) ?? 2\n      while (used.has((id = `${base}-${n}`))) {\n        n++\n      }\n      nextSuffix.set(base, n + 1)\n    }\n    used.add(id)\n\n    if (request.authored !== undefined) {\n      pending.push({\n        position: request.position,\n        issue: issue(\n          'warning',\n          'duplicate_id',\n          [...request.path, 'id'],\n          `${quote(request.authored)} is already used; renamed to ${quote(id)}.`,\n        ),\n      })\n    }\n\n    return id\n  })\n}\n\n/** Inserts pending issues at their positions, keeping input order. */\nexport function insertPending(\n  issues: RecipeIssue[],\n  pending: readonly PendingIssue[],\n): void {\n  if (pending.length === 0) {\n    return\n  }\n\n  const sorted = [...pending].sort((a, b) => a.position - b.position)\n  const original = issues.splice(0)\n  let next = 0\n  for (const { position, issue } of sorted) {\n    while (next < position) {\n      issues.push(original[next++]!)\n    }\n    issues.push(issue)\n  }\n  while (next < original.length) {\n    issues.push(original[next++]!)\n  }\n}\n"],"mappings":";AAAA,SAAS,aAA+B;AACxC,SAAS,aAAwB;AAoB1B,SAAS,QAAQ,MAAsB;AAC5C,SACE,KACG,UAAU,MAAM,EAEhB,QAAQ,8BAA8B,IAAI,EAE1C,YAAY,EACZ,UAAU,KAAK,EAEf,QAAQ,6BAA6B,IAAI,EACzC,QAAQ,yBAAyB,GAAG,EACpC,QAAQ,YAAY,EAAE;AAE7B;AAOO,SAAS,UACd,UACA,SACU;AACV,QAAM,OAAO,oBAAI,IAAY;AAC7B,QAAM,aAAa,oBAAI,IAAoB;AAC3C,QAAM,MAAM,SAAS,IAAI,CAAC,EAAE,SAAS,MAAM;AACzC,QAAI,aAAa,UAAa,KAAK,IAAI,QAAQ,GAAG;AAChD,aAAO;AAAA,IACT;AACA,SAAK,IAAI,QAAQ;AACjB,WAAO;AAAA,EACT,CAAC;AAED,SAAO,SAAS,IAAI,CAAC,SAAS,MAAM;AAClC,UAAM,UAAU,IAAI,CAAC;AACrB,QAAI,YAAY,QAAW;AACzB,aAAO;AAAA,IACT;AAEA,UAAM,OAAO,QAAQ,YAAY,QAAQ;AACzC,QAAI,KAAK;AACT,QAAI,KAAK,IAAI,EAAE,GAAG;AAEhB,UAAI,IAAI,WAAW,IAAI,IAAI,KAAK;AAChC,aAAO,KAAK,IAAK,KAAK,GAAG,IAAI,IAAI,CAAC,EAAG,GAAG;AACtC;AAAA,MACF;AACA,iBAAW,IAAI,MAAM,IAAI,CAAC;AAAA,IAC5B;AACA,SAAK,IAAI,EAAE;AAEX,QAAI,QAAQ,aAAa,QAAW;AAClC,cAAQ,KAAK;AAAA,QACX,UAAU,QAAQ;AAAA,QAClB,OAAO;AAAA,UACL;AAAA,UACA;AAAA,UACA,CAAC,GAAG,QAAQ,MAAM,IAAI;AAAA,UACtB,GAAG,MAAM,QAAQ,QAAQ,CAAC,gCAAgC,MAAM,EAAE,CAAC;AAAA,QACrE;AAAA,MACF,CAAC;AAAA,IACH;AAEA,WAAO;AAAA,EACT,CAAC;AACH;AAGO,SAAS,cACd,QACA,SACM;AACN,MAAI,QAAQ,WAAW,GAAG;AACxB;AAAA,EACF;AAEA,QAAM,SAAS,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,WAAW,EAAE,QAAQ;AAClE,QAAM,WAAW,OAAO,OAAO,CAAC;AAChC,MAAI,OAAO;AACX,aAAW,EAAE,UAAU,OAAAA,OAAM,KAAK,QAAQ;AACxC,WAAO,OAAO,UAAU;AACtB,aAAO,KAAK,SAAS,MAAM,CAAE;AAAA,IAC/B;AACA,WAAO,KAAKA,MAAK;AAAA,EACnB;AACA,SAAO,OAAO,SAAS,QAAQ;AAC7B,WAAO,KAAK,SAAS,MAAM,CAAE;AAAA,EAC/B;AACF;","names":["issue"]}

package/dist/recipe/parse.js

@@ -99,9 +99,14 @@ var NUTRIENT_EXAMPLES = {
   mg: 'milligrams, e.g. 300, "300 mg", or "0.3 g"'
 };
 function parseRecipe(input, options) {
+  return parseRecipeWith(
+    input,
+    readLineOption("parseRecipe", options) ?? "pass parseIngredientLine: parseRecipe(input, { parseIngredientLine })"
+  );
+}
+function parseRecipeWith(input, lines) {
   const issues = [];
-  const readLine = readLineOption("parseRecipe", options);
-  const recipe = readRecipe(issues, input, readLine);
+  const recipe = readRecipe(issues, input, lines);
   const label = recipe && quote(recipe.name);
   return toResult("invalid_recipe", recipe, issues, label);
 }
@@ -115,7 +120,7 @@ function readLineOption(fn, options) {
   }
   return reader;
 }
-function readRecipe(issues, value, readLine) {
+function readRecipe(issues, value, lines) {
   const input = asRecord(value);
   if (!input) {
     return error(
@@ -145,7 +150,7 @@ function readRecipe(issues, value, readLine) {
     input.ingredients,
     ["ingredients"],
     "ingredients",
-    (issues2, value2, path) => readIngredient(issues2, value2, path, readLine)
+    (issues2, value2, path) => readIngredient(issues2, value2, path, lines)
   );
   const steps = readList(
     issues,
@@ -195,17 +200,13 @@ function readRecipe(issues, value, readLine) {
   });
 }
 function readList(issues, pending, value, path, noun, readItem) {
-  const entries = value === void 0 ? [] : readArray(issues, value, path, noun);
-  if (!entries) {
-    return [];
-  }
   const sections = [];
   let loose;
   let count = 0;
-  const read = (entry, entryPath) => readItem(issues, entry, entryPath, ++count);
-  entries.forEach((entry, i) => {
+  const read = (entry2, entryPath) => readItem(issues, entry2, entryPath, ++count);
+  const visit = (entry2, i) => {
     const entryPath = [...path, i];
-    const section = asSection(entry);
+    const section = asSection(entry2);
     if (section) {
       loose = void 0;
       sections.push(readSection(issues, section, entryPath, noun, read));
@@ -222,20 +223,28 @@ function readList(issues, pending, value, path, noun, readItem) {
       };
       sections.push(loose);
     }
-    const item = read(entry, entryPath);
+    const item = read(entry2, entryPath);
     if (item) {
       loose.items.push(item);
     }
-  });
+  };
+  if (value !== void 0 && !readArray(issues, value, path, noun, visit)) {
+    return [];
+  }
   if (sections.length === 0) {
     warning(issues, "empty_list", path, `Recipe has no ${noun}.`);
     return [];
   }
-  const sectionIds = assignIds(sections, pending);
+  const renamed = [];
+  const sectionIds = assignIds(sections, renamed);
   const itemIds = assignIds(
     sections.flatMap((section) => section.items),
-    pending
+    renamed
   );
+  const entry = ({ issue }) => issue.path[path.length];
+  for (const issue of renamed.sort((a, b) => entry(a) - entry(b))) {
+    pending.push(issue);
+  }
   let next = 0;
   return sections.map(
     (section, i) => defined({
@@ -255,10 +264,13 @@ function readSection(issues, record, path, noun, read) {
   const title = readText(issues, record.title, [...path, "title"]);
   const items = [];
   const itemsPath = [...path, "items"];
-  const entries = readArray(issues, record.items, itemsPath, noun);
-  if (entries) {
-    let visited = 0;
-    entries.forEach((entry, j) => {
+  let visited = 0;
+  const entries = readArray(
+    issues,
+    record.items,
+    itemsPath,
+    noun,
+    (entry, j) => {
       visited++;
       const itemPath = [...itemsPath, j];
       if (asSection(entry)) {
@@ -274,10 +286,10 @@ function readSection(issues, record, path, noun, read) {
       if (item) {
         items.push(item);
       }
-    });
-    if (visited === 0) {
-      warning(issues, "empty_list", itemsPath, `Section has no ${noun}.`);
     }
+  );
+  if (entries && visited === 0) {
+    warning(issues, "empty_list", itemsPath, `Section has no ${noun}.`);
   }
   checkFields(issues, record, SECTION_FIELDS, path);
   return {
@@ -290,29 +302,44 @@ function readSection(issues, record, path, noun, read) {
   };
 }
 function readItems(issues, pending, value, path, noun, readItem) {
-  const entries = value === void 0 ? [] : readArray(issues, value, path, noun);
-  if (!entries) {
+  let n = 0;
+  const drafts = value === void 0 ? [] : readArray(
+    issues,
+    value,
+    path,
+    noun,
+    (entry, i) => readItem(issues, entry, [...path, i], ++n)
+  );
+  if (!drafts) {
     return [];
   }
-  let n = 0;
-  const drafts = entries.flatMap((entry, i) => {
-    const draft = readItem(issues, entry, [...path, i], ++n);
-    return draft ? [draft] : [];
-  });
   const ids = assignIds(drafts, pending);
   return drafts.map((draft, i) => draft.build(ids[i]));
 }
-function readArray(issues, value, path, noun) {
-  return Array.isArray(value) ? value : error(
-    issues,
-    "invalid_type",
-    path,
-    `Expected a list of ${noun}, received ${describeValue(value)}.`
-  );
+function readArray(issues, value, path, noun, read) {
+  if (!Array.isArray(value)) {
+    return error(
+      issues,
+      "invalid_type",
+      path,
+      `Expected a list of ${noun}, received ${describeValue(value)}.`
+    );
+  }
+  const kept = [];
+  for (let i = 0, n = value.length; i < n; i++) {
+    if (i in value) {
+      const entry = value[i];
+      const result = hasOwn(value, i) && read(entry, i);
+      if (result) {
+        kept.push(result);
+      }
+    }
+  }
+  return kept;
 }
-function readIngredient(issues, value, path, readLine) {
-  if (typeof value === "string" && readLine) {
-    const result = readLine(value);
+function readIngredient(issues, value, path, lines) {
+  if (typeof value === "string" && typeof lines === "function") {
+    const result = lines(value);
     for (const issue of result.success ? result.warnings : result.error.issues) {
       issues.push({ ...issue, path: [...path, ...issue.path] });
     }
@@ -324,7 +351,7 @@ function readIngredient(issues, value, path, readLine) {
       issues,
       "invalid_type",
       path,
-      `Expected an ingredient such as ${readLine ? '"2 cups flour" or ' : ""}{ name: "flour", quantity: "2 cups" }, received ${describeValue(value)}.${typeof value === "string" ? " To read ingredient lines, pass parseIngredientLine: parseRecipe(input, { parseIngredientLine })." : ""}`
+      `Expected an ingredient such as ${typeof lines === "function" ? '"2 cups flour" or ' : ""}{ name: "flour", quantity: "2 cups" }, received ${describeValue(value)}.${typeof value === "string" && typeof lines === "string" ? ` To read ingredient lines, ${lines}.` : ""}`
     );
   }
   const position = issues.length;
@@ -365,22 +392,13 @@ function readIngredient(issues, value, path, readLine) {
   };
 }
 function readEquivalents(issues, value, path) {
-  if (value === void 0) {
-    return [];
-  }
-  if (!Array.isArray(value)) {
-    error(
-      issues,
-      "invalid_type",
-      path,
-      `Expected a list of quantities, e.g. ["190 g"], received ${describeValue(value)}.`
-    );
-    return [];
-  }
-  return value.flatMap((entry, i) => {
-    const quantity = readQuantity(issues, entry, [...path, i]);
-    return quantity === void 0 ? [] : [quantity];
-  });
+  return value !== void 0 && readArray(
+    issues,
+    value,
+    path,
+    'quantities, e.g. ["190 g"]',
+    (entry, i) => readQuantity(issues, entry, [...path, i])
+  ) || [];
 }
 function readStep(issues, value, path, n) {
   const isText = typeof value === "string";
@@ -615,10 +633,11 @@ function readRangeText(issues, text, path, expected) {
     return error(issues, match.code, path, match.message);
   }
   const { amount, rest } = match;
-  return {
-    range: typeof amount === "number" ? { amount } : { amount: amount.min, max: amount.max },
-    rest
-  };
+  const range = typeof amount === "number" ? { amount } : { amount: amount.min, max: amount.max };
+  if (readPositive(issues, range.amount, path) === void 0 || range.max !== void 0 && readPositive(issues, range.max, path) === void 0) {
+    return void 0;
+  }
+  return { range, rest };
 }
 function readRange(issues, record, path, missingAmount) {
   const value = record.amount;
@@ -834,6 +853,7 @@ function readBoolean(issues, value, path) {
 }
 export {
   parseRecipe,
+  parseRecipeWith,
   readLineOption
 };
 //# sourceMappingURL=parse.js.map