ezmedicationinput 0.1.36 → 0.1.37

package/dist/i18n.js

@@ -551,8 +551,25 @@ function combineFrequencyAndEventsThai(frequency, events) {
     }
     return { frequency, event: joinWithAndThai(events) };
 }
+function isOralRouteThai(internal) {
+    var _a;
+    if (internal.routeCode === types_1.RouteCode["Oral route"]) {
+        return true;
+    }
+    const text = (_a = internal.routeText) === null || _a === void 0 ? void 0 : _a.trim().toLowerCase();
+    if (!text) {
+        return false;
+    }
+    return (text === "po" ||
+        text === "oral" ||
+        text.includes("mouth") ||
+        text.includes("per os"));
+}
 function buildRoutePhraseThai(internal, grammar, hasSite) {
     var _a;
+    if (grammar.verb === "รับประทาน" && isOralRouteThai(internal)) {
+        return undefined;
+    }
     if (typeof grammar.routePhrase === "function") {
         return grammar.routePhrase({ hasSite, internal });
     }

package/dist/schedule.js

@@ -419,6 +419,69 @@ function expandWhenCodes(whenCodes, config, repeat) {
         return a.time.localeCompare(b.time);
     });
 }
+const DEFAULT_WHEN_FALLBACK_CLOCKS = {
+    [types_1.EventTiming.Wake]: ["06:00:00"],
+    [types_1.EventTiming["Early Morning"]]: ["06:00:00"],
+    [types_1.EventTiming.Morning]: ["08:00:00"],
+    [types_1.EventTiming["Late Morning"]]: ["10:00:00"],
+    [types_1.EventTiming.Breakfast]: ["08:00:00"],
+    [types_1.EventTiming["Before Breakfast"]]: ["07:30:00"],
+    [types_1.EventTiming["After Breakfast"]]: ["08:30:00"],
+    [types_1.EventTiming.Noon]: ["12:00:00"],
+    [types_1.EventTiming.Lunch]: ["12:30:00"],
+    [types_1.EventTiming["Before Lunch"]]: ["12:00:00"],
+    [types_1.EventTiming["After Lunch"]]: ["13:00:00"],
+    [types_1.EventTiming["Early Afternoon"]]: ["14:00:00"],
+    [types_1.EventTiming.Afternoon]: ["15:00:00"],
+    [types_1.EventTiming["Late Afternoon"]]: ["16:00:00"],
+    [types_1.EventTiming["Early Evening"]]: ["18:00:00"],
+    [types_1.EventTiming.Evening]: ["19:00:00"],
+    [types_1.EventTiming["Late Evening"]]: ["20:00:00"],
+    [types_1.EventTiming.Dinner]: ["18:30:00"],
+    [types_1.EventTiming["Before Dinner"]]: ["18:00:00"],
+    [types_1.EventTiming["After Dinner"]]: ["19:00:00"],
+    [types_1.EventTiming.Night]: ["21:00:00"],
+    [types_1.EventTiming["Before Sleep"]]: ["22:00:00"],
+    [types_1.EventTiming["After Sleep"]]: ["06:30:00"],
+    [types_1.EventTiming.Meal]: ["08:00:00", "12:30:00", "18:30:00"],
+    [types_1.EventTiming["Before Meal"]]: ["07:30:00", "12:00:00", "18:00:00"],
+    [types_1.EventTiming["After Meal"]]: ["08:30:00", "13:00:00", "19:00:00"]
+};
+function inferWhenFallbackEntries(whenCodes, repeat) {
+    const entries = [];
+    const seen = new Set();
+    const addClock = (clock) => {
+        var _a;
+        const normalized = normalizeClock(clock);
+        const adjusted = repeat.offset
+            ? applyOffset(normalized, (_a = repeat.offset) !== null && _a !== void 0 ? _a : 0)
+            : { time: normalized, dayShift: 0 };
+        const key = `${adjusted.dayShift}|${adjusted.time}`;
+        if (seen.has(key)) {
+            return;
+        }
+        seen.add(key);
+        entries.push(adjusted);
+    };
+    for (const code of whenCodes) {
+        if (code === types_1.EventTiming.Immediate) {
+            continue;
+        }
+        const fallbackClocks = DEFAULT_WHEN_FALLBACK_CLOCKS[code];
+        if (!fallbackClocks) {
+            continue;
+        }
+        for (const clock of fallbackClocks) {
+            addClock(clock);
+        }
+    }
+    return entries.sort((a, b) => {
+        if (a.dayShift !== b.dayShift) {
+            return a.dayShift - b.dayShift;
+        }
+        return a.time.localeCompare(b.time);
+    });
+}
 function mergeFrequencyDefaults(base, override) {
     var _a, _b, _c, _d;
     if (!base && !override) {
@@ -571,6 +634,11 @@ function nextDueDoses(dosage, options) {
                 return a.time.localeCompare(b.time);
             });
         }
+        if (expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            (!repeat.frequency || !repeat.period || !repeat.periodUnit)) {
+            expanded.push(...inferWhenFallbackEntries(whenCodes, repeat));
+        }
         const includesImmediate = (0, array_1.arrayIncludes)(whenCodes, types_1.EventTiming.Immediate);
         if (includesImmediate) {
             const immediateSource = orderedAt !== null && orderedAt !== void 0 ? orderedAt : from;
@@ -731,6 +799,11 @@ function derivePriorCountFromHistory(timing, repeat, config, orderedAt, from, ti
                 return a.time.localeCompare(b.time);
             });
         }
+        if (expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            (!repeat.frequency || !repeat.period || !repeat.periodUnit)) {
+            expanded.push(...inferWhenFallbackEntries(whenCodes, repeat));
+        }
         if ((0, array_1.arrayIncludes)(whenCodes, types_1.EventTiming.Immediate)) {
             if (recordCandidate(orderedAt) && normalizedCount !== undefined && seen.size >= normalizedCount) {
                 return count;
@@ -981,6 +1054,11 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
                 return a.time.localeCompare(b.time);
             });
         }
+        if (expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            (!repeat.frequency || !repeat.period || !repeat.periodUnit)) {
+            expanded.push(...inferWhenFallbackEntries(whenCodes, repeat));
+        }
         if ((0, array_1.arrayIncludes)(whenCodes, types_1.EventTiming.Immediate)) {
             const immediateSource = orderedAt !== null && orderedAt !== void 0 ? orderedAt : from;
             if (!orderedAt || orderedAt >= from) {

package/package.json

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