ezmedicationinput 0.1.1 → 0.1.3

package/dist/safety.js

@@ -1,10 +1,13 @@
-import { DISCOURAGED_TOKENS } from "./maps";
-export function checkDiscouraged(token, options) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkDiscouraged = checkDiscouraged;
+const maps_1 = require("./maps");
+function checkDiscouraged(token, options) {
     const lower = token.toLowerCase();
-    if (!(lower in DISCOURAGED_TOKENS)) {
+    if (!(lower in maps_1.DISCOURAGED_TOKENS)) {
         return { allowed: true };
     }
-    const code = DISCOURAGED_TOKENS[lower];
+    const code = maps_1.DISCOURAGED_TOKENS[lower];
     if (options && options.allowDiscouraged === false) {
         throw new Error(`Discouraged token '${token}' is not allowed`);
     }

package/dist/schedule.js

@@ -1,4 +1,8 @@
-import { EventTiming } from "./types";
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nextDueDoses = nextDueDoses;
+const types_1 = require("./types");
+const array_1 = require("./utils/array");
 /**
  * Default institution times used when a dosage only specifies frequency without
  * explicit EventTiming anchors. Clinics can override these through the
@@ -29,12 +33,33 @@ const dateTimeFormatCache = new Map();
 const weekdayFormatCache = new Map();
 /** Simple zero-padding helper for numeric components. */
 function pad(value, length = 2) {
-    return value.toString().padStart(length, "0");
+    const absolute = Math.abs(value);
+    let output = absolute.toString();
+    while (output.length < length) {
+        output = `0${output}`;
+    }
+    return value < 0 ? `-${output}` : output;
+}
+function formatToParts(formatter, date) {
+    const withParts = formatter;
+    if (typeof withParts.formatToParts === "function") {
+        return withParts.formatToParts(date);
+    }
+    const iso = date.toISOString();
+    return [
+        { type: "year", value: iso.slice(0, 4) },
+        { type: "month", value: iso.slice(5, 7) },
+        { type: "day", value: iso.slice(8, 10) },
+        { type: "hour", value: iso.slice(11, 13) },
+        { type: "minute", value: iso.slice(14, 16) },
+        { type: "second", value: iso.slice(17, 19) }
+    ];
 }
 /**
  * Normalizes HH:mm or HH:mm:ss clocks into a consistent HH:mm:ss string.
  */
 function normalizeClock(clock) {
+    var _a;
     const parts = clock.split(":");
     if (parts.length < 2 || parts.length > 3) {
         throw new Error(`Invalid clock value: ${clock}`);
@@ -42,7 +67,7 @@ function normalizeClock(clock) {
     const [hourPart, minutePart, secondPart] = [
         parts[0],
         parts[1],
-        parts[2] ?? "00"
+        (_a = parts[2]) !== null && _a !== void 0 ? _a : "00"
     ];
     const hour = Number(hourPart);
     const minute = Number(minutePart);
@@ -64,7 +89,7 @@ function normalizeClock(clock) {
 function getDateTimeFormat(timeZone) {
     let formatter = dateTimeFormatCache.get(timeZone);
     if (!formatter) {
-        formatter = new Intl.DateTimeFormat("en-CA", {
+        const options = {
             timeZone,
             calendar: "iso8601",
             numberingSystem: "latn",
@@ -75,7 +100,8 @@ function getDateTimeFormat(timeZone) {
             hour: "2-digit",
             minute: "2-digit",
             second: "2-digit"
-        });
+        };
+        formatter = new Intl.DateTimeFormat("en-CA", options);
         dateTimeFormatCache.set(timeZone, formatter);
     }
     return formatter;
@@ -97,9 +123,10 @@ function getWeekdayFormat(timeZone) {
  * zone.
  */
 function getTimeParts(date, timeZone) {
+    var _a, _b;
     const formatter = getDateTimeFormat(timeZone);
     const parts = {};
-    const rawParts = formatter.formatToParts(date);
+    const rawParts = formatToParts(formatter, date);
     for (const part of rawParts) {
         if (part.type === "literal") {
             continue;
@@ -128,7 +155,7 @@ function getTimeParts(date, timeZone) {
         // instant forward slightly so we can capture the correct calendar date and
         // reset the hour component back to zero.
         const forward = new Date(date.getTime() + 60 * 1000);
-        const forwardParts = formatter.formatToParts(forward);
+        const forwardParts = formatToParts(formatter, forward);
         for (const part of forwardParts) {
             if (part.type === "literal") {
                 continue;
@@ -144,8 +171,8 @@ function getTimeParts(date, timeZone) {
             }
         }
         parts.hour = 0;
-        parts.minute = parts.minute ?? 0;
-        parts.second = parts.second ?? 0;
+        parts.minute = (_a = parts.minute) !== null && _a !== void 0 ? _a : 0;
+        parts.second = (_b = parts.second) !== null && _b !== void 0 ? _b : 0;
     }
     if (parts.year === undefined ||
         parts.month === undefined ||
@@ -278,49 +305,51 @@ function applyOffset(clock, offsetMinutes) {
 }
 /** Provides the default meal pairing used for AC/PC expansions. */
 function getDefaultMealPairs(config) {
-    return [EventTiming.Breakfast, EventTiming.Lunch, EventTiming.Dinner];
+    return [types_1.EventTiming.Breakfast, types_1.EventTiming.Lunch, types_1.EventTiming.Dinner];
 }
 const SPECIFIC_BEFORE_MEALS = {
-    [EventTiming["Before Breakfast"]]: EventTiming.Breakfast,
-    [EventTiming["Before Lunch"]]: EventTiming.Lunch,
-    [EventTiming["Before Dinner"]]: EventTiming.Dinner
+    [types_1.EventTiming["Before Breakfast"]]: types_1.EventTiming.Breakfast,
+    [types_1.EventTiming["Before Lunch"]]: types_1.EventTiming.Lunch,
+    [types_1.EventTiming["Before Dinner"]]: types_1.EventTiming.Dinner
 };
 const SPECIFIC_AFTER_MEALS = {
-    [EventTiming["After Breakfast"]]: EventTiming.Breakfast,
-    [EventTiming["After Lunch"]]: EventTiming.Lunch,
-    [EventTiming["After Dinner"]]: EventTiming.Dinner
+    [types_1.EventTiming["After Breakfast"]]: types_1.EventTiming.Breakfast,
+    [types_1.EventTiming["After Lunch"]]: types_1.EventTiming.Lunch,
+    [types_1.EventTiming["After Dinner"]]: types_1.EventTiming.Dinner
 };
 /**
  * Expands a single EventTiming code into concrete wall-clock entries.
  */
 function expandTiming(code, config, repeat) {
-    const mealOffsets = config.mealOffsets ?? {};
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const mealOffsets = (_a = config.mealOffsets) !== null && _a !== void 0 ? _a : {};
+    const eventClock = (_b = config.eventClock) !== null && _b !== void 0 ? _b : {};
     const normalized = [];
-    const clockValue = config.eventClock[code];
+    const clockValue = eventClock[code];
     if (clockValue) {
         normalized.push({ time: normalizeClock(clockValue), dayShift: 0 });
     }
-    else if (code === EventTiming["Before Meal"]) {
+    else if (code === types_1.EventTiming["Before Meal"]) {
         for (const meal of getDefaultMealPairs(config)) {
-            const base = config.eventClock[meal];
+            const base = eventClock[meal];
             if (!base) {
                 continue;
             }
-            normalized.push(applyOffset(normalizeClock(base), mealOffsets[code] ?? 0));
+            normalized.push(applyOffset(normalizeClock(base), (_c = mealOffsets[code]) !== null && _c !== void 0 ? _c : 0));
         }
     }
-    else if (code === EventTiming["After Meal"]) {
+    else if (code === types_1.EventTiming["After Meal"]) {
         for (const meal of getDefaultMealPairs(config)) {
-            const base = config.eventClock[meal];
+            const base = eventClock[meal];
             if (!base) {
                 continue;
             }
-            normalized.push(applyOffset(normalizeClock(base), mealOffsets[code] ?? 0));
+            normalized.push(applyOffset(normalizeClock(base), (_d = mealOffsets[code]) !== null && _d !== void 0 ? _d : 0));
         }
     }
-    else if (code === EventTiming.Meal) {
+    else if (code === types_1.EventTiming.Meal) {
         for (const meal of getDefaultMealPairs(config)) {
-            const base = config.eventClock[meal];
+            const base = eventClock[meal];
             if (!base) {
                 continue;
             }
@@ -329,25 +358,26 @@ function expandTiming(code, config, repeat) {
     }
     else if (code in SPECIFIC_BEFORE_MEALS) {
         const mealCode = SPECIFIC_BEFORE_MEALS[code];
-        const base = config.eventClock[mealCode];
+        const base = eventClock[mealCode];
         if (base) {
             const baseClock = normalizeClock(base);
-            const offset = mealOffsets[code] ?? mealOffsets[EventTiming["Before Meal"]] ?? 0;
+            const offset = (_f = (_e = mealOffsets[code]) !== null && _e !== void 0 ? _e : mealOffsets[types_1.EventTiming["Before Meal"]]) !== null && _f !== void 0 ? _f : 0;
             normalized.push(offset ? applyOffset(baseClock, offset) : { time: baseClock, dayShift: 0 });
         }
     }
     else if (code in SPECIFIC_AFTER_MEALS) {
         const mealCode = SPECIFIC_AFTER_MEALS[code];
-        const base = config.eventClock[mealCode];
+        const base = eventClock[mealCode];
         if (base) {
             const baseClock = normalizeClock(base);
-            const offset = mealOffsets[code] ?? mealOffsets[EventTiming["After Meal"]] ?? 0;
+            const offset = (_h = (_g = mealOffsets[code]) !== null && _g !== void 0 ? _g : mealOffsets[types_1.EventTiming["After Meal"]]) !== null && _h !== void 0 ? _h : 0;
             normalized.push(offset ? applyOffset(baseClock, offset) : { time: baseClock, dayShift: 0 });
         }
     }
     if (repeat.offset && normalized.length) {
         return normalized.map((entry) => {
-            const adjusted = applyOffset(entry.time, repeat.offset ?? 0);
+            var _a;
+            const adjusted = applyOffset(entry.time, (_a = repeat.offset) !== null && _a !== void 0 ? _a : 0);
             return {
                 time: adjusted.time,
                 dayShift: entry.dayShift + adjusted.dayShift
@@ -361,7 +391,7 @@ function expandWhenCodes(whenCodes, config, repeat) {
     const entries = [];
     const seen = new Set();
     for (const code of whenCodes) {
-        if (code === EventTiming.Immediate) {
+        if (code === types_1.EventTiming.Immediate) {
             continue;
         }
         const expansions = expandTiming(code, config, repeat);
@@ -381,36 +411,45 @@ function expandWhenCodes(whenCodes, config, repeat) {
         return a.time.localeCompare(b.time);
     });
 }
+function mergeFrequencyDefaults(base, override) {
+    var _a, _b, _c, _d;
+    if (!base && !override) {
+        return undefined;
+    }
+    const merged = {};
+    if ((base === null || base === void 0 ? void 0 : base.byCode) || (override === null || override === void 0 ? void 0 : override.byCode)) {
+        merged.byCode = Object.assign(Object.assign({}, ((_a = base === null || base === void 0 ? void 0 : base.byCode) !== null && _a !== void 0 ? _a : {})), ((_b = override === null || override === void 0 ? void 0 : override.byCode) !== null && _b !== void 0 ? _b : {}));
+    }
+    if ((base === null || base === void 0 ? void 0 : base.byFrequency) || (override === null || override === void 0 ? void 0 : override.byFrequency)) {
+        merged.byFrequency = Object.assign(Object.assign({}, ((_c = base === null || base === void 0 ? void 0 : base.byFrequency) !== null && _c !== void 0 ? _c : {})), ((_d = override === null || override === void 0 ? void 0 : override.byFrequency) !== null && _d !== void 0 ? _d : {}));
+    }
+    return merged;
+}
 /** Resolves fallback clock arrays for frequency-only schedules. */
 function resolveFrequencyClocks(timing, config) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const defaults = {
-        byCode: {
-            ...DEFAULT_FREQUENCY_DEFAULTS.byCode,
-            ...(config.frequencyDefaults?.byCode ?? {})
-        },
-        byFrequency: {
-            ...DEFAULT_FREQUENCY_DEFAULTS.byFrequency,
-            ...(config.frequencyDefaults?.byFrequency ?? {})
-        }
+        byCode: Object.assign(Object.assign({}, DEFAULT_FREQUENCY_DEFAULTS.byCode), ((_b = (_a = config.frequencyDefaults) === null || _a === void 0 ? void 0 : _a.byCode) !== null && _b !== void 0 ? _b : {})),
+        byFrequency: Object.assign(Object.assign({}, DEFAULT_FREQUENCY_DEFAULTS.byFrequency), ((_d = (_c = config.frequencyDefaults) === null || _c === void 0 ? void 0 : _c.byFrequency) !== null && _d !== void 0 ? _d : {}))
     };
     const collected = new Set();
-    const code = timing.code?.coding?.find((coding) => coding.code)?.code;
-    const normalizedCode = code?.toUpperCase();
-    if (normalizedCode && defaults.byCode?.[normalizedCode]) {
+    const code = (_g = (_f = (_e = timing.code) === null || _e === void 0 ? void 0 : _e.coding) === null || _f === void 0 ? void 0 : _f.find((coding) => coding.code)) === null || _g === void 0 ? void 0 : _g.code;
+    const normalizedCode = code === null || code === void 0 ? void 0 : code.toUpperCase();
+    if (normalizedCode && ((_h = defaults.byCode) === null || _h === void 0 ? void 0 : _h[normalizedCode])) {
         for (const clock of defaults.byCode[normalizedCode]) {
             collected.add(normalizeClock(clock));
         }
     }
     const repeat = timing.repeat;
-    if (repeat?.frequency && repeat.period && repeat.periodUnit) {
+    if ((repeat === null || repeat === void 0 ? void 0 : repeat.frequency) && repeat.period && repeat.periodUnit) {
         const key = `freq:${repeat.frequency}/${repeat.periodUnit}`;
-        if (defaults.byFrequency?.[key]) {
+        if ((_j = defaults.byFrequency) === null || _j === void 0 ? void 0 : _j[key]) {
             for (const clock of defaults.byFrequency[key]) {
                 collected.add(normalizeClock(clock));
             }
         }
         const perPeriodKey = `freq:${repeat.frequency}/per:${repeat.period}${repeat.periodUnit}`;
-        if (defaults.byFrequency?.[perPeriodKey]) {
+        if ((_k = defaults.byFrequency) === null || _k === void 0 ? void 0 : _k[perPeriodKey]) {
             for (const clock of defaults.byFrequency[perPeriodKey]) {
                 collected.add(normalizeClock(clock));
             }
@@ -418,41 +457,50 @@ function resolveFrequencyClocks(timing, config) {
     }
     return Array.from(collected).sort();
 }
-/** Determines the greater of orderedAt/from for baseline comparisons. */
-function computeBaseline(orderedAt, from) {
-    return orderedAt > from ? orderedAt : from;
-}
 /**
  * Produces the next dose timestamps in ascending order according to the
  * provided configuration and dosage metadata.
  */
-export function nextDueDoses(dosage, options) {
+function nextDueDoses(dosage, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     if (!options || typeof options !== "object") {
         throw new Error("Options argument is required for nextDueDoses");
     }
-    const { limit } = options;
+    if (options.from === undefined) {
+        throw new Error("The 'from' option is required for nextDueDoses");
+    }
+    const limit = (_a = options.limit) !== null && _a !== void 0 ? _a : 10;
     if (!Number.isFinite(limit) || limit <= 0) {
         return [];
     }
-    const orderedAt = coerceDate(options.orderedAt, "orderedAt");
     const from = coerceDate(options.from, "from");
-    const { config } = options;
-    if (!config || !config.timeZone) {
+    const orderedAt = options.orderedAt === undefined ? null : coerceDate(options.orderedAt, "orderedAt");
+    const baseTime = orderedAt !== null && orderedAt !== void 0 ? orderedAt : from;
+    const providedConfig = options.config;
+    const timeZone = (_b = options.timeZone) !== null && _b !== void 0 ? _b : providedConfig === null || providedConfig === void 0 ? void 0 : providedConfig.timeZone;
+    if (!timeZone) {
         throw new Error("Configuration with a valid timeZone is required");
     }
-    const timeZone = config.timeZone;
+    const eventClock = Object.assign(Object.assign({}, ((_c = providedConfig === null || providedConfig === void 0 ? void 0 : providedConfig.eventClock) !== null && _c !== void 0 ? _c : {})), ((_d = options.eventClock) !== null && _d !== void 0 ? _d : {}));
+    const mealOffsets = Object.assign(Object.assign({}, ((_e = providedConfig === null || providedConfig === void 0 ? void 0 : providedConfig.mealOffsets) !== null && _e !== void 0 ? _e : {})), ((_f = options.mealOffsets) !== null && _f !== void 0 ? _f : {}));
+    const frequencyDefaults = mergeFrequencyDefaults(providedConfig === null || providedConfig === void 0 ? void 0 : providedConfig.frequencyDefaults, options.frequencyDefaults);
+    const config = {
+        timeZone,
+        eventClock,
+        mealOffsets,
+        frequencyDefaults
+    };
     const timing = dosage.timing;
-    const repeat = timing?.repeat;
+    const repeat = timing === null || timing === void 0 ? void 0 : timing.repeat;
     if (!timing || !repeat) {
         return [];
     }
-    const baseline = computeBaseline(orderedAt, from);
     const results = [];
     const seen = new Set();
-    const dayFilter = new Set((repeat.dayOfWeek ?? []).map((day) => day.toLowerCase()));
+    const dayFilter = new Set(((_g = repeat.dayOfWeek) !== null && _g !== void 0 ? _g : []).map((day) => day.toLowerCase()));
     const enforceDayFilter = dayFilter.size > 0;
-    const whenCodes = repeat.when ?? [];
-    const timeOfDayEntries = repeat.timeOfDay ?? [];
+    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) {
         const expanded = expandWhenCodes(whenCodes, config, repeat);
         if (timeOfDayEntries.length > 0) {
@@ -466,11 +514,14 @@ export function nextDueDoses(dosage, options) {
                 return a.time.localeCompare(b.time);
             });
         }
-        const includesImmediate = whenCodes.includes(EventTiming.Immediate);
-        if (includesImmediate && orderedAt >= baseline) {
-            const instantIso = formatZonedIso(orderedAt, timeZone);
-            results.push(instantIso);
-            seen.add(instantIso);
+        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) {
+                const instantIso = formatZonedIso(immediateSource, timeZone);
+                results.push(instantIso);
+                seen.add(instantIso);
+            }
         }
         if (expanded.length === 0) {
             return results.slice(0, limit);
@@ -489,10 +540,10 @@ export function nextDueDoses(dosage, options) {
                     if (!zoned) {
                         continue;
                     }
-                    if (zoned < baseline) {
+                    if (zoned < from) {
                         continue;
                     }
-                    if (zoned < orderedAt) {
+                    if (orderedAt && zoned < orderedAt) {
                         continue;
                     }
                     const iso = formatZonedIso(zoned, timeZone);
@@ -518,7 +569,7 @@ export function nextDueDoses(dosage, options) {
     if (treatAsInterval) {
         // 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(orderedAt, from, limit, repeat, timeZone, dayFilter, enforceDayFilter);
+        const candidates = generateIntervalSeries(baseTime, from, limit, repeat, timeZone, dayFilter, enforceDayFilter, orderedAt);
         return candidates;
     }
     if (repeat.frequency && repeat.period && repeat.periodUnit) {
@@ -540,7 +591,10 @@ export function nextDueDoses(dosage, options) {
                     if (!zoned) {
                         continue;
                     }
-                    if (zoned < baseline || zoned < orderedAt) {
+                    if (zoned < from) {
+                        continue;
+                    }
+                    if (orderedAt && zoned < orderedAt) {
                         continue;
                     }
                     const iso = formatZonedIso(zoned, timeZone);
@@ -561,21 +615,20 @@ export function nextDueDoses(dosage, options) {
     return [];
 }
 /**
- * Generates an interval-based series by stepping forward from orderedAt until
- * the requested number of timestamps have been produced.
+ * Generates an interval-based series by stepping forward from the base time
+ * until the requested number of timestamps have been produced.
  */
-function generateIntervalSeries(orderedAt, from, limit, repeat, timeZone, dayFilter, enforceDayFilter) {
+function generateIntervalSeries(baseTime, from, limit, repeat, timeZone, dayFilter, enforceDayFilter, orderedAt) {
     const increment = createIntervalStepper(repeat, timeZone);
     if (!increment) {
         return [];
     }
     const results = [];
     const seen = new Set();
-    let current = orderedAt;
-    const baseline = computeBaseline(orderedAt, from);
+    let current = baseTime;
     let guard = 0;
     const maxIterations = limit * 1000;
-    while (current < baseline && guard < maxIterations) {
+    while (current < from && guard < maxIterations) {
         const next = increment(current);
         if (!next || next.getTime() === current.getTime()) {
             break;
@@ -586,6 +639,25 @@ function generateIntervalSeries(orderedAt, from, limit, repeat, timeZone, dayFil
     while (results.length < limit && guard < maxIterations) {
         const weekday = getLocalWeekday(current, timeZone);
         if (!enforceDayFilter || dayFilter.has(weekday)) {
+            if (current < from) {
+                // Ensure the current candidate respects the evaluation window.
+                guard += 1;
+                const next = increment(current);
+                if (!next || next.getTime() === current.getTime()) {
+                    break;
+                }
+                current = next;
+                continue;
+            }
+            if (orderedAt && current < orderedAt) {
+                guard += 1;
+                const next = increment(current);
+                if (!next || next.getTime() === current.getTime()) {
+                    break;
+                }
+                current = next;
+                continue;
+            }
             const iso = formatZonedIso(current, timeZone);
             if (!seen.has(iso)) {
                 seen.add(iso);