ezmedicationinput 0.1.42 → 0.1.44

package/dist/prn.d.ts

@@ -0,0 +1,4 @@
+import { CanonicalPrnReasonExpr } from "./types";
+export declare function getCanonicalPrnReasonText(reason: CanonicalPrnReasonExpr | undefined): string | undefined;
+export declare function joinCanonicalPrnReasonTexts(reasons: CanonicalPrnReasonExpr[] | undefined, conjunction?: string): string | undefined;
+export declare function getPreferredCanonicalPrnReasonText(reason: CanonicalPrnReasonExpr | undefined, reasons: CanonicalPrnReasonExpr[] | undefined, conjunction?: string): string | undefined;

package/dist/prn.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCanonicalPrnReasonText = getCanonicalPrnReasonText;
+exports.joinCanonicalPrnReasonTexts = joinCanonicalPrnReasonTexts;
+exports.getPreferredCanonicalPrnReasonText = getPreferredCanonicalPrnReasonText;
+function getCanonicalPrnReasonText(reason) {
+    var _a, _b;
+    return (_a = reason === null || reason === void 0 ? void 0 : reason.text) !== null && _a !== void 0 ? _a : (_b = reason === null || reason === void 0 ? void 0 : reason.coding) === null || _b === void 0 ? void 0 : _b.display;
+}
+function joinCanonicalPrnReasonTexts(reasons, conjunction = "or") {
+    var _a;
+    if (!(reasons === null || reasons === void 0 ? void 0 : reasons.length)) {
+        return undefined;
+    }
+    const texts = [];
+    for (const reason of reasons) {
+        const text = (_a = getCanonicalPrnReasonText(reason)) === null || _a === void 0 ? void 0 : _a.trim();
+        if (!text) {
+            continue;
+        }
+        texts.push(text);
+    }
+    switch (texts.length) {
+        case 0:
+            return undefined;
+        case 1:
+            return texts[0];
+        case 2:
+            return `${texts[0]} ${conjunction} ${texts[1]}`;
+        default: {
+            let combined = "";
+            for (let index = 0; index < texts.length; index += 1) {
+                if (index === 0) {
+                    combined = texts[index];
+                    continue;
+                }
+                if (index === texts.length - 1) {
+                    combined += ` ${conjunction} ${texts[index]}`;
+                    continue;
+                }
+                combined += `, ${texts[index]}`;
+            }
+            return combined;
+        }
+    }
+}
+function getPreferredCanonicalPrnReasonText(reason, reasons, conjunction = "or") {
+    var _a;
+    const direct = (_a = getCanonicalPrnReasonText(reason)) === null || _a === void 0 ? void 0 : _a.trim();
+    if (!(reasons === null || reasons === void 0 ? void 0 : reasons.length)) {
+        return direct;
+    }
+    if (!direct) {
+        return joinCanonicalPrnReasonTexts(reasons, conjunction);
+    }
+    return /[,/;]/.test(direct)
+        ? joinCanonicalPrnReasonTexts(reasons, conjunction)
+        : direct;
+}

package/dist/schedule.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nextDueDoses = nextDueDoses;
 exports.calculateTotalUnits = calculateTotalUnits;
 const types_1 = require("./types");
+const advice_1 = require("./advice");
 const array_1 = require("./utils/array");
 const units_1 = require("./utils/units");
 const strength_1 = require("./utils/strength");
@@ -349,6 +350,151 @@ function applyOffset(clock, offsetMinutes) {
         dayShift
     };
 }
+function parseBoundsDurationUnit(quantity) {
+    var _a, _b, _c;
+    const candidate = (_b = (_a = quantity === null || quantity === void 0 ? void 0 : quantity.code) === null || _a === void 0 ? void 0 : _a.trim().toLowerCase()) !== null && _b !== void 0 ? _b : (_c = quantity === null || quantity === void 0 ? void 0 : quantity.unit) === null || _c === void 0 ? void 0 : _c.trim().toLowerCase();
+    switch (candidate) {
+        case "s":
+        case "sec":
+        case "second":
+        case "seconds":
+            return types_1.FhirPeriodUnit.Second;
+        case "min":
+        case "mins":
+        case "minute":
+        case "minutes":
+            return types_1.FhirPeriodUnit.Minute;
+        case "h":
+        case "hr":
+        case "hrs":
+        case "hour":
+        case "hours":
+            return types_1.FhirPeriodUnit.Hour;
+        case "d":
+        case "day":
+        case "days":
+            return types_1.FhirPeriodUnit.Day;
+        case "wk":
+        case "wks":
+        case "week":
+        case "weeks":
+            return types_1.FhirPeriodUnit.Week;
+        case "mo":
+        case "month":
+        case "months":
+            return types_1.FhirPeriodUnit.Month;
+        case "a":
+        case "yr":
+        case "yrs":
+        case "year":
+        case "years":
+            return types_1.FhirPeriodUnit.Year;
+        default:
+            return undefined;
+    }
+}
+function resolveRepeatBoundsDuration(repeat) {
+    var _a, _b, _c, _d;
+    if (!repeat) {
+        return {};
+    }
+    if (((_a = repeat.boundsDuration) === null || _a === void 0 ? void 0 : _a.value) !== undefined) {
+        return {
+            value: repeat.boundsDuration.value,
+            unit: parseBoundsDurationUnit(repeat.boundsDuration)
+        };
+    }
+    if (!repeat.boundsRange) {
+        return {};
+    }
+    return {
+        value: (_b = repeat.boundsRange.low) === null || _b === void 0 ? void 0 : _b.value,
+        max: (_c = repeat.boundsRange.high) === null || _c === void 0 ? void 0 : _c.value,
+        unit: (_d = parseBoundsDurationUnit(repeat.boundsRange.low)) !== null && _d !== void 0 ? _d : parseBoundsDurationUnit(repeat.boundsRange.high)
+    };
+}
+function resolveRepeatDurationCapEnd(repeat, anchor, timeZone) {
+    var _a, _b;
+    const bounds = resolveRepeatBoundsDuration(repeat);
+    const durationValue = (_a = bounds.max) !== null && _a !== void 0 ? _a : bounds.value;
+    const durationUnit = bounds.unit;
+    if (durationValue === undefined ||
+        !Number.isFinite(durationValue) ||
+        durationValue <= 0 ||
+        !durationUnit) {
+        return null;
+    }
+    const stepper = createIntervalStepper({ period: durationValue, periodUnit: durationUnit }, timeZone);
+    if (!stepper) {
+        return null;
+    }
+    return (_b = stepper(anchor)) !== null && _b !== void 0 ? _b : null;
+}
+function resolveDayFilteredSeriesRepeat(repeat, enforceDayFilter) {
+    var _a, _b, _c, _d;
+    if (!enforceDayFilter) {
+        return undefined;
+    }
+    if (repeat.frequency) {
+        return undefined;
+    }
+    if (((_b = (_a = repeat.when) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0 || ((_d = (_c = repeat.timeOfDay) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0) > 0) {
+        return undefined;
+    }
+    switch (repeat.periodUnit) {
+        case types_1.FhirPeriodUnit.Week:
+        case types_1.FhirPeriodUnit.Month:
+        case types_1.FhirPeriodUnit.Year:
+            return repeat.period ? repeat : undefined;
+        case undefined:
+            return repeat.period === undefined
+                ? Object.assign(Object.assign({}, repeat), { period: 1, periodUnit: types_1.FhirPeriodUnit.Week }) : undefined;
+        default:
+            return undefined;
+    }
+}
+function isSingleAdministrationRepeat(repeat) {
+    var _a, _b, _c, _d, _e, _f;
+    return (repeat.count === 1 &&
+        repeat.frequency === undefined &&
+        repeat.frequencyMax === undefined &&
+        repeat.period === undefined &&
+        repeat.periodMax === undefined &&
+        repeat.periodUnit === undefined &&
+        ((_b = (_a = repeat.dayOfWeek) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) === 0 &&
+        ((_d = (_c = repeat.when) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0) === 0 &&
+        ((_f = (_e = repeat.timeOfDay) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0) === 0);
+}
+function hasUnresolvedRelationalInstruction(dosage) {
+    var _a, _b, _c, _d, _e, _f;
+    const texts = [];
+    if ((_a = dosage.patientInstruction) === null || _a === void 0 ? void 0 : _a.trim()) {
+        texts.push(dosage.patientInstruction.trim());
+    }
+    for (const instruction of (_b = dosage.additionalInstruction) !== null && _b !== void 0 ? _b : []) {
+        const text = ((_c = instruction.text) === null || _c === void 0 ? void 0 : _c.trim()) || ((_f = (_e = (_d = instruction.coding) === null || _d === void 0 ? void 0 : _d.find((coding) => { var _a; return (_a = coding.display) === null || _a === void 0 ? void 0 : _a.trim(); })) === null || _e === void 0 ? void 0 : _e.display) === null || _f === void 0 ? void 0 : _f.trim());
+        if (text) {
+            texts.push(text);
+        }
+    }
+    for (const text of texts) {
+        const parsed = (0, advice_1.parseAdditionalInstructions)(text, { start: 0, end: text.length }, { defaultPredicate: "take" });
+        for (const instruction of parsed) {
+            for (const frame of instruction.frames) {
+                if (frame.relation) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+function minDate(left, right) {
+    if (!right) {
+        return left;
+    }
+    return right.getTime() < left.getTime() ? right : left;
+}
 /** Provides the default meal pairing used for AC/PC expansions. */
 function getDefaultMealPairs(config) {
     return [types_1.EventTiming.Breakfast, types_1.EventTiming.Lunch, types_1.EventTiming.Dinner];
@@ -633,6 +779,7 @@ function nextDueDoses(dosage, options) {
     };
     const timing = dosage.timing;
     const repeat = timing === null || timing === void 0 ? void 0 : timing.repeat;
+    const courseEnd = timing && repeat ? resolveRepeatDurationCapEnd(repeat, baseTime, timeZone) : null;
     if (needsDerivedPriorCount &&
         orderedAt &&
         timing &&
@@ -643,6 +790,9 @@ function nextDueDoses(dosage, options) {
     if (!timing || !repeat) {
         return [];
     }
+    if (courseEnd && from >= courseEnd) {
+        return [];
+    }
     const rawCount = repeat.count;
     const normalizedCount = rawCount === undefined ? undefined : Math.max(0, Math.floor(rawCount));
     if (normalizedCount === 0) {
@@ -653,10 +803,21 @@ function nextDueDoses(dosage, options) {
         return [];
     }
     const effectiveLimit = remainingCount !== undefined ? Math.min(limit, remainingCount) : limit;
+    if (isSingleAdministrationRepeat(repeat)) {
+        if (hasUnresolvedRelationalInstruction(dosage)) {
+            return [];
+        }
+        const anchor = orderedAt !== null && orderedAt !== void 0 ? orderedAt : from;
+        if ((orderedAt && orderedAt < from) || (courseEnd && anchor >= courseEnd)) {
+            return [];
+        }
+        return [formatZonedIso(anchor, timeZone)].slice(0, effectiveLimit);
+    }
     const results = [];
     const seen = new Set();
     const dayFilter = new Set(((_g = repeat.dayOfWeek) !== null && _g !== void 0 ? _g : []).map((day) => day.toLowerCase()));
     const enforceDayFilter = dayFilter.size > 0;
+    const dayFilteredSeriesRepeat = resolveDayFilteredSeriesRepeat(repeat, enforceDayFilter);
     const whenCodes = (_h = repeat.when) !== null && _h !== void 0 ? _h : [];
     const timeOfDayEntries = (_j = repeat.timeOfDay) !== null && _j !== void 0 ? _j : [];
     if (whenCodes.length > 0 || timeOfDayEntries.length > 0) {
@@ -680,7 +841,7 @@ function nextDueDoses(dosage, options) {
         const includesImmediate = (0, array_1.arrayIncludes)(whenCodes, types_1.EventTiming.Immediate);
         if (includesImmediate) {
             const immediateSource = orderedAt !== null && orderedAt !== void 0 ? orderedAt : from;
-            if (!orderedAt || orderedAt >= from) {
+            if ((!orderedAt || orderedAt >= from) && (!courseEnd || immediateSource < courseEnd)) {
                 const instantIso = formatZonedIso(immediateSource, timeZone);
                 if (!seen.has(instantIso)) {
                     seen.add(instantIso);
@@ -703,7 +864,9 @@ function nextDueDoses(dosage, options) {
             let currentDay = startOfLocalDay(from, timeZone);
             let iterations = 0;
             const maxIterations = effectiveLimit * 31;
-            while (results.length < effectiveLimit && iterations < maxIterations) {
+            while (results.length < effectiveLimit &&
+                iterations < maxIterations &&
+                (!courseEnd || currentDay < courseEnd)) {
                 const weekday = getLocalWeekday(currentDay, timeZone);
                 if (!enforceDayFilter || dayFilter.has(weekday)) {
                     for (const entry of expanded) {
@@ -720,6 +883,9 @@ function nextDueDoses(dosage, options) {
                         if (orderedAt && zoned < orderedAt) {
                             continue;
                         }
+                        if (courseEnd && zoned >= courseEnd) {
+                            continue;
+                        }
                         const iso = formatZonedIso(zoned, timeZone);
                         if (!seen.has(iso)) {
                             seen.add(iso);
@@ -748,20 +914,18 @@ function nextDueDoses(dosage, options) {
     if (treatAsInterval && supportsDayFilteredInterval) {
         // True interval schedules advance from the order start in fixed units. The
         // timing.code remains advisory so we only rely on the period/unit fields.
-        const candidates = generateIntervalSeries(baseTime, from, effectiveLimit, repeat, timeZone, dayFilter, enforceDayFilter, orderedAt);
+        const candidates = generateIntervalSeries(baseTime, from, effectiveLimit, repeat, timeZone, dayFilter, enforceDayFilter, orderedAt, courseEnd);
         return candidates;
     }
-    if (enforceDayFilter &&
-        repeat.period &&
-        repeat.periodUnit &&
-        (repeat.periodUnit === "wk" || repeat.periodUnit === "mo" || repeat.periodUnit === "a")) {
+    if (dayFilteredSeriesRepeat) {
         return generateDayFilteredPeriodSeries({
-            repeat,
+            repeat: dayFilteredSeriesRepeat,
             timeZone,
             dayFilter,
             anchorDay: startOfLocalDay(baseTime, timeZone),
             startDay: from,
             from,
+            to: courseEnd !== null && courseEnd !== void 0 ? courseEnd : undefined,
             orderedAt,
             limit: effectiveLimit,
             defaultClock: toLocalClock(baseTime, timeZone)
@@ -778,7 +942,9 @@ function nextDueDoses(dosage, options) {
         let currentDay = startOfLocalDay(from, timeZone);
         let iterations = 0;
         const maxIterations = effectiveLimit * 31;
-        while (results.length < effectiveLimit && iterations < maxIterations) {
+        while (results.length < effectiveLimit &&
+            iterations < maxIterations &&
+            (!courseEnd || currentDay < courseEnd)) {
             const weekday = getLocalWeekday(currentDay, timeZone);
             if (!enforceDayFilter || dayFilter.has(weekday)) {
                 for (const clock of clocks) {
@@ -792,6 +958,9 @@ function nextDueDoses(dosage, options) {
                     if (orderedAt && zoned < orderedAt) {
                         continue;
                     }
+                    if (courseEnd && zoned >= courseEnd) {
+                        continue;
+                    }
                     const iso = formatZonedIso(zoned, timeZone);
                     if (!seen.has(iso)) {
                         seen.add(iso);
@@ -822,6 +991,7 @@ function derivePriorCountFromHistory(timing, repeat, config, orderedAt, from, ti
     }
     const dayFilter = new Set(((_a = repeat.dayOfWeek) !== null && _a !== void 0 ? _a : []).map((day) => day.toLowerCase()));
     const enforceDayFilter = dayFilter.size > 0;
+    const dayFilteredSeriesRepeat = resolveDayFilteredSeriesRepeat(repeat, enforceDayFilter);
     const seen = new Set();
     let count = 0;
     const recordCandidate = (candidate) => {
@@ -931,12 +1101,9 @@ function derivePriorCountFromHistory(timing, repeat, config, orderedAt, from, ti
         }
         return count;
     }
-    if (enforceDayFilter &&
-        repeat.period &&
-        repeat.periodUnit &&
-        (repeat.periodUnit === "wk" || repeat.periodUnit === "mo" || repeat.periodUnit === "a")) {
+    if (dayFilteredSeriesRepeat) {
         const generated = generateDayFilteredPeriodSeries({
-            repeat,
+            repeat: dayFilteredSeriesRepeat,
             timeZone,
             dayFilter,
             anchorDay: startOfLocalDay(orderedAt, timeZone),
@@ -983,7 +1150,7 @@ function derivePriorCountFromHistory(timing, repeat, config, orderedAt, from, ti
  * Generates an interval-based series by stepping forward from the base time
  * until the requested number of timestamps have been produced.
  */
-function generateIntervalSeries(baseTime, from, effectiveLimit, repeat, timeZone, dayFilter, enforceDayFilter, orderedAt) {
+function generateIntervalSeries(baseTime, from, effectiveLimit, repeat, timeZone, dayFilter, enforceDayFilter, orderedAt, upperBound) {
     const increment = createIntervalStepper(repeat, timeZone);
     if (!increment) {
         return [];
@@ -1001,7 +1168,9 @@ function generateIntervalSeries(baseTime, from, effectiveLimit, repeat, timeZone
         current = next;
         guard += 1;
     }
-    while (results.length < effectiveLimit && guard < maxIterations) {
+    while (results.length < effectiveLimit &&
+        guard < maxIterations &&
+        (!upperBound || current < upperBound)) {
         const weekday = getLocalWeekday(current, timeZone);
         if (!enforceDayFilter || dayFilter.has(weekday)) {
             if (current < from) {
@@ -1023,6 +1192,9 @@ function generateIntervalSeries(baseTime, from, effectiveLimit, repeat, timeZone
                 current = next;
                 continue;
             }
+            if (upperBound && current >= upperBound) {
+                break;
+            }
             const iso = formatZonedIso(current, timeZone);
             if (!seen.has(iso)) {
                 seen.add(iso);
@@ -1214,11 +1386,38 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
     const repeat = timing === null || timing === void 0 ? void 0 : timing.repeat;
     if (!timing || !repeat)
         return 0;
+    const normalizedCount = repeat.count === undefined
+        ? undefined
+        : Math.max(0, Math.floor(repeat.count));
+    if (normalizedCount === 0) {
+        return 0;
+    }
     const dayFilter = new Set(((_a = repeat.dayOfWeek) !== null && _a !== void 0 ? _a : []).map((day) => day.toLowerCase()));
     const enforceDayFilter = dayFilter.size > 0;
+    const dayFilteredSeriesRepeat = resolveDayFilteredSeriesRepeat(repeat, enforceDayFilter);
     const seen = new Set();
     let count = 0;
     const timeZone = config.timeZone;
+    const priorCount = normalizedCount !== undefined && orderedAt && from > orderedAt
+        ? derivePriorCountFromHistory(timing, repeat, config, orderedAt, from, timeZone)
+        : 0;
+    const countLimit = normalizedCount === undefined
+        ? (limit !== null && limit !== void 0 ? limit : Number.POSITIVE_INFINITY)
+        : Math.min(limit !== null && limit !== void 0 ? limit : normalizedCount, Math.max(0, normalizedCount - priorCount));
+    if (countLimit <= 0) {
+        return 0;
+    }
+    const hardLimit = Number.isFinite(countLimit) ? countLimit : 365 * 31;
+    if (isSingleAdministrationRepeat(repeat)) {
+        if (hasUnresolvedRelationalInstruction(dosage)) {
+            return 0;
+        }
+        const anchor = orderedAt !== null && orderedAt !== void 0 ? orderedAt : baseTime;
+        if (anchor < from || anchor >= to) {
+            return 0;
+        }
+        return 1;
+    }
     const recordCandidate = (candidate) => {
         if (!candidate)
             return false;
@@ -1266,8 +1465,8 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
                 return count;
             let currentDay = startOfLocalDay(from, timeZone);
             let iterations = 0;
-            const maxIterations = limit !== undefined ? limit * 31 : 365 * 31;
-            while (count < (limit !== null && limit !== void 0 ? limit : Infinity) && currentDay < to && iterations < maxIterations) {
+            const maxIterations = hardLimit * 31;
+            while (count < countLimit && currentDay < to && iterations < maxIterations) {
                 const weekday = getLocalWeekday(currentDay, timeZone);
                 if (!enforceDayFilter || dayFilter.has(weekday)) {
                     for (const entry of expanded) {
@@ -1297,7 +1496,7 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
             return count;
         let current = baseTime;
         let guard = 0;
-        const maxIterations = limit !== undefined ? limit * 1000 : 10000;
+        const maxIterations = hardLimit * 1000;
         // Advance to "from"
         while (current < from && guard < maxIterations) {
             const next = increment(current);
@@ -1306,7 +1505,7 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
             current = next;
             guard++;
         }
-        while (current < to && count < (limit !== null && limit !== void 0 ? limit : Infinity) && guard < maxIterations) {
+        while (current < to && count < countLimit && guard < maxIterations) {
             const weekday = getLocalWeekday(current, timeZone);
             if (!enforceDayFilter || dayFilter.has(weekday)) {
                 recordCandidate(current);
@@ -1325,8 +1524,8 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
             return count;
         let currentDay = startOfLocalDay(from, timeZone);
         let iterations = 0;
-        const maxIterations = limit !== undefined ? limit * 31 : 365 * 31;
-        while (count < (limit !== null && limit !== void 0 ? limit : Infinity) && currentDay < to && iterations < maxIterations) {
+        const maxIterations = hardLimit * 31;
+        while (count < countLimit && currentDay < to && iterations < maxIterations) {
             const weekday = getLocalWeekday(currentDay, timeZone);
             if (!enforceDayFilter || dayFilter.has(weekday)) {
                 for (const clock of clocks) {
@@ -1340,12 +1539,9 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
         }
     }
     // Fallback for dayOfWeek with period/periodUnit but no explicit frequency/clocks
-    if (enforceDayFilter &&
-        repeat.period &&
-        repeat.periodUnit &&
-        (repeat.periodUnit === "wk" || repeat.periodUnit === "mo" || repeat.periodUnit === "a")) {
+    if (dayFilteredSeriesRepeat) {
         const generated = generateDayFilteredPeriodSeries({
-            repeat,
+            repeat: dayFilteredSeriesRepeat,
             timeZone,
             dayFilter,
             anchorDay: startOfLocalDay(baseTime, timeZone),
@@ -1353,7 +1549,7 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
             from,
             to,
             orderedAt,
-            limit: limit !== null && limit !== void 0 ? limit : 365 * 31,
+            limit: hardLimit,
             defaultClock: toLocalClock(baseTime, timeZone)
         });
         return count + generated.length;
@@ -1361,9 +1557,10 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
     return count;
 }
 function calculateTotalUnitsSingle(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
     const { dosage, durationValue, durationUnit, roundToMultiple, context } = options;
     const from = coerceDate(options.from, "from");
+    const orderedAtDate = options.orderedAt === undefined ? null : coerceDate(options.orderedAt, "orderedAt");
     const providedConfig = options.config;
     const timeZone = (_a = options.timeZone) !== null && _a !== void 0 ? _a : providedConfig === null || providedConfig === void 0 ? void 0 : providedConfig.timeZone;
     if (!timeZone) {
@@ -1388,8 +1585,9 @@ function calculateTotalUnitsSingle(options) {
     else {
         endDay = from;
     }
-    const count = countScheduleEvents(dosage, from, endDay, config, options.orderedAt ? coerceDate(options.orderedAt, "orderedAt") : from, options.orderedAt ? coerceDate(options.orderedAt, "orderedAt") : null, 2000);
-    const doseQuantity = (_j = (_h = (_g = (_f = dosage.doseAndRate) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.doseQuantity) === null || _h === void 0 ? void 0 : _h.value) !== null && _j !== void 0 ? _j : 0;
+    endDay = minDate(endDay, resolveRepeatDurationCapEnd((_f = dosage.timing) === null || _f === void 0 ? void 0 : _f.repeat, orderedAtDate !== null && orderedAtDate !== void 0 ? orderedAtDate : from, timeZone));
+    const count = countScheduleEvents(dosage, from, endDay, config, orderedAtDate !== null && orderedAtDate !== void 0 ? orderedAtDate : from, orderedAtDate, 2000);
+    const doseQuantity = (_k = (_j = (_h = (_g = dosage.doseAndRate) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.doseQuantity) === null || _j === void 0 ? void 0 : _j.value) !== null && _k !== void 0 ? _k : 0;
     let totalUnits = count * doseQuantity;
     if (roundToMultiple && roundToMultiple > 0) {
         totalUnits = Math.ceil(totalUnits / roundToMultiple) * roundToMultiple;
@@ -1398,7 +1596,7 @@ function calculateTotalUnitsSingle(options) {
     // Handle containers
     const containerValue = context === null || context === void 0 ? void 0 : context.containerValue;
     const containerUnit = context === null || context === void 0 ? void 0 : context.containerUnit;
-    const doseUnit = (_m = (_l = (_k = dosage.doseAndRate) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.doseQuantity) === null || _m === void 0 ? void 0 : _m.unit;
+    const doseUnit = (_o = (_m = (_l = dosage.doseAndRate) === null || _l === void 0 ? void 0 : _l[0]) === null || _m === void 0 ? void 0 : _m.doseQuantity) === null || _o === void 0 ? void 0 : _o.unit;
     if (containerValue && containerValue > 0) {
         let effectiveUnits = totalUnits;
         if (containerUnit && doseUnit && containerUnit !== doseUnit) {

package/dist/site-phrases.d.ts

@@ -0,0 +1,35 @@
+import { Token } from "./parser-state";
+import { BodySiteDefinition, ParseOptions, RouteCode } from "./types";
+export interface SitePhraseServices {
+    customSiteHints?: Set<string>;
+    siteConnectors: ReadonlySet<string>;
+    siteFillerWords: ReadonlySet<string>;
+    isInstructionLikeText?: (text: string) => boolean;
+    normalizeTokenLower: (token: Token) => string;
+    isBodySiteHint: (word: string, customSiteHints?: Set<string>) => boolean;
+    hasExplicitSiteIntroduction: (startIndex: number) => boolean;
+    isNumericToken: (value: string) => boolean;
+    isOrdinalToken: (value: string) => boolean;
+    mapFrequencyAdverb: (value: string) => string | undefined;
+    mapIntervalUnit: (value: string) => string | undefined;
+    normalizeUnit: (value: string, options?: ParseOptions) => string | undefined;
+    hasRouteLikeWord: (value: string, options?: ParseOptions) => boolean;
+    hasFrequencyLikeWord: (value: string) => boolean;
+    getNextActiveToken: (index: number) => Token | undefined;
+    getPreviousActiveToken: (index: number) => Token | undefined;
+    hasApplicationVerbBefore: (index: number) => boolean;
+}
+export interface SiteLookupServices {
+    lookupBodySiteDefinition: (map: Record<string, BodySiteDefinition> | undefined, canonical: string) => BodySiteDefinition | undefined;
+}
+export interface SitePhraseCandidate {
+    tokenIndices: number[];
+    source: "explicit" | "residual";
+}
+export declare function isTimingOnlySitePhrase(words: string[]): boolean;
+export declare function hasExternalSurfaceModifier(siteText: string): boolean;
+export declare function extractExplicitSiteCandidate(tokens: Token[], consumed: Set<number>, startIndex: number, options: ParseOptions | undefined, services: SitePhraseServices): SitePhraseCandidate | undefined;
+export declare function selectBestResidualSiteCandidate(groups: Array<{
+    tokens: Token[];
+}>, prnSiteSuffixIndices: Set<number>, services: SitePhraseServices): SitePhraseCandidate | undefined;
+export declare function inferRouteHintFromSitePhrase(siteText: string, options: ParseOptions | undefined, services: SiteLookupServices): RouteCode | undefined;