ezmedicationinput 0.1.41 → 0.1.43

package/README.md

@@ -139,6 +139,8 @@ Use either helper depending on your source:
 
 - `formatParseBatch(batch, style?, separator?)` when you already have `parseSig` output.
 - `formatSigBatch(dosages, style?, { separator })` when you have an array of FHIR `Dosage` entries.
+- `formatSig(dosage, style?, options?)` / `fromFhirDosage(dosage, options?)` when you want
+  locale-aware long-text rendering controls for a single dosage.
 
 ```ts
 import { formatParseBatch, formatSigBatch, parseSig } from "ezmedicationinput";
@@ -152,6 +154,31 @@ const shortFromFhir = formatSigBatch(batch.items.map((item) => item.fhir), "shor
 // => same combined short sig text
 ```
 
+Formatting options:
+
+- `locale`: selects the registered localization, such as `"en"` or `"th"`.
+- `i18n`: overrides or augments the registered localization callbacks.
+- `groupMealTimingsByRelation`: compacts repeated meal relation phrases when all
+  meal anchors share the same relation.
+  Example EN: `after breakfast, lunch and dinner`
+  Example TH: `หลังอาหารเช้า กลางวัน และเย็น`
+- `includeTimesPerDaySummary`: prepends a daily count when the formatter can
+  safely infer one from explicit daily anchors and no cadence already exists.
+  Example EN: `three times daily after breakfast, lunch and dinner`
+  Example TH: `วันละ 3 ครั้ง หลังอาหารเช้า กลางวัน และเย็น`
+
+Notes:
+
+- `groupMealTimingsByRelation` only applies to homogeneous specific meal anchors
+  (`before breakfast/lunch/dinner`, `after breakfast/lunch/dinner`, or `with breakfast/lunch/dinner`).
+  When additional non-meal daily anchors exist, the formatter groups the meal
+  subset and leaves the extra anchors explicit.
+  Example EN: `before breakfast, lunch and dinner and at bedtime`
+  Example TH: `ก่อนอาหารเช้า กลางวัน และเย็น และก่อนนอน`
+- `includeTimesPerDaySummary` is independent from meal grouping. It counts
+  explicit daily anchors only when no `frequency`, `timingCode`, interval, or
+  day-of-week cadence is already present.
+
 ### Sig (directions) suggestions
 
 Use `suggestSig` to drive autocomplete experiences while the clinician is

package/dist/context.d.ts

@@ -1,3 +1,4 @@
-import { MedicationContext } from "./types";
+import { MedicationContext, RouteCode } from "./types";
 export declare function normalizeDosageForm(form: string | undefined): string | undefined;
 export declare function inferUnitFromContext(ctx: MedicationContext | undefined): string | undefined;
+export declare function inferRouteFromContext(ctx: MedicationContext | undefined): RouteCode | undefined;

package/dist/context.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeDosageForm = normalizeDosageForm;
 exports.inferUnitFromContext = inferUnitFromContext;
+exports.inferRouteFromContext = inferRouteFromContext;
 const maps_1 = require("./maps");
 function normalizeDosageForm(form) {
     var _a;
@@ -32,3 +33,18 @@ function inferUnitFromContext(ctx) {
     }
     return undefined;
 }
+function inferRouteFromContext(ctx) {
+    var _a;
+    if (!(ctx === null || ctx === void 0 ? void 0 : ctx.dosageForm)) {
+        return undefined;
+    }
+    const normalized = normalizeDosageForm(ctx.dosageForm);
+    if (!normalized) {
+        return undefined;
+    }
+    const snomed = maps_1.KNOWN_TMT_DOSAGE_FORM_TO_SNOMED_ROUTE[normalized];
+    if (!snomed) {
+        return (_a = maps_1.DEFAULT_ROUTE_SYNONYMS[normalized]) === null || _a === void 0 ? void 0 : _a.code;
+    }
+    return maps_1.ROUTE_BY_SNOMED[snomed];
+}

package/dist/format.d.ts

@@ -1,3 +1,4 @@
 import { ParsedSigInternal } from "./internal-types";
 import type { SigLocalization } from "./i18n";
-export declare function formatInternal(internal: ParsedSigInternal, style: "short" | "long", localization?: SigLocalization): string;
+import { type TimingSummaryOptions } from "./timing-summary";
+export declare function formatInternal(internal: ParsedSigInternal, style: "short" | "long", localization?: SigLocalization, options?: TimingSummaryOptions): string;

package/dist/format.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatInternal = formatInternal;
 const types_1 = require("./types");
+const timing_summary_1 = require("./timing-summary");
 const ROUTE_SHORT = {
     [types_1.RouteCode["Oral route"]]: "PO",
     [types_1.RouteCode["Sublingual route"]]: "SL",
@@ -56,6 +57,12 @@ const DAY_NAMES = {
     sat: "Saturday",
     sun: "Sunday"
 };
+const EN_TIMES_PER_DAY = {
+    1: "once daily",
+    2: "twice daily",
+    3: "three times daily",
+    4: "four times daily"
+};
 const DEFAULT_ROUTE_GRAMMAR = { verb: "Use" };
 const ROUTE_GRAMMAR = {
     [types_1.RouteCode["Oral route"]]: { verb: "Take", routePhrase: "by mouth" },
@@ -201,14 +208,10 @@ function describeFrequency(internal) {
         return `${stripTrailingZero(frequency)} to ${stripTrailingZero(frequencyMax)} times daily`;
     }
     if (frequency && periodUnit === types_1.FhirPeriodUnit.Day && (!period || period === 1)) {
-        if (frequency === 1)
-            return "once daily";
-        if (frequency === 2)
-            return "twice daily";
-        if (frequency === 3)
-            return "three times daily";
-        if (frequency === 4)
-            return "four times daily";
+        const dailyText = EN_TIMES_PER_DAY[frequency];
+        if (dailyText) {
+            return dailyText;
+        }
         return `${stripTrailingZero(frequency)} times daily`;
     }
     if (periodUnit === types_1.FhirPeriodUnit.Hour && period) {
@@ -271,6 +274,16 @@ function describeFrequency(internal) {
     }
     return undefined;
 }
+function describeFrequencyCount(count) {
+    if (!count || count <= 0) {
+        return undefined;
+    }
+    const dailyText = EN_TIMES_PER_DAY[count];
+    if (dailyText) {
+        return dailyText;
+    }
+    return `${stripTrailingZero(count)} times daily`;
+}
 function formatDoseShort(internal) {
     if (internal.doseRange) {
         const { low, high } = internal.doseRange;
@@ -304,42 +317,90 @@ function formatDoseLong(internal) {
     }
     return undefined;
 }
-function collectWhenPhrases(internal) {
+function summarizeMealTimingGroup(group) {
+    let relationText = "with";
+    if (group.relation === "before") {
+        relationText = "before";
+    }
+    else if (group.relation === "after") {
+        relationText = "after";
+    }
+    return `${relationText} ${joinWithAnd(group.meals)}`;
+}
+function collectWhenPhrases(internal, options) {
+    var _a, _b;
     if (!internal.when.length) {
         return [];
     }
     const unique = [];
     const seen = new Set();
+    let hasSpecificAfter = false;
+    let hasSpecificBefore = false;
+    let hasSpecificWith = false;
     for (const code of internal.when) {
         if (!seen.has(code)) {
             seen.add(code);
             unique.push(code);
-        }
-    }
-    const hasSpecificAfter = unique.some((code) => code === types_1.EventTiming["After Breakfast"] ||
-        code === types_1.EventTiming["After Lunch"] ||
-        code === types_1.EventTiming["After Dinner"]);
-    const hasSpecificBefore = unique.some((code) => code === types_1.EventTiming["Before Breakfast"] ||
-        code === types_1.EventTiming["Before Lunch"] ||
-        code === types_1.EventTiming["Before Dinner"]);
-    const hasSpecificWith = unique.some((code) => code === types_1.EventTiming.Breakfast ||
-        code === types_1.EventTiming.Lunch ||
-        code === types_1.EventTiming.Dinner);
-    return unique
-        .filter((code) => {
+            if (code === types_1.EventTiming["After Breakfast"] ||
+                code === types_1.EventTiming["After Lunch"] ||
+                code === types_1.EventTiming["After Dinner"]) {
+                hasSpecificAfter = true;
+            }
+            if (code === types_1.EventTiming["Before Breakfast"] ||
+                code === types_1.EventTiming["Before Lunch"] ||
+                code === types_1.EventTiming["Before Dinner"]) {
+                hasSpecificBefore = true;
+            }
+            if (code === types_1.EventTiming.Breakfast ||
+                code === types_1.EventTiming.Lunch ||
+                code === types_1.EventTiming.Dinner) {
+                hasSpecificWith = true;
+            }
+        }
+    }
+    const filtered = [];
+    for (let i = 0; i < unique.length; i += 1) {
+        const code = unique[i];
         if (code === types_1.EventTiming["After Meal"] && hasSpecificAfter) {
-            return false;
+            continue;
         }
         if (code === types_1.EventTiming["Before Meal"] && hasSpecificBefore) {
-            return false;
+            continue;
         }
         if (code === types_1.EventTiming.Meal && hasSpecificWith) {
-            return false;
-        }
-        return true;
-    })
-        .map((code) => { var _a; return (_a = WHEN_TEXT[code]) !== null && _a !== void 0 ? _a : code; })
-        .filter((text) => Boolean(text));
+            continue;
+        }
+        filtered.push(code);
+    }
+    const mealGroup = (0, timing_summary_1.getMealTimingGroup)(filtered, options);
+    if (mealGroup) {
+        const groupedCodes = new Set(mealGroup.codes);
+        const phrases = [];
+        let insertedGroup = false;
+        for (let i = 0; i < filtered.length; i += 1) {
+            const code = filtered[i];
+            if (groupedCodes.has(code)) {
+                if (!insertedGroup) {
+                    phrases.push(summarizeMealTimingGroup(mealGroup));
+                    insertedGroup = true;
+                }
+                continue;
+            }
+            const text = (_a = WHEN_TEXT[code]) !== null && _a !== void 0 ? _a : code;
+            if (text) {
+                phrases.push(text);
+            }
+        }
+        return phrases;
+    }
+    const phrases = [];
+    for (let i = 0; i < filtered.length; i += 1) {
+        const text = (_b = WHEN_TEXT[filtered[i]]) !== null && _b !== void 0 ? _b : filtered[i];
+        if (text) {
+            phrases.push(text);
+        }
+    }
+    return phrases;
 }
 function joinWithAnd(parts) {
     if (!parts.length) {
@@ -485,10 +546,10 @@ function describeDayOfWeek(internal) {
     }
     return `on ${joinWithAnd(days)}`;
 }
-function formatInternal(internal, style, localization) {
+function formatInternal(internal, style, localization, options) {
     const defaults = {
         short: formatShort(internal),
-        long: formatLong(internal)
+        long: formatLong(internal, options)
     };
     if (!localization) {
         return defaults[style];
@@ -499,6 +560,8 @@ function formatInternal(internal, style, localization) {
             style: "short",
             internal,
             defaultText: defaults.short,
+            groupMealTimingsByRelation: Boolean(options === null || options === void 0 ? void 0 : options.groupMealTimingsByRelation),
+            includeTimesPerDaySummary: Boolean(options === null || options === void 0 ? void 0 : options.includeTimesPerDaySummary),
             formatDefault
         };
         return localization.formatShort(context);
@@ -508,6 +571,8 @@ function formatInternal(internal, style, localization) {
             style: "long",
             internal,
             defaultText: defaults.long,
+            groupMealTimingsByRelation: Boolean(options === null || options === void 0 ? void 0 : options.groupMealTimingsByRelation),
+            includeTimesPerDaySummary: Boolean(options === null || options === void 0 ? void 0 : options.includeTimesPerDaySummary),
             formatDefault
         };
         return localization.formatLong(context);
@@ -578,15 +643,15 @@ function formatShort(internal) {
     }
     return parts.filter(Boolean).join(" ");
 }
-function formatLong(internal) {
-    var _a, _b;
+function formatLong(internal, options) {
+    var _a, _b, _c;
     const grammar = resolveRouteGrammar(internal);
     const dosePart = (_a = formatDoseLong(internal)) !== null && _a !== void 0 ? _a : "the medication";
     const sitePart = formatSite(internal, grammar);
     const routePart = buildRoutePhrase(internal, grammar, Boolean(sitePart));
-    const frequencyPart = describeFrequency(internal);
-    const eventParts = collectWhenPhrases(internal);
-    if ((_b = internal.timeOfDay) === null || _b === void 0 ? void 0 : _b.length) {
+    const frequencyPart = (_b = describeFrequency(internal)) !== null && _b !== void 0 ? _b : describeFrequencyCount((0, timing_summary_1.inferDailyOccurrenceCount)(internal, options));
+    const eventParts = collectWhenPhrases(internal, options);
+    if ((_c = internal.timeOfDay) === null || _c === void 0 ? void 0 : _c.length) {
         const timeStrings = [];
         for (const time of internal.timeOfDay) {
             const parts = time.split(":");

package/dist/i18n.d.ts

@@ -3,6 +3,8 @@ export interface SigFormatContext {
     readonly style: "short" | "long";
     readonly internal: ParsedSigInternal;
     readonly defaultText: string;
+    readonly groupMealTimingsByRelation: boolean;
+    readonly includeTimesPerDaySummary: boolean;
     formatDefault(style: "short" | "long"): string;
 }
 export interface SigShortContext extends SigFormatContext {

package/dist/i18n.js

@@ -6,6 +6,7 @@ exports.getRegisteredSigLocalizations = getRegisteredSigLocalizations;
 exports.resolveSigLocalization = resolveSigLocalization;
 exports.resolveSigTranslation = resolveSigTranslation;
 const types_1 = require("./types");
+const timing_summary_1 = require("./timing-summary");
 const REGISTERED_LOCALIZATIONS = new Map();
 function registerSigLocalization(localization) {
     REGISTERED_LOCALIZATIONS.set(localization.locale.toLowerCase(), localization);
@@ -65,7 +66,10 @@ function createThaiLocalization() {
     return {
         locale: "th",
         formatShort: ({ internal }) => formatShortThai(internal),
-        formatLong: ({ internal }) => formatLongThai(internal)
+        formatLong: ({ internal, groupMealTimingsByRelation, includeTimesPerDaySummary }) => formatLongThai(internal, {
+            groupMealTimingsByRelation,
+            includeTimesPerDaySummary
+        })
     };
 }
 registerSigLocalization(createThaiLocalization());
@@ -125,6 +129,12 @@ const DAY_NAMES_THAI = {
     sat: "วันเสาร์",
     sun: "วันอาทิตย์"
 };
+const TH_TIMES_PER_DAY = {
+    1: "วันละครั้ง",
+    2: "วันละ 2 ครั้ง",
+    3: "วันละ 3 ครั้ง",
+    4: "วันละ 4 ครั้ง"
+};
 exports.THAI_SITE_TRANSLATIONS = {
     eye: "ตา",
     eyes: "ตา",
@@ -231,7 +241,6 @@ const THAI_ROUTE_GRAMMAR = {
     [types_1.RouteCode["Buccal route"]]: { verb: "อมกระพุ้งแก้ม", routePhrase: "ที่กระพุ้งแก้ม" },
     [types_1.RouteCode["Respiratory tract route (qualifier value)"]]: {
         verb: "สูด",
-        routePhrase: ({ hasSite }) => (hasSite ? undefined : "โดยการสูดดม"),
         sitePreposition: "ที่"
     },
     [types_1.RouteCode["Nasal route"]]: {
@@ -291,12 +300,18 @@ const THAI_ROUTE_GRAMMAR = {
     }
 };
 function resolveRouteGrammarThai(internal) {
-    var _a;
+    var _a, _b, _c;
     if (internal.routeCode && THAI_ROUTE_GRAMMAR[internal.routeCode]) {
         return (_a = THAI_ROUTE_GRAMMAR[internal.routeCode]) !== null && _a !== void 0 ? _a : DEFAULT_THAI_ROUTE_GRAMMAR;
     }
     const grammar = grammarFromRouteTextThai(internal.routeText);
-    return grammar !== null && grammar !== void 0 ? grammar : DEFAULT_THAI_ROUTE_GRAMMAR;
+    if (grammar) {
+        return grammar;
+    }
+    if (((_b = internal.unit) === null || _b === void 0 ? void 0 : _b.trim().toLowerCase()) === "puff") {
+        return (_c = THAI_ROUTE_GRAMMAR[types_1.RouteCode["Respiratory tract route (qualifier value)"]]) !== null && _c !== void 0 ? _c : DEFAULT_THAI_ROUTE_GRAMMAR;
+    }
+    return DEFAULT_THAI_ROUTE_GRAMMAR;
 }
 function grammarFromRouteTextThai(text) {
     if (!text)
@@ -418,14 +433,10 @@ function describeFrequencyThai(internal) {
         return `วันละ ${stripTrailingZero(frequency)} ถึง ${stripTrailingZero(frequencyMax)} ครั้ง`;
     }
     if (frequency && periodUnit === types_1.FhirPeriodUnit.Day && (!period || period === 1)) {
-        if (frequency === 1)
-            return "วันละครั้ง";
-        if (frequency === 2)
-            return "วันละ 2 ครั้ง";
-        if (frequency === 3)
-            return "วันละ 3 ครั้ง";
-        if (frequency === 4)
-            return "วันละ 4 ครั้ง";
+        const dailyText = TH_TIMES_PER_DAY[frequency];
+        if (dailyText) {
+            return dailyText;
+        }
         return `วันละ ${stripTrailingZero(frequency)} ครั้ง`;
     }
     if (periodUnit === types_1.FhirPeriodUnit.Hour && period) {
@@ -485,42 +496,122 @@ function describeFrequencyThai(internal) {
     }
     return undefined;
 }
-function collectWhenPhrasesThai(internal) {
+function describeFrequencyCountThai(count) {
+    if (!count || count <= 0) {
+        return undefined;
+    }
+    const dailyText = TH_TIMES_PER_DAY[count];
+    if (dailyText) {
+        return dailyText;
+    }
+    return `วันละ ${stripTrailingZero(count)} ครั้ง`;
+}
+function joinMealNamesThai(parts) {
+    if (parts.length === 0) {
+        return "";
+    }
+    if (parts.length === 1) {
+        return parts[0];
+    }
+    if (parts.length === 2) {
+        return `${parts[0]} และ${parts[1]}`;
+    }
+    let text = parts[0];
+    for (let i = 1; i < parts.length - 1; i += 1) {
+        text += ` ${parts[i]}`;
+    }
+    return `${text} และ${parts[parts.length - 1]}`;
+}
+function summarizeMealTimingGroupThai(group) {
+    const relationText = {
+        before: "ก่อนอาหาร",
+        after: "หลังอาหาร",
+        with: "พร้อมอาหาร"
+    };
+    const mealText = {
+        breakfast: "เช้า",
+        lunch: "กลางวัน",
+        dinner: "เย็น"
+    };
+    const meals = [];
+    for (let i = 0; i < group.meals.length; i += 1) {
+        meals.push(mealText[group.meals[i]]);
+    }
+    return `${relationText[group.relation]}${joinMealNamesThai(meals)}`;
+}
+function collectWhenPhrasesThai(internal, options) {
     if (!internal.when.length) {
         return [];
     }
     const unique = [];
     const seen = new Set();
+    let hasSpecificAfter = false;
+    let hasSpecificBefore = false;
+    let hasSpecificWith = false;
     for (const code of internal.when) {
         if (!seen.has(code)) {
             seen.add(code);
             unique.push(code);
+            if (code === types_1.EventTiming["After Breakfast"] ||
+                code === types_1.EventTiming["After Lunch"] ||
+                code === types_1.EventTiming["After Dinner"]) {
+                hasSpecificAfter = true;
+            }
+            if (code === types_1.EventTiming["Before Breakfast"] ||
+                code === types_1.EventTiming["Before Lunch"] ||
+                code === types_1.EventTiming["Before Dinner"]) {
+                hasSpecificBefore = true;
+            }
+            if (code === types_1.EventTiming.Breakfast ||
+                code === types_1.EventTiming.Lunch ||
+                code === types_1.EventTiming.Dinner) {
+                hasSpecificWith = true;
+            }
         }
     }
-    const hasSpecificAfter = unique.some((code) => code === types_1.EventTiming["After Breakfast"] ||
-        code === types_1.EventTiming["After Lunch"] ||
-        code === types_1.EventTiming["After Dinner"]);
-    const hasSpecificBefore = unique.some((code) => code === types_1.EventTiming["Before Breakfast"] ||
-        code === types_1.EventTiming["Before Lunch"] ||
-        code === types_1.EventTiming["Before Dinner"]);
-    const hasSpecificWith = unique.some((code) => code === types_1.EventTiming.Breakfast ||
-        code === types_1.EventTiming.Lunch ||
-        code === types_1.EventTiming.Dinner);
-    return unique
-        .filter((code) => {
+    const filtered = [];
+    for (let i = 0; i < unique.length; i += 1) {
+        const code = unique[i];
         if (code === types_1.EventTiming["After Meal"] && hasSpecificAfter) {
-            return false;
+            continue;
         }
         if (code === types_1.EventTiming["Before Meal"] && hasSpecificBefore) {
-            return false;
+            continue;
         }
         if (code === types_1.EventTiming.Meal && hasSpecificWith) {
-            return false;
+            continue;
         }
-        return true;
-    })
-        .map((code) => { var _a; return (_a = WHEN_TEXT_THAI[code]) !== null && _a !== void 0 ? _a : undefined; })
-        .filter((text) => Boolean(text));
+        filtered.push(code);
+    }
+    const mealGroup = (0, timing_summary_1.getMealTimingGroup)(filtered, options);
+    if (mealGroup) {
+        const groupedCodes = new Set(mealGroup.codes);
+        const phrases = [];
+        let insertedGroup = false;
+        for (let i = 0; i < filtered.length; i += 1) {
+            const code = filtered[i];
+            if (groupedCodes.has(code)) {
+                if (!insertedGroup) {
+                    phrases.push(summarizeMealTimingGroupThai(mealGroup));
+                    insertedGroup = true;
+                }
+                continue;
+            }
+            const text = WHEN_TEXT_THAI[code];
+            if (text) {
+                phrases.push(text);
+            }
+        }
+        return phrases;
+    }
+    const phrases = [];
+    for (let i = 0; i < filtered.length; i += 1) {
+        const text = WHEN_TEXT_THAI[filtered[i]];
+        if (text) {
+            phrases.push(text);
+        }
+    }
+    return phrases;
 }
 function joinWithAndThai(parts) {
     if (!parts.length) {
@@ -606,7 +697,7 @@ function buildRoutePhraseThai(internal, grammar, hasSite) {
         return "ทางจมูก";
     }
     if (normalized.includes("inhal")) {
-        return "โดยการสูดดม";
+        return undefined;
     }
     return text;
 }
@@ -710,15 +801,15 @@ function formatShortThai(internal) {
     }
     return parts.filter(Boolean).join(" ");
 }
-function formatLongThai(internal) {
-    var _a, _b;
+function formatLongThai(internal, options) {
+    var _a, _b, _c;
     const grammar = resolveRouteGrammarThai(internal);
     const dosePart = (_a = formatDoseThaiLong(internal)) !== null && _a !== void 0 ? _a : "ยา";
     const sitePart = formatSiteThai(internal, grammar);
     const routePart = buildRoutePhraseThai(internal, grammar, Boolean(sitePart));
-    const frequencyPart = describeFrequencyThai(internal);
-    const eventParts = collectWhenPhrasesThai(internal);
-    if ((_b = internal.timeOfDay) === null || _b === void 0 ? void 0 : _b.length) {
+    const frequencyPart = (_b = describeFrequencyThai(internal)) !== null && _b !== void 0 ? _b : describeFrequencyCountThai((0, timing_summary_1.inferDailyOccurrenceCount)(internal, options));
+    const eventParts = collectWhenPhrasesThai(internal, options);
+    if ((_c = internal.timeOfDay) === null || _c === void 0 ? void 0 : _c.length) {
         const timeStrings = [];
         for (const time of internal.timeOfDay) {
             const parts = time.split(":");

package/dist/index.js

@@ -443,7 +443,7 @@ function parseSigAsync(input, options) {
 function formatSig(dosage, style = "short", options) {
     const internal = (0, fhir_1.internalFromFhir)(dosage);
     const localization = (0, i18n_1.resolveSigLocalization)(options === null || options === void 0 ? void 0 : options.locale, options === null || options === void 0 ? void 0 : options.i18n);
-    return (0, format_1.formatInternal)(internal, style, localization);
+    return (0, format_1.formatInternal)(internal, style, localization, options);
 }
 function formatSigBatch(dosages, style = "short", options) {
     var _a;
@@ -464,12 +464,13 @@ function formatParseBatch(batch, style = "short", separator = ", ") {
     return texts.join(separator);
 }
 function fromFhirDosage(dosage, options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     const internal = (0, fhir_1.internalFromFhir)(dosage);
     const localization = (0, i18n_1.resolveSigLocalization)(options === null || options === void 0 ? void 0 : options.locale, options === null || options === void 0 ? void 0 : options.i18n);
-    const shortText = (0, format_1.formatInternal)(internal, "short", localization);
-    const computedLong = (0, format_1.formatInternal)(internal, "long", localization);
-    const longText = localization ? computedLong : (_a = dosage.text) !== null && _a !== void 0 ? _a : computedLong;
+    const shortText = (0, format_1.formatInternal)(internal, "short", localization, options);
+    const computedLong = (0, format_1.formatInternal)(internal, "long", localization, options);
+    const longText = computedLong || dosage.text || "";
+    dosage.text = longText;
     return {
         fhir: dosage,
         shortText,
@@ -480,10 +481,10 @@ function fromFhirDosage(dosage, options) {
             normalized: {
                 route: internal.routeCode,
                 unit: internal.unit,
-                site: internal.siteText || ((_b = internal.siteCoding) === null || _b === void 0 ? void 0 : _b.code)
+                site: internal.siteText || ((_a = internal.siteCoding) === null || _a === void 0 ? void 0 : _a.code)
                     ? {
                         text: internal.siteText,
-                        coding: ((_c = internal.siteCoding) === null || _c === void 0 ? void 0 : _c.code)
+                        coding: ((_b = internal.siteCoding) === null || _b === void 0 ? void 0 : _b.code)
                             ? {
                                 code: internal.siteCoding.code,
                                 display: internal.siteCoding.display,
@@ -492,10 +493,10 @@ function fromFhirDosage(dosage, options) {
                             : undefined
                     }
                     : undefined,
-                prnReason: internal.asNeededReason || ((_d = internal.asNeededReasonCoding) === null || _d === void 0 ? void 0 : _d.code)
+                prnReason: internal.asNeededReason || ((_c = internal.asNeededReasonCoding) === null || _c === void 0 ? void 0 : _c.code)
                     ? {
                         text: internal.asNeededReason,
-                        coding: ((_e = internal.asNeededReasonCoding) === null || _e === void 0 ? void 0 : _e.code)
+                        coding: ((_d = internal.asNeededReasonCoding) === null || _d === void 0 ? void 0 : _d.code)
                             ? {
                                 code: internal.asNeededReasonCoding.code,
                                 display: internal.asNeededReasonCoding.display,
@@ -504,7 +505,7 @@ function fromFhirDosage(dosage, options) {
                             : undefined
                     }
                     : undefined,
-                additionalInstructions: ((_f = internal.additionalInstructions) === null || _f === void 0 ? void 0 : _f.length)
+                additionalInstructions: ((_e = internal.additionalInstructions) === null || _e === void 0 ? void 0 : _e.length)
                     ? internal.additionalInstructions.map((instruction) => {
                         var _a;
                         return ({
@@ -526,8 +527,8 @@ function fromFhirDosage(dosage, options) {
 function buildParseResult(internal, options) {
     var _a, _b, _c;
     const localization = (0, i18n_1.resolveSigLocalization)(options === null || options === void 0 ? void 0 : options.locale, options === null || options === void 0 ? void 0 : options.i18n);
-    const shortText = (0, format_1.formatInternal)(internal, "short", localization);
-    const longText = (0, format_1.formatInternal)(internal, "long", localization);
+    const shortText = (0, format_1.formatInternal)(internal, "short", localization, options);
+    const longText = (0, format_1.formatInternal)(internal, "long", localization, options);
     const fhir = (0, fhir_1.toFhir)(internal);
     if (longText) {
         fhir.text = longText;

package/dist/parser.js

@@ -336,6 +336,7 @@ const EYE_SITE_TOKENS = {
 };
 const OPHTHALMIC_ROUTE_CODES = new Set([
     types_1.RouteCode["Ophthalmic route"],
+    types_1.RouteCode["Ocular route (qualifier value)"],
     types_1.RouteCode["Intravitreal route (qualifier value)"]
 ]);
 const OPHTHALMIC_CONTEXT_TOKENS = new Set([
@@ -538,9 +539,13 @@ function shouldTreatEyeTokenAsSite(internal, tokens, index, context) {
     const currentToken = tokens[index];
     const normalizedSelf = normalizeTokenLower(currentToken);
     const eyeMeta = EYE_SITE_TOKENS[normalizedSelf];
+    const contextRoute = (0, context_1.inferRouteFromContext)(context !== null && context !== void 0 ? context : undefined);
     if (internal.routeCode && !OPHTHALMIC_ROUTE_CODES.has(internal.routeCode)) {
         return false;
     }
+    if (contextRoute && !OPHTHALMIC_ROUTE_CODES.has(contextRoute)) {
+        return false;
+    }
     if (internal.siteText) {
         return false;
     }
@@ -548,7 +553,9 @@ function shouldTreatEyeTokenAsSite(internal, tokens, index, context) {
         return false;
     }
     const dosageForm = (_a = context === null || context === void 0 ? void 0 : context.dosageForm) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-    const contextImpliesOphthalmic = Boolean(dosageForm && /(eye|ophth|ocular|intravit)/i.test(dosageForm));
+    const contextImpliesOphthalmic = contextRoute
+        ? OPHTHALMIC_ROUTE_CODES.has(contextRoute)
+        : Boolean(dosageForm && /(eye|ophth|ocular|intravit)/i.test(dosageForm));
     const eyeRouteImpliesOphthalmic = (eyeMeta === null || eyeMeta === void 0 ? void 0 : eyeMeta.route) === types_1.RouteCode["Intravitreal route (qualifier value)"];
     const ophthalmicContext = hasOphthalmicContextHint(tokens, index) ||
         (internal.routeCode !== undefined && OPHTHALMIC_ROUTE_CODES.has(internal.routeCode)) ||

package/dist/timing-summary.d.ts

@@ -0,0 +1,15 @@
+import { ParsedSigInternal } from "./internal-types";
+import { EventTiming } from "./types";
+export interface TimingSummaryOptions {
+    groupMealTimingsByRelation?: boolean;
+    includeTimesPerDaySummary?: boolean;
+}
+export type MealRelation = "before" | "after" | "with";
+export type MealName = "breakfast" | "lunch" | "dinner";
+export interface MealTimingGroup {
+    relation: MealRelation;
+    meals: MealName[];
+    codes: EventTiming[];
+}
+export declare function getMealTimingGroup(when: EventTiming[], options?: TimingSummaryOptions): MealTimingGroup | undefined;
+export declare function inferDailyOccurrenceCount(internal: ParsedSigInternal, options?: TimingSummaryOptions): number | undefined;

package/dist/timing-summary.js

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMealTimingGroup = getMealTimingGroup;
+exports.inferDailyOccurrenceCount = inferDailyOccurrenceCount;
+const types_1 = require("./types");
+const MEAL_TIMING_DETAILS = {
+    [types_1.EventTiming["Before Breakfast"]]: { relation: "before", meal: "breakfast" },
+    [types_1.EventTiming["Before Lunch"]]: { relation: "before", meal: "lunch" },
+    [types_1.EventTiming["Before Dinner"]]: { relation: "before", meal: "dinner" },
+    [types_1.EventTiming["After Breakfast"]]: { relation: "after", meal: "breakfast" },
+    [types_1.EventTiming["After Lunch"]]: { relation: "after", meal: "lunch" },
+    [types_1.EventTiming["After Dinner"]]: { relation: "after", meal: "dinner" },
+    [types_1.EventTiming.Breakfast]: { relation: "with", meal: "breakfast" },
+    [types_1.EventTiming.Lunch]: { relation: "with", meal: "lunch" },
+    [types_1.EventTiming.Dinner]: { relation: "with", meal: "dinner" }
+};
+const MEAL_ORDER = {
+    breakfast: 0,
+    lunch: 1,
+    dinner: 2
+};
+const INFERABLE_DAILY_EVENT_TIMINGS = new Set([
+    types_1.EventTiming["Before Sleep"],
+    types_1.EventTiming["Before Breakfast"],
+    types_1.EventTiming["Before Lunch"],
+    types_1.EventTiming["Before Dinner"],
+    types_1.EventTiming["After Breakfast"],
+    types_1.EventTiming["After Lunch"],
+    types_1.EventTiming["After Dinner"],
+    types_1.EventTiming.Breakfast,
+    types_1.EventTiming.Lunch,
+    types_1.EventTiming.Dinner,
+    types_1.EventTiming.Morning,
+    types_1.EventTiming["Early Morning"],
+    types_1.EventTiming["Late Morning"],
+    types_1.EventTiming.Noon,
+    types_1.EventTiming.Afternoon,
+    types_1.EventTiming["Early Afternoon"],
+    types_1.EventTiming["Late Afternoon"],
+    types_1.EventTiming.Evening,
+    types_1.EventTiming["Early Evening"],
+    types_1.EventTiming["Late Evening"],
+    types_1.EventTiming.Night,
+    types_1.EventTiming.Wake,
+    types_1.EventTiming["After Sleep"]
+]);
+function uniqueValues(values) {
+    const seen = new Set();
+    const result = [];
+    for (const value of values) {
+        if (!seen.has(value)) {
+            seen.add(value);
+            result.push(value);
+        }
+    }
+    return result;
+}
+function getMealTimingGroup(when, options) {
+    if (!(options === null || options === void 0 ? void 0 : options.groupMealTimingsByRelation)) {
+        return undefined;
+    }
+    const uniqueWhen = uniqueValues(when);
+    if (uniqueWhen.length < 2) {
+        return undefined;
+    }
+    let relation;
+    const meals = [];
+    const groupedCodes = [];
+    let sawFirstMeal = false;
+    for (let i = 0; i < uniqueWhen.length; i += 1) {
+        const code = uniqueWhen[i];
+        const detail = MEAL_TIMING_DETAILS[code];
+        if (!detail) {
+            if (sawFirstMeal) {
+                break;
+            }
+            continue;
+        }
+        if (!sawFirstMeal) {
+            sawFirstMeal = true;
+        }
+        if (!relation) {
+            relation = detail.relation;
+        }
+        else if (relation !== detail.relation) {
+            break;
+        }
+        meals.push(detail.meal);
+        groupedCodes.push(code);
+    }
+    if (groupedCodes.length < 2) {
+        return undefined;
+    }
+    for (let i = 1; i < meals.length; i += 1) {
+        const current = meals[i];
+        let j = i - 1;
+        while (j >= 0 && MEAL_ORDER[meals[j]] > MEAL_ORDER[current]) {
+            meals[j + 1] = meals[j];
+            j -= 1;
+        }
+        meals[j + 1] = current;
+    }
+    if (!relation) {
+        return undefined;
+    }
+    return {
+        relation,
+        meals,
+        codes: groupedCodes
+    };
+}
+function inferDailyOccurrenceCount(internal, options) {
+    var _a;
+    if (!(options === null || options === void 0 ? void 0 : options.includeTimesPerDaySummary)) {
+        return undefined;
+    }
+    if (internal.frequency !== undefined || internal.frequencyMax !== undefined || internal.timingCode) {
+        return undefined;
+    }
+    if (internal.period !== undefined || internal.periodMax !== undefined || internal.periodUnit !== undefined) {
+        return undefined;
+    }
+    if (internal.dayOfWeek.length > 0) {
+        return undefined;
+    }
+    const uniqueWhen = uniqueValues(internal.when);
+    for (let i = 0; i < uniqueWhen.length; i += 1) {
+        if (!INFERABLE_DAILY_EVENT_TIMINGS.has(uniqueWhen[i])) {
+            return undefined;
+        }
+    }
+    const uniqueTimes = uniqueValues((_a = internal.timeOfDay) !== null && _a !== void 0 ? _a : []);
+    const occurrences = uniqueWhen.length + uniqueTimes.length;
+    if (occurrences === 0) {
+        return undefined;
+    }
+    return occurrences;
+}

package/dist/types.d.ts

@@ -296,6 +296,17 @@ export interface MedicationContext {
 export interface FormatOptions {
     locale?: "en" | "th" | string;
     i18n?: SigTranslationConfig;
+    /**
+     * Collapses repeated meal relation phrases into a grouped phrase when all
+     * meal anchors share the same relation (for example, "after breakfast,
+     * lunch and dinner" instead of repeating "after" for each meal).
+     */
+    groupMealTimingsByRelation?: boolean;
+    /**
+     * Adds a per-day frequency summary when it can be derived safely from the
+     * schedule (for example, "three times daily" or "วันละ 3 ครั้ง").
+     */
+    includeTimesPerDaySummary?: boolean;
 }
 export interface FormatBatchOptions extends FormatOptions {
     /**

package/dist/utils/enum.d.ts

@@ -0,0 +1,2 @@
+export declare function enumEntries<T extends Record<string, string | number>>(enumeration: T): Array<[keyof T, T[keyof T]]>;
+export declare function enumValues<T extends Record<string, string | number>>(enumeration: T): Array<T[keyof T]>;

package/dist/utils/enum.js

@@ -0,0 +1,7 @@
+import { objectEntries, objectValues } from "./object";
+export function enumEntries(enumeration) {
+    return objectEntries(enumeration);
+}
+export function enumValues(enumeration) {
+    return objectValues(enumeration);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ezmedicationinput",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "description": "Parse concise medication sigs into FHIR R5 Dosage JSON",
   "type": "module",
   "main": "dist/index.js",