@tmlmt/cooklang-parser 3.0.0-alpha.15 → 3.0.0-alpha.16

package/dist/index.d.cts

@@ -268,6 +268,18 @@ interface MetadataSource {
     /** The author at the source. */
     author?: string;
 }
+/**
+ * Represents scaling variable information for a recipe.
+ * @category Types
+ */
+interface MetadataScalingVar extends QuantityWithPlainUnit {
+    /** The text before the scaling variable. */
+    textBefore?: string;
+    /** The text after the scaling variable. */
+    textAfter?: string;
+    /** The text precising a numerical scaling variable. */
+    text?: string;
+}
 /**
  * Represents time information for a recipe.
  * @category Types
@@ -291,7 +303,7 @@ interface MetadataObject {
  * Represents any value that can appear in recipe metadata.
  * @category Types
  */
-type MetadataValue = string | number | (string | number)[] | MetadataObject | MetadataSource | MetadataTime | undefined;
+type MetadataValue = string | number | (string | number)[] | MetadataObject | MetadataSource | MetadataTime | MetadataScalingVar | undefined;
 /**
  * Represents the metadata of a recipe.
  * @category Types
@@ -309,9 +321,10 @@ interface Metadata {
     /** The author of the recipe (separate from source author). */
     author?: string;
     /** The number of servings the recipe makes.
-     * Should be either a number or a string which starts with a number
-     * (which will be used for scaling) followed by a comma and then
-     * whatever you want.
+     * Can be given either as:
+     * - a number
+     * - a string which starts with a number (which will be used for scaling) followed by a comma and then whatever you want
+     * - or an arbitrary scalable number, optionally preceded and/or followed by text.
      *
      * Interchangeable with `yield` or `serves`. If multiple ones are defined,
      * the prevailance order for the number which will used for scaling
@@ -326,30 +339,37 @@ interface Metadata {
      * ```yaml
      * servings: 2, a few
      * ```
+     *
+     * * @example
+     * ```yaml
+     * servings: {{1.5%kg}} of bread
+     * ```
      */
-    servings?: number | string;
+    servings?: MetadataScalingVar;
     /** The yield of the recipe.
-     * Should be either a number or a string which starts with a number
-     * (which will be used for scaling) followed by a comma and then
-     * whatever you want.
+     * Can be given either as:
+     * - a number
+     * - a string which starts with a number (which will be used for scaling) followed by a comma and then whatever you want
+     * - or an arbitrary scalable number, optionally preceded and/or followed by text.
      *
      * Interchangeable with `servings` or `serves`. If multiple ones are defined,
      * the prevailance order for the number which will used for scaling
      * is `servings` \> `yield` \> `serves`. See {@link Metadata.servings | servings}
      * for examples.
      */
-    yield?: number | string;
+    yield?: MetadataScalingVar;
     /** The number of people the recipe serves.
-     * Should be either a number or a string which starts with a number
-     * (which will be used for scaling) followed by a comma and then
-     * whatever you want.
+     * Can be given either as:
+     * - a number
+     * - a string which starts with a number (which will be used for scaling) followed by a comma and then whatever you want
+     * - or an arbitrary scalable number, optionally preceded and/or followed by text.
      *
      * Interchangeable with `servings` or `yield`. If multiple ones are defined,
      * the prevailance order for the number which will used for scaling
      * is `servings` \> `yield` \> `serves`. See {@link Metadata.servings | servings}
      * for examples.
      */
-    serves?: number | string;
+    serves?: MetadataScalingVar;
     /** The course of the recipe. */
     course?: string;
     /** The category of the recipe. */
@@ -1918,4 +1938,4 @@ declare class BadIndentationError extends Error {
     constructor();
 }
 
-export { type AddedIngredient, type AddedRecipe, type AddedRecipeOptions, type AlternativeIngredientRef, type AndGroup, type ArbitraryScalable, type ArbitraryScalableItem, BadIndentationError, type CartContent, type CartMatch, type CartMisMatch, type CategorizedIngredients, type Category, CategoryConfig, type CategoryIngredient, type Cookware, type CookwareFlag, type CookwareItem, type DecimalValue, type FixedNumericValue, type FixedValue, type FlatAndGroup, type FlatGroup, type FlatOrGroup, type FractionValue, type GetIngredientQuantitiesOptions, type Group, type Ingredient, type IngredientAlternative, type IngredientAlternativeBase, type IngredientExtras, type IngredientFlag, type IngredientItem, type IngredientQuantityAndGroup, type IngredientQuantityGroup, type MaybeNestedAndGroup, type MaybeNestedGroup, type MaybeNestedOrGroup, type MaybeScalableQuantity, type Metadata, type MetadataObject, type MetadataSource, type MetadataTime, type MetadataValue, NoProductCatalogForCartError, type NoProductMatchErrorCode, NoShoppingListForCartError, NoTabAsIndentError, type Note, type NoteItem, type OrGroup, Pantry, type PantryItem, type PantryItemToml, type PantryOptions, ProductCatalog, type ProductMatch, type ProductMisMatch, type ProductOption, type ProductOptionBase, type ProductOptionCore, type ProductSelection, type ProductSize, type QuantityBase, type QuantityWithExtendedUnit, type QuantityWithPlainUnit, type QuantityWithUnitDef, type QuantityWithUnitLike, type Range, type RawQuantityGroup, Recipe, type RecipeAlternatives, type RecipeChoices, type RecipeWithFactor, type RecipeWithServings, Section, ShoppingCart, type ShoppingCartOptions, type ShoppingCartSummary, ShoppingList, type SpecificUnitSystem, type Step, type StepItem, type TextAttribute, type TextItem, type TextValue, type Timer, type TimerItem, type ToBaseBySystem, type Unit, type UnitDefinition, type UnitDefinitionLike, type UnitFractionConfig, type UnitSystem, type UnitType, type WithOptionalQuantity, convertQuantityToSystem, formatExtendedQuantity, formatItemQuantity, formatNumericValue, formatQuantity, formatQuantityWithUnit, formatSingleValue, formatUnit, hasAlternatives, isAlternativeSelected, isAndGroup, isGroupedItem, isSimpleGroup, renderFractionAsVulgar };
+export { type AddedIngredient, type AddedRecipe, type AddedRecipeOptions, type AlternativeIngredientRef, type AndGroup, type ArbitraryScalable, type ArbitraryScalableItem, BadIndentationError, type CartContent, type CartMatch, type CartMisMatch, type CategorizedIngredients, type Category, CategoryConfig, type CategoryIngredient, type Cookware, type CookwareFlag, type CookwareItem, type DecimalValue, type FixedNumericValue, type FixedValue, type FlatAndGroup, type FlatGroup, type FlatOrGroup, type FractionValue, type GetIngredientQuantitiesOptions, type Group, type Ingredient, type IngredientAlternative, type IngredientAlternativeBase, type IngredientExtras, type IngredientFlag, type IngredientItem, type IngredientQuantityAndGroup, type IngredientQuantityGroup, type MaybeNestedAndGroup, type MaybeNestedGroup, type MaybeNestedOrGroup, type MaybeScalableQuantity, type Metadata, type MetadataObject, type MetadataScalingVar, type MetadataSource, type MetadataTime, type MetadataValue, NoProductCatalogForCartError, type NoProductMatchErrorCode, NoShoppingListForCartError, NoTabAsIndentError, type Note, type NoteItem, type OrGroup, Pantry, type PantryItem, type PantryItemToml, type PantryOptions, ProductCatalog, type ProductMatch, type ProductMisMatch, type ProductOption, type ProductOptionBase, type ProductOptionCore, type ProductSelection, type ProductSize, type QuantityBase, type QuantityWithExtendedUnit, type QuantityWithPlainUnit, type QuantityWithUnitDef, type QuantityWithUnitLike, type Range, type RawQuantityGroup, Recipe, type RecipeAlternatives, type RecipeChoices, type RecipeWithFactor, type RecipeWithServings, Section, ShoppingCart, type ShoppingCartOptions, type ShoppingCartSummary, ShoppingList, type SpecificUnitSystem, type Step, type StepItem, type TextAttribute, type TextItem, type TextValue, type Timer, type TimerItem, type ToBaseBySystem, type Unit, type UnitDefinition, type UnitDefinitionLike, type UnitFractionConfig, type UnitSystem, type UnitType, type WithOptionalQuantity, convertQuantityToSystem, formatExtendedQuantity, formatItemQuantity, formatNumericValue, formatQuantity, formatQuantityWithUnit, formatSingleValue, formatUnit, hasAlternatives, isAlternativeSelected, isAndGroup, isGroupedItem, isSimpleGroup, renderFractionAsVulgar };

package/dist/index.d.ts

@@ -268,6 +268,18 @@ interface MetadataSource {
     /** The author at the source. */
     author?: string;
 }
+/**
+ * Represents scaling variable information for a recipe.
+ * @category Types
+ */
+interface MetadataScalingVar extends QuantityWithPlainUnit {
+    /** The text before the scaling variable. */
+    textBefore?: string;
+    /** The text after the scaling variable. */
+    textAfter?: string;
+    /** The text precising a numerical scaling variable. */
+    text?: string;
+}
 /**
  * Represents time information for a recipe.
  * @category Types
@@ -291,7 +303,7 @@ interface MetadataObject {
  * Represents any value that can appear in recipe metadata.
  * @category Types
  */
-type MetadataValue = string | number | (string | number)[] | MetadataObject | MetadataSource | MetadataTime | undefined;
+type MetadataValue = string | number | (string | number)[] | MetadataObject | MetadataSource | MetadataTime | MetadataScalingVar | undefined;
 /**
  * Represents the metadata of a recipe.
  * @category Types
@@ -309,9 +321,10 @@ interface Metadata {
     /** The author of the recipe (separate from source author). */
     author?: string;
     /** The number of servings the recipe makes.
-     * Should be either a number or a string which starts with a number
-     * (which will be used for scaling) followed by a comma and then
-     * whatever you want.
+     * Can be given either as:
+     * - a number
+     * - a string which starts with a number (which will be used for scaling) followed by a comma and then whatever you want
+     * - or an arbitrary scalable number, optionally preceded and/or followed by text.
      *
      * Interchangeable with `yield` or `serves`. If multiple ones are defined,
      * the prevailance order for the number which will used for scaling
@@ -326,30 +339,37 @@ interface Metadata {
      * ```yaml
      * servings: 2, a few
      * ```
+     *
+     * * @example
+     * ```yaml
+     * servings: {{1.5%kg}} of bread
+     * ```
      */
-    servings?: number | string;
+    servings?: MetadataScalingVar;
     /** The yield of the recipe.
-     * Should be either a number or a string which starts with a number
-     * (which will be used for scaling) followed by a comma and then
-     * whatever you want.
+     * Can be given either as:
+     * - a number
+     * - a string which starts with a number (which will be used for scaling) followed by a comma and then whatever you want
+     * - or an arbitrary scalable number, optionally preceded and/or followed by text.
      *
      * Interchangeable with `servings` or `serves`. If multiple ones are defined,
      * the prevailance order for the number which will used for scaling
      * is `servings` \> `yield` \> `serves`. See {@link Metadata.servings | servings}
      * for examples.
      */
-    yield?: number | string;
+    yield?: MetadataScalingVar;
     /** The number of people the recipe serves.
-     * Should be either a number or a string which starts with a number
-     * (which will be used for scaling) followed by a comma and then
-     * whatever you want.
+     * Can be given either as:
+     * - a number
+     * - a string which starts with a number (which will be used for scaling) followed by a comma and then whatever you want
+     * - or an arbitrary scalable number, optionally preceded and/or followed by text.
      *
      * Interchangeable with `servings` or `yield`. If multiple ones are defined,
      * the prevailance order for the number which will used for scaling
      * is `servings` \> `yield` \> `serves`. See {@link Metadata.servings | servings}
      * for examples.
      */
-    serves?: number | string;
+    serves?: MetadataScalingVar;
     /** The course of the recipe. */
     course?: string;
     /** The category of the recipe. */
@@ -1918,4 +1938,4 @@ declare class BadIndentationError extends Error {
     constructor();
 }
 
-export { type AddedIngredient, type AddedRecipe, type AddedRecipeOptions, type AlternativeIngredientRef, type AndGroup, type ArbitraryScalable, type ArbitraryScalableItem, BadIndentationError, type CartContent, type CartMatch, type CartMisMatch, type CategorizedIngredients, type Category, CategoryConfig, type CategoryIngredient, type Cookware, type CookwareFlag, type CookwareItem, type DecimalValue, type FixedNumericValue, type FixedValue, type FlatAndGroup, type FlatGroup, type FlatOrGroup, type FractionValue, type GetIngredientQuantitiesOptions, type Group, type Ingredient, type IngredientAlternative, type IngredientAlternativeBase, type IngredientExtras, type IngredientFlag, type IngredientItem, type IngredientQuantityAndGroup, type IngredientQuantityGroup, type MaybeNestedAndGroup, type MaybeNestedGroup, type MaybeNestedOrGroup, type MaybeScalableQuantity, type Metadata, type MetadataObject, type MetadataSource, type MetadataTime, type MetadataValue, NoProductCatalogForCartError, type NoProductMatchErrorCode, NoShoppingListForCartError, NoTabAsIndentError, type Note, type NoteItem, type OrGroup, Pantry, type PantryItem, type PantryItemToml, type PantryOptions, ProductCatalog, type ProductMatch, type ProductMisMatch, type ProductOption, type ProductOptionBase, type ProductOptionCore, type ProductSelection, type ProductSize, type QuantityBase, type QuantityWithExtendedUnit, type QuantityWithPlainUnit, type QuantityWithUnitDef, type QuantityWithUnitLike, type Range, type RawQuantityGroup, Recipe, type RecipeAlternatives, type RecipeChoices, type RecipeWithFactor, type RecipeWithServings, Section, ShoppingCart, type ShoppingCartOptions, type ShoppingCartSummary, ShoppingList, type SpecificUnitSystem, type Step, type StepItem, type TextAttribute, type TextItem, type TextValue, type Timer, type TimerItem, type ToBaseBySystem, type Unit, type UnitDefinition, type UnitDefinitionLike, type UnitFractionConfig, type UnitSystem, type UnitType, type WithOptionalQuantity, convertQuantityToSystem, formatExtendedQuantity, formatItemQuantity, formatNumericValue, formatQuantity, formatQuantityWithUnit, formatSingleValue, formatUnit, hasAlternatives, isAlternativeSelected, isAndGroup, isGroupedItem, isSimpleGroup, renderFractionAsVulgar };
+export { type AddedIngredient, type AddedRecipe, type AddedRecipeOptions, type AlternativeIngredientRef, type AndGroup, type ArbitraryScalable, type ArbitraryScalableItem, BadIndentationError, type CartContent, type CartMatch, type CartMisMatch, type CategorizedIngredients, type Category, CategoryConfig, type CategoryIngredient, type Cookware, type CookwareFlag, type CookwareItem, type DecimalValue, type FixedNumericValue, type FixedValue, type FlatAndGroup, type FlatGroup, type FlatOrGroup, type FractionValue, type GetIngredientQuantitiesOptions, type Group, type Ingredient, type IngredientAlternative, type IngredientAlternativeBase, type IngredientExtras, type IngredientFlag, type IngredientItem, type IngredientQuantityAndGroup, type IngredientQuantityGroup, type MaybeNestedAndGroup, type MaybeNestedGroup, type MaybeNestedOrGroup, type MaybeScalableQuantity, type Metadata, type MetadataObject, type MetadataScalingVar, type MetadataSource, type MetadataTime, type MetadataValue, NoProductCatalogForCartError, type NoProductMatchErrorCode, NoShoppingListForCartError, NoTabAsIndentError, type Note, type NoteItem, type OrGroup, Pantry, type PantryItem, type PantryItemToml, type PantryOptions, ProductCatalog, type ProductMatch, type ProductMisMatch, type ProductOption, type ProductOptionBase, type ProductOptionCore, type ProductSelection, type ProductSize, type QuantityBase, type QuantityWithExtendedUnit, type QuantityWithPlainUnit, type QuantityWithUnitDef, type QuantityWithUnitLike, type Range, type RawQuantityGroup, Recipe, type RecipeAlternatives, type RecipeChoices, type RecipeWithFactor, type RecipeWithServings, Section, ShoppingCart, type ShoppingCartOptions, type ShoppingCartSummary, ShoppingList, type SpecificUnitSystem, type Step, type StepItem, type TextAttribute, type TextItem, type TextValue, type Timer, type TimerItem, type ToBaseBySystem, type Unit, type UnitDefinition, type UnitDefinitionLike, type UnitFractionConfig, type UnitSystem, type UnitType, type WithOptionalQuantity, convertQuantityToSystem, formatExtendedQuantity, formatItemQuantity, formatNumericValue, formatQuantity, formatQuantityWithUnit, formatSingleValue, formatUnit, hasAlternatives, isAlternativeSelected, isAndGroup, isGroupedItem, isSimpleGroup, renderFractionAsVulgar };

package/dist/index.js

@@ -272,7 +272,6 @@ var nestedMetaVarRegex = (varName) => new RegExp(
   "m"
 );
 var metadataRegex = d().literal("---").newline().startCaptureGroup().anyCharacter().zeroOrMore().optional().endGroup().newline().literal("---").dotAll().toRegExp();
-var scalingMetaValueRegex = (varName) => d().startAnchor().literal(varName).literal(":").anyOf("\\t ").zeroOrMore().startCaptureGroup().startCaptureGroup().notAnyOf(",\\n").oneOrMore().endGroup().startGroup().literal(",").whitespace().zeroOrMore().startCaptureGroup().anyCharacter().oneOrMore().endGroup().endGroup().optional().endGroup().endAnchor().multiline().toRegExp();
 var nonWordChar = "\\s@#~\\[\\]{(,;:!?";
 var nonWordCharStrict = "\\s@#~\\[\\]{(,;:!?|";
 var ingredientWithAlternativeRegex = d().literal("@").startNamedGroup("ingredientModifiers").anyOf("@\\-&?").zeroOrMore().endGroup().optional().startNamedGroup("ingredientRecipeAnchor").literal("./").endGroup().optional().startGroup().startGroup().startNamedGroup("mIngredientName").notAnyOf(nonWordChar).oneOrMore().startGroup().whitespace().oneOrMore().notAnyOf(nonWordChar).oneOrMore().endGroup().oneOrMore().endGroup().positiveLookahead("\\s*(?:\\{[^\\}]*\\}|\\([^)]*\\))").endGroup().or().startNamedGroup("sIngredientName").notAnyOf(nonWordChar).zeroOrMore().notAnyOf("\\." + nonWordChar).endGroup().endGroup().startGroup().literal("{").startNamedGroup("ingredientQuantityModifier").literal("=").exactly(1).endGroup().optional().startNamedGroup("ingredientQuantity").startGroup().notAnyOf("}|%").oneOrMore().endGroup().optional().startGroup().literal("%").notAnyOf("|}").oneOrMore().lazy().endGroup().optional().startGroup().literal("|").notAnyOf("}").oneOrMore().lazy().endGroup().zeroOrMore().endGroup().literal("}").endGroup().optional().startGroup().literal("(").startNamedGroup("ingredientPreparation").notAnyOf(")").oneOrMore().lazy().endGroup().literal(")").endGroup().optional().startGroup().literal("[").startNamedGroup("ingredientNote").notAnyOf("\\]").oneOrMore().lazy().endGroup().literal("]").endGroup().optional().startNamedGroup("ingredientAlternative").startGroup().literal("|").startGroup().anyOf("@\\-&?").zeroOrMore().endGroup().optional().startGroup().literal("./").endGroup().optional().startGroup().startGroup().startGroup().notAnyOf(nonWordChar).oneOrMore().startGroup().whitespace().oneOrMore().notAnyOf(nonWordChar).oneOrMore().endGroup().oneOrMore().endGroup().positiveLookahead("\\s*(?:\\{[^\\}]*\\}|\\([^)]*\\))").endGroup().or().startGroup().notAnyOf(nonWordChar).oneOrMore().endGroup().endGroup().startGroup().literal("{").startGroup().literal("=").exactly(1).endGroup().optional().startGroup().notAnyOf("}%").oneOrMore().endGroup().optional().startGroup().literal("%").startGroup().notAnyOf("}").oneOrMore().lazy().endGroup().endGroup().optional().literal("}").endGroup().optional().startGroup().literal("(").startGroup().notAnyOf(")").oneOrMore().lazy().endGroup().literal(")").endGroup().optional().startGroup().literal("[").startGroup().notAnyOf("\\]").oneOrMore().lazy().endGroup().literal("]").endGroup().optional().endGroup().zeroOrMore().endGroup().toRegExp();
@@ -293,6 +292,13 @@ var tokensRegex = new RegExp(
   ].map((r2) => r2.source).join("|"),
   "gu"
 );
+var servingsPrefixPart = (varName) => d().startAnchor().literal(varName).literal(":").anyOf("	 ").zeroOrMore().startNamedGroup("servingsPrefix").nonWhitespace().startGroup().anyCharacter().zeroOrMore().lazy().nonWhitespace().endGroup().optional().endGroup().optional().anyOf("	 ").zeroOrMore().toRegExp();
+var servingsSuffixPart = d().anyOf("	 ").zeroOrMore().startNamedGroup("servingsSuffix").nonWhitespace().startGroup().anyCharacter().zeroOrMore().nonWhitespace().endGroup().optional().endGroup().optional().anyOf("	 ").zeroOrMore().endAnchor().toRegExp();
+var scalingSimpleMetaValueRegex = (varName) => d().startAnchor().literal(varName).literal(":").anyOf("\\t ").zeroOrMore().startCaptureGroup().startCaptureGroup().notAnyOf(",\\n").oneOrMore().endGroup().startGroup().literal(",").anyOf("\\t ").zeroOrMore().startCaptureGroup().anyCharacter().oneOrMore().endGroup().optional().endGroup().optional().endGroup().endAnchor().multiline().toRegExp();
+var scalingMetaValueWithUnitRegex = (varName) => new RegExp(
+  servingsPrefixPart(varName).source + arbitraryScalableRegex.source + servingsSuffixPart.source,
+  "m"
+);
 var commentRegex = d().literal("--").anyCharacter().zeroOrMore().global().toRegExp();
 var blockCommentRegex = d().literal("[-").anyCharacter().zeroOrMore().lazy().literal("-]").whitespace().zeroOrMore().global().toRegExp();
 var shoppingListRegex = d().literal("[").startNamedGroup("name").anyCharacter().oneOrMore().endGroup().literal("]").newline().startNamedGroup("items").anyCharacter().zeroOrMore().lazy().endGroup().startGroup().newline().newline().or().endAnchor().endGroup().global().toRegExp();
@@ -1276,17 +1282,21 @@ var flattenPlainUnitGroup = (summed) => {
   }
 };
 function applyBestUnit(q, system) {
-  if (!q.unit?.name) {
+  const extended = { quantity: q.quantity };
+  if (q.unit) {
+    extended.unit = typeof q.unit === "string" ? { name: q.unit } : q.unit;
+  }
+  if (!extended.unit?.name) {
     return q;
   }
-  const unitDef = resolveUnit(q.unit.name);
+  const unitDef = resolveUnit(extended.unit.name);
   if (unitDef.type === "other") {
     return q;
   }
-  if (q.quantity.type === "fixed" && q.quantity.value.type === "text") {
+  if (extended.quantity.type === "fixed" && extended.quantity.value.type === "text") {
     return q;
   }
-  const avgValue = getAverageValue(q.quantity);
+  const avgValue = getAverageValue(extended.quantity);
   const effectiveSystem = system ?? (["metric", "JP"].includes(unitDef.system) ? unitDef.system : "US");
   const toBase = getToBase(unitDef, effectiveSystem);
   const valueInBase = avgValue * toBase;
@@ -1296,22 +1306,22 @@ function applyBestUnit(q, system) {
     effectiveSystem,
     [unitDef]
   );
-  const originalCanonicalName = normalizeUnit(q.unit.name)?.name;
+  const originalCanonicalName = normalizeUnit(extended.unit.name)?.name;
   if (bestUnit.name === originalCanonicalName) {
     return q;
   }
   const formattedValue = formatOutputValue(bestValue, bestUnit);
-  if (q.quantity.type === "range") {
+  if (extended.quantity.type === "range") {
     const bestToBase = getToBase(bestUnit, effectiveSystem);
-    const minValue = getNumericValue(q.quantity.min) * toBase / bestToBase;
-    const maxValue = getNumericValue(q.quantity.max) * toBase / bestToBase;
+    const minValue = getNumericValue(extended.quantity.min) * toBase / bestToBase;
+    const maxValue = getNumericValue(extended.quantity.max) * toBase / bestToBase;
     return {
       quantity: {
         type: "range",
         min: formatOutputValue(minValue, bestUnit),
         max: formatOutputValue(maxValue, bestUnit)
       },
-      unit: { name: bestUnit.name }
+      unit: typeof q.unit === "string" ? bestUnit.name : { name: bestUnit.name }
     };
   }
   return {
@@ -1319,7 +1329,7 @@ function applyBestUnit(q, system) {
       type: "fixed",
       value: formattedValue
     },
-    unit: { name: bestUnit.name }
+    unit: typeof q.unit === "string" ? bestUnit.name : { name: bestUnit.name }
   };
 }
 function subtractQuantities(q1, q2, options = {}) {
@@ -1671,13 +1681,62 @@ function parseBlockScalarMetaVar(content, varName) {
   }
   return stripped.replace(/\n\n/g, "\0").replace(/\n/g, " ").replace(/\0/g, "\n");
 }
+function parseArbitraryQuantity(raw) {
+  const quantityMatch = raw.trim().match(quantityAlternativeRegex);
+  if (!quantityMatch?.groups) {
+    throw new InvalidQuantityFormat(
+      raw,
+      "Arbitrary quantities must have a numerical value"
+    );
+  }
+  const value = parseQuantityInput(quantityMatch.groups.quantity);
+  const unit = quantityMatch.groups.unit;
+  if (!value || value.type === "fixed" && value.value.type === "text") {
+    throw new InvalidQuantityFormat(
+      raw,
+      "Arbitrary quantities must have a numerical value"
+    );
+  }
+  const arbitrary = {
+    quantity: value
+  };
+  if (unit) arbitrary.unit = unit;
+  return arbitrary;
+}
 function parseScalingMetaVar(content, varName) {
-  const varMatch = content.match(scalingMetaValueRegex(varName));
+  const complexMatch = content.match(scalingMetaValueWithUnitRegex(varName));
+  if (complexMatch?.groups?.arbitraryQuantity) {
+    const parsed = parseArbitraryQuantity(
+      complexMatch.groups.arbitraryQuantity
+    );
+    const result2 = {
+      quantity: parsed.quantity
+    };
+    if (parsed.unit) result2.unit = parsed.unit;
+    if (complexMatch.groups.servingsPrefix) {
+      result2.textBefore = complexMatch.groups.servingsPrefix;
+    }
+    if (complexMatch.groups.servingsSuffix) {
+      result2.textAfter = complexMatch.groups.servingsSuffix;
+    }
+    return result2;
+  }
+  const varMatch = content.match(scalingSimpleMetaValueRegex(varName));
   if (!varMatch) return void 0;
   if (isNaN(Number(varMatch[2]?.trim()))) {
     throw new Error("Scaling variables should be numbers");
   }
-  return [Number(varMatch[2]?.trim()), varMatch[1].trim()];
+  const numericValue = Number(varMatch[2]?.trim());
+  const result = {
+    quantity: {
+      type: "fixed",
+      value: { type: "decimal", decimal: numericValue }
+    }
+  };
+  if (varMatch[3]) {
+    result.text = `${varMatch[3].trim()}`;
+  }
+  return result;
 }
 function parseListMetaVar(content, varName) {
   const listMatch = content.match(
@@ -1795,6 +1854,13 @@ function parseAnyMetaVar(content, varName) {
   if (simple) return parseMetadataValue(simple);
   return void 0;
 }
+function getNumericValueFromMetaVar(v) {
+  if (v.quantity.type === "fixed" && v.quantity.value.type !== "text") {
+    return getNumericValue(v.quantity.value);
+  }
+  if (v.quantity.type === "range") return getNumericValue(v.quantity.min);
+  return 0;
+}
 function extractMetadata(content) {
   const metadata = {};
   let servings = void 0;
@@ -1919,9 +1985,9 @@ function extractMetadata(content) {
   }
   for (const metaVar of ["servings", "yield", "serves"]) {
     const scalingMetaValue = parseScalingMetaVar(metadataContent, metaVar);
-    if (scalingMetaValue && scalingMetaValue[1]) {
-      metadata[metaVar] = scalingMetaValue[1];
-      servings = scalingMetaValue[0];
+    if (scalingMetaValue) {
+      metadata[metaVar] = scalingMetaValue;
+      servings = getNumericValueFromMetaVar(scalingMetaValue);
     }
   }
   const tags = parseListMetaVar(metadataContent, "tags");
@@ -2748,27 +2814,17 @@ var _Recipe = class _Recipe {
    */
   _parseArbitraryScalable(regexMatchGroups, intoArray) {
     if (!regexMatchGroups || !regexMatchGroups.arbitraryQuantity) return;
-    const quantityMatch = regexMatchGroups.arbitraryQuantity?.trim().match(quantityAlternativeRegex);
-    if (quantityMatch?.groups) {
-      const value = parseQuantityInput(quantityMatch.groups.quantity);
-      const unit = quantityMatch.groups.unit;
-      const name = regexMatchGroups.arbitraryName || void 0;
-      if (!value || value.type === "fixed" && value.value.type === "text") {
-        throw new InvalidQuantityFormat(
-          regexMatchGroups.arbitraryQuantity?.trim(),
-          "Arbitrary quantities must have a numerical value"
-        );
-      }
-      const arbitrary = {
-        quantity: value
-      };
-      if (name) arbitrary.name = name;
-      if (unit) arbitrary.unit = unit;
-      intoArray.push({
-        type: "arbitrary",
-        index: this.arbitraries.push(arbitrary) - 1
-      });
-    }
+    const parsed = parseArbitraryQuantity(regexMatchGroups.arbitraryQuantity);
+    const name = regexMatchGroups.arbitraryName || void 0;
+    const arbitrary = {
+      quantity: parsed.quantity
+    };
+    if (name) arbitrary.name = name;
+    if (parsed.unit) arbitrary.unit = parsed.unit;
+    intoArray.push({
+      type: "arbitrary",
+      index: this.arbitraries.push(arbitrary) - 1
+    });
   }
   /**
    * Parses text for arbitrary scalables and returns NoteItem array.
@@ -3097,8 +3153,8 @@ var _Recipe = class _Recipe {
           const isGrouped = "group" in item && item.group !== void 0;
           const groupAlternatives = isGrouped ? this.choices.ingredientGroups.get(item.group) : void 0;
           let selectedAltIndex = 0;
-          let isSelected = false;
-          let hasExplicitChoice = false;
+          let isSelected;
+          let hasExplicitChoice;
           if (isGrouped) {
             const groupChoice = choices?.ingredientGroups?.get(item.group);
             hasExplicitChoice = groupChoice !== void 0;
@@ -3558,37 +3614,34 @@ var _Recipe = class _Recipe {
         arbitrary.quantity,
         factor
       );
+      const optimized = applyBestUnit(
+        { quantity: arbitrary.quantity, unit: arbitrary.unit },
+        unitSystem
+      );
+      arbitrary.quantity = optimized.quantity;
+      arbitrary.unit = optimized.unit;
     }
     newRecipe._populateIngredientQuantities();
     newRecipe.servings = Big4(originalServings).times(factor).toNumber();
-    if (newRecipe.metadata.servings && this.metadata.servings) {
-      if (floatRegex.test(String(this.metadata.servings).replace(",", ".").trim())) {
-        const servingsValue = parseFloat(
-          String(this.metadata.servings).replace(",", ".")
-        );
-        newRecipe.metadata.servings = String(
-          Big4(servingsValue).times(factor).toNumber()
-        );
-      }
-    }
-    if (newRecipe.metadata.yield && this.metadata.yield) {
-      if (floatRegex.test(String(this.metadata.yield).replace(",", ".").trim())) {
-        const yieldValue = parseFloat(
-          String(this.metadata.yield).replace(",", ".")
+    for (const metaVar of ["servings", "yield", "serves"]) {
+      if (newRecipe.metadata[metaVar] && this.metadata[metaVar]) {
+        const original = this.metadata[metaVar];
+        const scaledQuantity = multiplyQuantityValue(
+          original.quantity,
+          factor
         );
-        newRecipe.metadata.yield = String(
-          Big4(yieldValue).times(factor).toNumber()
-        );
-      }
-    }
-    if (newRecipe.metadata.serves && this.metadata.serves) {
-      if (floatRegex.test(String(this.metadata.serves).replace(",", ".").trim())) {
-        const servesValue = parseFloat(
-          String(this.metadata.serves).replace(",", ".")
-        );
-        newRecipe.metadata.serves = String(
-          Big4(servesValue).times(factor).toNumber()
+        const optimized = applyBestUnit(
+          { quantity: scaledQuantity, unit: original.unit },
+          unitSystem
         );
+        const scaled = {
+          quantity: optimized.quantity
+        };
+        if (optimized.unit) scaled.unit = optimized.unit;
+        if (original.textBefore) scaled.textBefore = original.textBefore;
+        if (original.textAfter) scaled.textAfter = original.textAfter;
+        if (original.text) scaled.text = original.text;
+        newRecipe.metadata[metaVar] = scaled;
       }
     }
     return newRecipe;
@@ -4671,6 +4724,7 @@ export {
 // v8 ignore else -- @preserve
 // v8 ignore if -- @preserve
 /* v8 ignore else -- expliciting error type -- @preserve */
+/* v8 ignore next 4 -- @preserve: defensive guard; regex always matches */
 // v8 ignore if -- @preserve: defensive type guard
 /* v8 ignore if -- @preserve */
 // v8 ignore next -- @preserve