ezmedicationinput 0.1.35 → 0.1.36

package/dist/schedule.js

@@ -433,6 +433,25 @@ function mergeFrequencyDefaults(base, override) {
     }
     return merged;
 }
+function inferDailyFrequencyClocks(frequency) {
+    if (!Number.isFinite(frequency) || frequency <= 0) {
+        return [];
+    }
+    if (frequency === 1) {
+        return ["09:00:00"];
+    }
+    const startMinutes = 8 * 60;
+    const endMinutes = 20 * 60;
+    const spanMinutes = endMinutes - startMinutes;
+    const clocks = new Set();
+    for (let index = 0; index < frequency; index += 1) {
+        const minutes = startMinutes + Math.round((spanMinutes * index) / (frequency - 1));
+        const hour = Math.floor(minutes / SECONDS_PER_MINUTE);
+        const minute = minutes % SECONDS_PER_MINUTE;
+        clocks.add(`${pad(hour)}:${pad(minute)}:00`);
+    }
+    return Array.from(clocks).sort();
+}
 /** Resolves fallback clock arrays for frequency-only schedules. */
 function resolveFrequencyClocks(timing, config) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
@@ -462,6 +481,11 @@ function resolveFrequencyClocks(timing, config) {
                 collected.add(normalizeClock(clock));
             }
         }
+        if (collected.size === 0 && repeat.period === 1 && repeat.periodUnit === "d") {
+            for (const clock of inferDailyFrequencyClocks(repeat.frequency)) {
+                collected.add(clock);
+            }
+        }
     }
     return Array.from(collected).sort();
 }
@@ -561,46 +585,53 @@ function nextDueDoses(dosage, options) {
         if (results.length >= effectiveLimit) {
             return results.slice(0, effectiveLimit);
         }
-        if (expanded.length === 0) {
-            return results.slice(0, effectiveLimit);
-        }
-        let currentDay = startOfLocalDay(from, timeZone);
-        let iterations = 0;
-        const maxIterations = effectiveLimit * 31;
-        while (results.length < effectiveLimit && iterations < maxIterations) {
-            const weekday = getLocalWeekday(currentDay, timeZone);
-            if (!enforceDayFilter || dayFilter.has(weekday)) {
-                for (const entry of expanded) {
-                    const targetDay = entry.dayShift === 0
-                        ? currentDay
-                        : addLocalDays(currentDay, entry.dayShift, timeZone);
-                    const zoned = makeZonedDateFromDay(targetDay, timeZone, entry.time);
-                    if (!zoned) {
-                        continue;
-                    }
-                    if (zoned < from) {
-                        continue;
-                    }
-                    if (orderedAt && zoned < orderedAt) {
-                        continue;
-                    }
-                    const iso = formatZonedIso(zoned, timeZone);
-                    if (!seen.has(iso)) {
-                        seen.add(iso);
-                        results.push(iso);
-                        if (results.length === effectiveLimit) {
-                            break;
+        const canFallbackToFrequency = expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            !!repeat.frequency &&
+            !!repeat.period &&
+            !!repeat.periodUnit;
+        if (!canFallbackToFrequency) {
+            if (expanded.length === 0) {
+                return results.slice(0, effectiveLimit);
+            }
+            let currentDay = startOfLocalDay(from, timeZone);
+            let iterations = 0;
+            const maxIterations = effectiveLimit * 31;
+            while (results.length < effectiveLimit && iterations < maxIterations) {
+                const weekday = getLocalWeekday(currentDay, timeZone);
+                if (!enforceDayFilter || dayFilter.has(weekday)) {
+                    for (const entry of expanded) {
+                        const targetDay = entry.dayShift === 0
+                            ? currentDay
+                            : addLocalDays(currentDay, entry.dayShift, timeZone);
+                        const zoned = makeZonedDateFromDay(targetDay, timeZone, entry.time);
+                        if (!zoned) {
+                            continue;
+                        }
+                        if (zoned < from) {
+                            continue;
+                        }
+                        if (orderedAt && zoned < orderedAt) {
+                            continue;
+                        }
+                        const iso = formatZonedIso(zoned, timeZone);
+                        if (!seen.has(iso)) {
+                            seen.add(iso);
+                            results.push(iso);
+                            if (results.length === effectiveLimit) {
+                                break;
+                            }
                         }
                     }
                 }
+                if (results.length >= effectiveLimit) {
+                    break;
+                }
+                currentDay = addLocalDays(currentDay, 1, timeZone);
+                iterations += 1;
             }
-            if (results.length >= effectiveLimit) {
-                break;
-            }
-            currentDay = addLocalDays(currentDay, 1, timeZone);
-            iterations += 1;
+            return results.slice(0, effectiveLimit);
         }
-        return results.slice(0, effectiveLimit);
     }
     const treatAsInterval = !!repeat.period &&
         !!repeat.periodUnit &&
@@ -705,35 +736,42 @@ function derivePriorCountFromHistory(timing, repeat, config, orderedAt, from, ti
                 return count;
             }
         }
-        if (expanded.length === 0) {
-            return count;
-        }
-        let currentDay = startOfLocalDay(orderedAt, timeZone);
-        let iterations = 0;
-        const maxIterations = normalizedCount !== undefined ? normalizedCount * 31 : 31 * 365;
-        while (currentDay < from && iterations < maxIterations) {
-            const weekday = getLocalWeekday(currentDay, timeZone);
-            if (!enforceDayFilter || dayFilter.has(weekday)) {
-                for (const entry of expanded) {
-                    const targetDay = entry.dayShift === 0
-                        ? currentDay
-                        : addLocalDays(currentDay, entry.dayShift, timeZone);
-                    const zoned = makeZonedDateFromDay(targetDay, timeZone, entry.time);
-                    if (!zoned) {
-                        continue;
-                    }
-                    if (zoned < orderedAt || zoned >= from) {
-                        continue;
-                    }
-                    if (recordCandidate(zoned) && normalizedCount !== undefined && seen.size >= normalizedCount) {
-                        return count;
+        const canFallbackToFrequency = expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            !!repeat.frequency &&
+            !!repeat.period &&
+            !!repeat.periodUnit;
+        if (!canFallbackToFrequency) {
+            if (expanded.length === 0) {
+                return count;
+            }
+            let currentDay = startOfLocalDay(orderedAt, timeZone);
+            let iterations = 0;
+            const maxIterations = normalizedCount !== undefined ? normalizedCount * 31 : 31 * 365;
+            while (currentDay < from && iterations < maxIterations) {
+                const weekday = getLocalWeekday(currentDay, timeZone);
+                if (!enforceDayFilter || dayFilter.has(weekday)) {
+                    for (const entry of expanded) {
+                        const targetDay = entry.dayShift === 0
+                            ? currentDay
+                            : addLocalDays(currentDay, entry.dayShift, timeZone);
+                        const zoned = makeZonedDateFromDay(targetDay, timeZone, entry.time);
+                        if (!zoned) {
+                            continue;
+                        }
+                        if (zoned < orderedAt || zoned >= from) {
+                            continue;
+                        }
+                        if (recordCandidate(zoned) && normalizedCount !== undefined && seen.size >= normalizedCount) {
+                            return count;
+                        }
                     }
                 }
+                currentDay = addLocalDays(currentDay, 1, timeZone);
+                iterations += 1;
             }
-            currentDay = addLocalDays(currentDay, 1, timeZone);
-            iterations += 1;
+            return count;
         }
-        return count;
     }
     const treatAsInterval = !!repeat.period &&
         !!repeat.periodUnit &&
@@ -949,27 +987,34 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
                 recordCandidate(immediateSource);
             }
         }
-        if (expanded.length === 0)
-            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 weekday = getLocalWeekday(currentDay, timeZone);
-            if (!enforceDayFilter || dayFilter.has(weekday)) {
-                for (const entry of expanded) {
-                    const targetDay = entry.dayShift === 0
-                        ? currentDay
-                        : addLocalDays(currentDay, entry.dayShift, timeZone);
-                    const zoned = makeZonedDateFromDay(targetDay, timeZone, entry.time);
-                    if (zoned)
-                        recordCandidate(zoned);
+        const canFallbackToFrequency = expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            !!repeat.frequency &&
+            !!repeat.period &&
+            !!repeat.periodUnit;
+        if (!canFallbackToFrequency) {
+            if (expanded.length === 0)
+                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 weekday = getLocalWeekday(currentDay, timeZone);
+                if (!enforceDayFilter || dayFilter.has(weekday)) {
+                    for (const entry of expanded) {
+                        const targetDay = entry.dayShift === 0
+                            ? currentDay
+                            : addLocalDays(currentDay, entry.dayShift, timeZone);
+                        const zoned = makeZonedDateFromDay(targetDay, timeZone, entry.time);
+                        if (zoned)
+                            recordCandidate(zoned);
+                    }
                 }
+                currentDay = addLocalDays(currentDay, 1, timeZone);
+                iterations += 1;
             }
-            currentDay = addLocalDays(currentDay, 1, timeZone);
-            iterations += 1;
+            return count;
         }
-        return count;
     }
     const treatAsInterval = !!repeat.period &&
         !!repeat.periodUnit &&
@@ -1047,7 +1092,7 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
     }
     return count;
 }
-function calculateTotalUnits(options) {
+function calculateTotalUnitsSingle(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const { dosage, durationValue, durationUnit, roundToMultiple, context } = options;
     const from = coerceDate(options.from, "from");
@@ -1102,3 +1147,24 @@ function calculateTotalUnits(options) {
     }
     return result;
 }
+function calculateTotalUnits(options) {
+    if (Array.isArray(options.dosage)) {
+        const hasAnyDosage = options.dosage.length > 0;
+        if (!hasAnyDosage) {
+            return { totalUnits: 0 };
+        }
+        let totalUnits = 0;
+        let totalContainers = 0;
+        let sawContainers = false;
+        for (const dosage of options.dosage) {
+            const result = calculateTotalUnitsSingle(Object.assign(Object.assign({}, options), { dosage }));
+            totalUnits += result.totalUnits;
+            if (result.totalContainers !== undefined) {
+                totalContainers += result.totalContainers;
+                sawContainers = true;
+            }
+        }
+        return sawContainers ? { totalUnits, totalContainers } : { totalUnits };
+    }
+    return calculateTotalUnitsSingle(options);
+}

package/dist/types.d.ts

@@ -673,7 +673,7 @@ export interface TotalUnitsResult {
     totalContainers?: number;
 }
 export interface TotalUnitsOptions extends NextDueDoseOptions {
-    dosage: FhirDosage;
+    dosage: FhirDosage | FhirDosage[];
     durationValue: number;
     durationUnit: FhirPeriodUnit;
     roundToMultiple?: number;

package/package.json

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