@4kk11/cooklang-sankey 0.1.2 → 0.1.4

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { CooklangRecipe, Step } from '@cooklang/cooklang';
-export { Content, CooklangParser, CooklangRecipe, FlatCookware, FlatIngredient, FlatTimer, Ingredient, Item, Quantity, Section, Step, Value, cookware_display_name, getFlatCookware, getFlatIngredients, getFlatTimers, ingredient_display_name, quantity_display } from '@cooklang/cooklang';
+import { CooklangRecipe, Value, Quantity, Step } from '@cooklang/cooklang';
+export { Content, CooklangParser, CooklangRecipe, Ingredient, Item, Quantity, Section, Step, Value, getNumericValue, quantity_display } from '@cooklang/cooklang';
 
 /**
  * Cooklang Parser wrapper using official @cooklang/cooklang package.
@@ -339,178 +339,78 @@ declare const generateSankeyData: (recipe: CooklangRecipe, options?: SankeyGener
 declare const optimizeSankeyData: (data: SankeyData) => SankeyData;
 
 /**
- * Step text generation utilities using official @cooklang/cooklang package.
+ * Value formatting utilities using official @cooklang/cooklang package.
  *
  * @remarks
- * Provides utilities for converting Cooklang step items into human-readable
- * string representations using official display functions.
+ * Provides utilities for converting Cooklang quantity and value types
+ * into human-readable string representations.
  *
  * @packageDocumentation
  */
 
 /**
- * Generates complete text from step items by resolving references.
- *
- * @remarks
- * Converts a Step's items array into a readable string by:
- * - Keeping text items as-is
- * - Resolving ingredient references to "name(quantity)" format using official display functions
- * - Resolving cookware references to their display names
- * - Resolving timer references to their display values
- *
- * @param step - The Step object containing items to format
- * @param recipe - The parent CooklangRecipe for resolving references
- * @returns A concatenated string of all step items
+ * Formats a Cooklang Value to a string representation.
  *
- * @example
- * ```ts
- * // For a step with text "Cook " + ingredient(pasta, 400g) + " until done"
- * generateStepText(step, recipe);
- * // "Cook pasta(400 g) until done"
- * ```
- */
-declare const generateStepText: (step: Step, recipe: CooklangRecipe) => string;
-
-/**
- * Display-ready recipe types for UI rendering.
+ * @param value - The Value object to format (number, range, or text)
+ * @returns A string representation of the value, or empty string if null/undefined
  *
  * @remarks
- * These types represent formatted recipe data suitable for direct UI display.
- * They use simple string values for quantities and units, making them easy
- * to render without additional formatting logic.
- *
- * @packageDocumentation
- */
-/**
- * Ingredient formatted for display.
+ * Handles both Regular and Fraction number types from the WASM parser.
+ * Fractions are displayed in their natural form (e.g., "1/2", "2 1/2").
  *
  * @example
  * ```ts
- * const ingredient: DisplayIngredient = {
- *   name: "小麦粉",
- *   quantity: "200",
- *   unit: "g"
- * };
+ * // Regular number
+ * formatValue({ type: "number", value: { type: "regular", value: 200 } }); // "200"
+ * // Fraction
+ * formatValue({ type: "number", value: { type: "fraction", value: { whole: 0, num: 1, den: 2, err: 0 } } }); // "1/2"
+ * // Range with fractions
+ * formatValue({ type: "range", value: { start: { type: "regular", value: 2 }, end: { type: "regular", value: 3 } } }); // "2-3"
+ * formatValue({ type: "text", value: "some" }); // "some"
+ * formatValue(null); // ""
  * ```
  */
-interface DisplayIngredient {
-    readonly name: string;
-    readonly quantity: string;
-    readonly unit: string;
-}
+declare const formatValue: (value: Value | null | undefined) => string;
 /**
- * Cookware formatted for display.
+ * Formats a Cooklang Quantity into separate value and unit strings.
  *
- * @example
- * ```ts
- * const cookware: DisplayCookware = {
- *   name: "フライパン",
- *   note: "26cm"
- * };
- * ```
- */
-interface DisplayCookware {
-    readonly name: string;
-    readonly note: string;
-}
-/**
- * Timer formatted for display.
+ * @param quantity - The Quantity object to format
+ * @returns An object with `quantity` (numeric string) and `unit` (unit string)
  *
  * @example
  * ```ts
- * const timer: DisplayTimer = {
- *   name: "煮込み",
- *   quantity: "30",
- *   unit: "分"
- * };
- * ```
- */
-interface DisplayTimer {
-    readonly name: string;
-    readonly quantity: string;
-    readonly unit: string;
-}
-/**
- * Step formatted for display.
+ * formatQuantityAmount({ value: { type: "number", value: 200 }, unit: "g" });
+ * // { quantity: "200", unit: "g" }
  *
- * @example
- * ```ts
- * const step: DisplayStep = {
- *   text: "小麦粉(200g)と卵(2個)を混ぜる"
- * };
+ * formatQuantityAmount(null);
+ * // { quantity: "", unit: "" }
  * ```
  */
-interface DisplayStep {
-    readonly text: string;
-}
-/**
- * Complete recipe data formatted for UI display.
- *
- * @remarks
- * This interface represents a fully parsed and formatted recipe
- * ready for rendering in a UI component. All values are strings
- * for easy display without additional formatting.
- *
- * @example
- * ```ts
- * import { parseRecipeForDisplay } from '@4kk11/cooklang-sankey';
- *
- * const displayData = parseRecipeForDisplay(recipe);
- * displayData.ingredients.forEach(ing => {
- *   console.log(`${ing.name}: ${ing.quantity}${ing.unit}`);
- * });
- * ```
- */
-interface DisplayRecipe {
-    readonly ingredients: readonly DisplayIngredient[];
-    readonly cookware: readonly DisplayCookware[];
-    readonly timers: readonly DisplayTimer[];
-    readonly steps: readonly DisplayStep[];
-}
-
-/**
- * Recipe display utilities for UI rendering.
- *
- * @remarks
- * Provides utilities for converting parsed CooklangRecipe objects into
- * display-ready data structures suitable for UI rendering.
- *
- * Uses the official @cooklang/cooklang package's convenience functions
- * for accurate quantity aggregation and formatting.
- *
- * @packageDocumentation
- */
-
+declare const formatQuantityAmount: (quantity: Quantity | null | undefined) => {
+    quantity: string;
+    unit: string;
+};
 /**
- * Parses a CooklangRecipe into a display-ready format.
+ * Generates complete text from step items by resolving references.
  *
  * @remarks
- * Uses the official @cooklang/cooklang package's convenience functions
- * (`getFlatIngredients`, `getFlatCookware`, `getFlatTimers`) for proper
- * handling of grouped quantities.
+ * Converts a Step's items array into a readable string by:
+ * - Keeping text items as-is
+ * - Resolving ingredient references to "name(quantity)" format
+ * - Resolving cookware references to their names
+ * - Resolving timer references to their display values
  *
- * @param recipe - The parsed CooklangRecipe object
- * @returns DisplayRecipe with formatted data for UI rendering
+ * @param step - The Step object containing items to format
+ * @param recipe - The parent CooklangRecipe for resolving references
+ * @returns A concatenated string of all step items
  *
  * @example
  * ```ts
- * import { CooklangParser, parseRecipeForDisplay } from '@4kk11/cooklang-sankey';
- *
- * const parser = new CooklangParser();
- * const [recipe] = parser.parse(recipeText);
- * const displayData = parseRecipeForDisplay(recipe);
- *
- * // Render ingredients
- * displayData.ingredients.forEach(ing => {
- *   console.log(`${ing.name}: ${ing.quantity}${ing.unit}`);
- * });
- *
- * // Render steps
- * displayData.steps.forEach((step, i) => {
- *   console.log(`${i + 1}. ${step.text}`);
- * });
+ * // For a step with text "Cook " + ingredient(pasta, 400g) + " until done"
+ * generateStepText(step, recipe);
+ * // "Cook pasta(400g) until done"
  * ```
  */
-declare function parseRecipeForDisplay(recipe: CooklangRecipe): DisplayRecipe;
+declare const generateStepText: (step: Step, recipe: CooklangRecipe) => string;
 
-export { type BaseLinkMetadata, type BaseNodeMetadata, type BaseSankeyLink, type BaseSankeyNode, type DAGEdge, type DAGNode, type DisplayCookware, type DisplayIngredient, type DisplayRecipe, type DisplayStep, type DisplayTimer, type ExtractedValue, type NodeCategory, type RecipeMetadata, type SankeyData, type SankeyGeneratorOptions, type SankeyLink, type SankeyNode, type TransformationType, extractMetadata, generateSankeyData, generateStepText, optimizeSankeyData, parseRecipeForDisplay };
+export { type BaseLinkMetadata, type BaseNodeMetadata, type BaseSankeyLink, type BaseSankeyNode, type DAGEdge, type DAGNode, type ExtractedValue, type NodeCategory, type RecipeMetadata, type SankeyData, type SankeyGeneratorOptions, type SankeyLink, type SankeyNode, type TransformationType, extractMetadata, formatQuantityAmount, formatValue, generateSankeyData, generateStepText, optimizeSankeyData };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { CooklangRecipe, Step } from '@cooklang/cooklang';
-export { Content, CooklangParser, CooklangRecipe, FlatCookware, FlatIngredient, FlatTimer, Ingredient, Item, Quantity, Section, Step, Value, cookware_display_name, getFlatCookware, getFlatIngredients, getFlatTimers, ingredient_display_name, quantity_display } from '@cooklang/cooklang';
+import { CooklangRecipe, Value, Quantity, Step } from '@cooklang/cooklang';
+export { Content, CooklangParser, CooklangRecipe, Ingredient, Item, Quantity, Section, Step, Value, getNumericValue, quantity_display } from '@cooklang/cooklang';
 
 /**
  * Cooklang Parser wrapper using official @cooklang/cooklang package.
@@ -339,178 +339,78 @@ declare const generateSankeyData: (recipe: CooklangRecipe, options?: SankeyGener
 declare const optimizeSankeyData: (data: SankeyData) => SankeyData;
 
 /**
- * Step text generation utilities using official @cooklang/cooklang package.
+ * Value formatting utilities using official @cooklang/cooklang package.
  *
  * @remarks
- * Provides utilities for converting Cooklang step items into human-readable
- * string representations using official display functions.
+ * Provides utilities for converting Cooklang quantity and value types
+ * into human-readable string representations.
  *
  * @packageDocumentation
  */
 
 /**
- * Generates complete text from step items by resolving references.
- *
- * @remarks
- * Converts a Step's items array into a readable string by:
- * - Keeping text items as-is
- * - Resolving ingredient references to "name(quantity)" format using official display functions
- * - Resolving cookware references to their display names
- * - Resolving timer references to their display values
- *
- * @param step - The Step object containing items to format
- * @param recipe - The parent CooklangRecipe for resolving references
- * @returns A concatenated string of all step items
+ * Formats a Cooklang Value to a string representation.
  *
- * @example
- * ```ts
- * // For a step with text "Cook " + ingredient(pasta, 400g) + " until done"
- * generateStepText(step, recipe);
- * // "Cook pasta(400 g) until done"
- * ```
- */
-declare const generateStepText: (step: Step, recipe: CooklangRecipe) => string;
-
-/**
- * Display-ready recipe types for UI rendering.
+ * @param value - The Value object to format (number, range, or text)
+ * @returns A string representation of the value, or empty string if null/undefined
  *
  * @remarks
- * These types represent formatted recipe data suitable for direct UI display.
- * They use simple string values for quantities and units, making them easy
- * to render without additional formatting logic.
- *
- * @packageDocumentation
- */
-/**
- * Ingredient formatted for display.
+ * Handles both Regular and Fraction number types from the WASM parser.
+ * Fractions are displayed in their natural form (e.g., "1/2", "2 1/2").
  *
  * @example
  * ```ts
- * const ingredient: DisplayIngredient = {
- *   name: "小麦粉",
- *   quantity: "200",
- *   unit: "g"
- * };
+ * // Regular number
+ * formatValue({ type: "number", value: { type: "regular", value: 200 } }); // "200"
+ * // Fraction
+ * formatValue({ type: "number", value: { type: "fraction", value: { whole: 0, num: 1, den: 2, err: 0 } } }); // "1/2"
+ * // Range with fractions
+ * formatValue({ type: "range", value: { start: { type: "regular", value: 2 }, end: { type: "regular", value: 3 } } }); // "2-3"
+ * formatValue({ type: "text", value: "some" }); // "some"
+ * formatValue(null); // ""
  * ```
  */
-interface DisplayIngredient {
-    readonly name: string;
-    readonly quantity: string;
-    readonly unit: string;
-}
+declare const formatValue: (value: Value | null | undefined) => string;
 /**
- * Cookware formatted for display.
+ * Formats a Cooklang Quantity into separate value and unit strings.
  *
- * @example
- * ```ts
- * const cookware: DisplayCookware = {
- *   name: "フライパン",
- *   note: "26cm"
- * };
- * ```
- */
-interface DisplayCookware {
-    readonly name: string;
-    readonly note: string;
-}
-/**
- * Timer formatted for display.
+ * @param quantity - The Quantity object to format
+ * @returns An object with `quantity` (numeric string) and `unit` (unit string)
  *
  * @example
  * ```ts
- * const timer: DisplayTimer = {
- *   name: "煮込み",
- *   quantity: "30",
- *   unit: "分"
- * };
- * ```
- */
-interface DisplayTimer {
-    readonly name: string;
-    readonly quantity: string;
-    readonly unit: string;
-}
-/**
- * Step formatted for display.
+ * formatQuantityAmount({ value: { type: "number", value: 200 }, unit: "g" });
+ * // { quantity: "200", unit: "g" }
  *
- * @example
- * ```ts
- * const step: DisplayStep = {
- *   text: "小麦粉(200g)と卵(2個)を混ぜる"
- * };
+ * formatQuantityAmount(null);
+ * // { quantity: "", unit: "" }
  * ```
  */
-interface DisplayStep {
-    readonly text: string;
-}
-/**
- * Complete recipe data formatted for UI display.
- *
- * @remarks
- * This interface represents a fully parsed and formatted recipe
- * ready for rendering in a UI component. All values are strings
- * for easy display without additional formatting.
- *
- * @example
- * ```ts
- * import { parseRecipeForDisplay } from '@4kk11/cooklang-sankey';
- *
- * const displayData = parseRecipeForDisplay(recipe);
- * displayData.ingredients.forEach(ing => {
- *   console.log(`${ing.name}: ${ing.quantity}${ing.unit}`);
- * });
- * ```
- */
-interface DisplayRecipe {
-    readonly ingredients: readonly DisplayIngredient[];
-    readonly cookware: readonly DisplayCookware[];
-    readonly timers: readonly DisplayTimer[];
-    readonly steps: readonly DisplayStep[];
-}
-
-/**
- * Recipe display utilities for UI rendering.
- *
- * @remarks
- * Provides utilities for converting parsed CooklangRecipe objects into
- * display-ready data structures suitable for UI rendering.
- *
- * Uses the official @cooklang/cooklang package's convenience functions
- * for accurate quantity aggregation and formatting.
- *
- * @packageDocumentation
- */
-
+declare const formatQuantityAmount: (quantity: Quantity | null | undefined) => {
+    quantity: string;
+    unit: string;
+};
 /**
- * Parses a CooklangRecipe into a display-ready format.
+ * Generates complete text from step items by resolving references.
  *
  * @remarks
- * Uses the official @cooklang/cooklang package's convenience functions
- * (`getFlatIngredients`, `getFlatCookware`, `getFlatTimers`) for proper
- * handling of grouped quantities.
+ * Converts a Step's items array into a readable string by:
+ * - Keeping text items as-is
+ * - Resolving ingredient references to "name(quantity)" format
+ * - Resolving cookware references to their names
+ * - Resolving timer references to their display values
  *
- * @param recipe - The parsed CooklangRecipe object
- * @returns DisplayRecipe with formatted data for UI rendering
+ * @param step - The Step object containing items to format
+ * @param recipe - The parent CooklangRecipe for resolving references
+ * @returns A concatenated string of all step items
  *
  * @example
  * ```ts
- * import { CooklangParser, parseRecipeForDisplay } from '@4kk11/cooklang-sankey';
- *
- * const parser = new CooklangParser();
- * const [recipe] = parser.parse(recipeText);
- * const displayData = parseRecipeForDisplay(recipe);
- *
- * // Render ingredients
- * displayData.ingredients.forEach(ing => {
- *   console.log(`${ing.name}: ${ing.quantity}${ing.unit}`);
- * });
- *
- * // Render steps
- * displayData.steps.forEach((step, i) => {
- *   console.log(`${i + 1}. ${step.text}`);
- * });
+ * // For a step with text "Cook " + ingredient(pasta, 400g) + " until done"
+ * generateStepText(step, recipe);
+ * // "Cook pasta(400g) until done"
  * ```
  */
-declare function parseRecipeForDisplay(recipe: CooklangRecipe): DisplayRecipe;
+declare const generateStepText: (step: Step, recipe: CooklangRecipe) => string;
 
-export { type BaseLinkMetadata, type BaseNodeMetadata, type BaseSankeyLink, type BaseSankeyNode, type DAGEdge, type DAGNode, type DisplayCookware, type DisplayIngredient, type DisplayRecipe, type DisplayStep, type DisplayTimer, type ExtractedValue, type NodeCategory, type RecipeMetadata, type SankeyData, type SankeyGeneratorOptions, type SankeyLink, type SankeyNode, type TransformationType, extractMetadata, generateSankeyData, generateStepText, optimizeSankeyData, parseRecipeForDisplay };
+export { type BaseLinkMetadata, type BaseNodeMetadata, type BaseSankeyLink, type BaseSankeyNode, type DAGEdge, type DAGNode, type ExtractedValue, type NodeCategory, type RecipeMetadata, type SankeyData, type SankeyGeneratorOptions, type SankeyLink, type SankeyNode, type TransformationType, extractMetadata, formatQuantityAmount, formatValue, generateSankeyData, generateStepText, optimizeSankeyData };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { ingredient_display_name, quantity_display, cookware_display_name, getFlatIngredients, getFlatCookware, getFlatTimers, grouped_quantity_is_empty, grouped_quantity_display, getNumericValue } from '@cooklang/cooklang';
-export { CooklangParser, CooklangRecipe, cookware_display_name, getFlatCookware, getFlatIngredients, getFlatTimers, ingredient_display_name, quantity_display } from '@cooklang/cooklang';
+import { quantity_display, grouped_quantity_is_empty, grouped_quantity_display, getNumericValue } from '@cooklang/cooklang';
+export { CooklangParser, CooklangRecipe, getNumericValue, quantity_display } from '@cooklang/cooklang';
 import toposort from 'toposort';
 
 // src/parser.ts
@@ -136,20 +136,63 @@ var calculateNodeValues = (nodes, sortedNodeIds) => {
   }
   return valueMap;
 };
+var formatNumber = (num) => {
+  if (num.type === "regular") {
+    return num.value.toString();
+  } else if (num.type === "fraction") {
+    const { whole, num: numerator, den } = num.value;
+    if (whole === 0 && numerator === 0) {
+      return "0";
+    }
+    if (numerator === 0) {
+      return whole.toString();
+    }
+    if (whole === 0) {
+      return `${numerator}/${den}`;
+    }
+    return `${whole} ${numerator}/${den}`;
+  }
+  return "";
+};
+var formatValue = (value) => {
+  if (!value) return "";
+  if (value.type === "number") {
+    const numValue = value.value;
+    return formatNumber(numValue);
+  } else if (value.type === "range") {
+    const rangeValue = value.value;
+    const startStr = formatNumber(rangeValue.start);
+    const endStr = formatNumber(rangeValue.end);
+    if (startStr && endStr) {
+      return `${startStr}-${endStr}`;
+    }
+    return "";
+  } else if (value.type === "text") {
+    return value.value;
+  }
+  return "";
+};
+var formatQuantityAmount = (quantity) => {
+  if (!quantity) {
+    return { quantity: "", unit: "" };
+  }
+  return {
+    quantity: formatValue(quantity.value),
+    unit: quantity.unit || ""
+  };
+};
 var generateStepText = (step, recipe) => {
   return step.items.map((item) => {
     if (item.type === "text") {
       return item.value;
     } else if (item.type === "ingredient") {
-      const ingredient = recipe.ingredients[item.index];
-      if (!ingredient) return "";
-      const name = ingredient_display_name(ingredient);
-      const quantityText = ingredient.quantity ? `(${quantity_display(ingredient.quantity)})` : "";
-      return `${name}${quantityText}`;
+      const originalIngredient = recipe.ingredients[item.index];
+      if (!originalIngredient) return "";
+      const formatted = formatQuantityAmount(originalIngredient.quantity);
+      const quantityText = formatted.quantity && formatted.unit ? `(${formatted.quantity}${formatted.unit})` : formatted.quantity ? `(${formatted.quantity})` : "";
+      return `${originalIngredient.name}${quantityText}`;
     } else if (item.type === "cookware") {
-      const cookware = recipe.cookware[item.index];
-      if (!cookware) return "";
-      return cookware_display_name(cookware);
+      return recipe.cookware[item.index]?.name || "";
     } else if (item.type === "timer") {
       const timer = recipe.timers[item.index];
       if (!timer) return "";
@@ -435,41 +478,7 @@ var optimizeSankeyData = (data) => {
     links: normalizedLinks
   };
 };
-function parseRecipeForDisplay(recipe) {
-  const flatIngredients = getFlatIngredients(recipe);
-  const ingredients = flatIngredients.map((ing) => ({
-    name: ing.name,
-    quantity: ing.quantity !== null ? String(ing.quantity) : "",
-    unit: ing.unit || ""
-  }));
-  const flatCookware = getFlatCookware(recipe);
-  const cookware = flatCookware.map((cw) => ({
-    name: cw.name,
-    note: cw.note || ""
-  }));
-  const flatTimers = getFlatTimers(recipe);
-  const timers = flatTimers.map((timer) => ({
-    name: timer.name || "",
-    quantity: timer.quantity !== null ? String(timer.quantity) : "",
-    unit: timer.unit || "minutes"
-  }));
-  const steps = [];
-  for (const section of recipe.sections) {
-    for (const content of section.content) {
-      if (content.type === "step") {
-        const stepText = generateStepText(content.value, recipe);
-        steps.push({ text: stepText });
-      }
-    }
-  }
-  return {
-    ingredients,
-    cookware,
-    timers,
-    steps
-  };
-}
 
-export { extractMetadata, generateSankeyData, generateStepText, optimizeSankeyData, parseRecipeForDisplay };
+export { extractMetadata, formatQuantityAmount, formatValue, generateSankeyData, generateStepText, optimizeSankeyData };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map