ezmedicationinput 0.1.20 → 0.1.22

package/README.md

@@ -293,8 +293,15 @@ You can specify the number of times (total count) the medication is supposed to
 - `context`: optional medication context (dosage form, strength, container
   metadata) used to infer default units when a sig omits explicit units. Pass
   `null` to explicitly disable context-based inference.
-- `smartMealExpansion`: when `true`, generic AC/PC/C tokens expand into specific EventTiming combinations (e.g. `1x2 po ac` → `ACM` + `ACV`).
+- `smartMealExpansion`: when `true`, generic AC/PC/C meal abbreviations and
+  cadence-only instructions expand into concrete with-meal EventTiming
+  combinations (e.g. `1x3` → breakfast/lunch/dinner). This also respects
+  `context.mealRelation` when provided and only applies to schedules with four
+  or fewer daily doses.
 - `twoPerDayPair`: controls whether 2× AC/PC/C doses expand to breakfast+dinner (default) or breakfast+lunch.
+- `assumeSingleDiscreteDose`: when `true`, missing discrete doses (such as
+  tablets or capsules) default to a single unit when the parser can infer a
+  countable unit from context.
 - `eventClock`: optional map of `EventTiming` codes to HH:mm strings that drives chronological ordering of parsed `when` values.
 - `allowHouseholdVolumeUnits`: defaults to `true`; set to `false` to ignore
   teaspoon/tablespoon units during parsing and suggestions.

package/dist/parser.js

@@ -134,6 +134,36 @@ const SITE_FILLER_WORDS = new Set([
     "my"
 ]);
 const HOUSEHOLD_VOLUME_UNIT_SET = new Set(maps_1.HOUSEHOLD_VOLUME_UNITS.map((unit) => unit.toLowerCase()));
+const DISCRETE_UNIT_SET = new Set([
+    "tab",
+    "tabs",
+    "tablet",
+    "tablets",
+    "cap",
+    "caps",
+    "capsule",
+    "capsules",
+    "puff",
+    "puffs",
+    "spray",
+    "sprays",
+    "drop",
+    "drops",
+    "patch",
+    "patches",
+    "suppository",
+    "suppositories",
+    "implant",
+    "implants",
+    "piece",
+    "pieces",
+    "stick",
+    "sticks",
+    "pessary",
+    "pessaries",
+    "lozenge",
+    "lozenges"
+]);
 const OCULAR_DIRECTION_WORDS = new Set([
     "left",
     "right",
@@ -1067,13 +1097,12 @@ function reconcileMealTimingSpecificity(internal) {
     ]);
 }
 // Optionally replace generic meal tokens with concrete breakfast/lunch/dinner
-// EventTiming codes when the cadence makes the intent obvious.
+// EventTiming codes when the cadence or explicit meal abbreviations make the
+// intent obvious.
 function expandMealTimings(internal, options) {
-    var _a;
-    if (!(options === null || options === void 0 ? void 0 : options.smartMealExpansion)) {
-        return;
-    }
-    if (!internal.when.length) {
+    var _a, _b, _c;
+    const allowSmartExpansion = (options === null || options === void 0 ? void 0 : options.smartMealExpansion) === true;
+    if (!allowSmartExpansion) {
         return;
     }
     if (internal.when.some((code) => SPECIFIC_MEAL_TIMINGS.has(code))) {
@@ -1083,6 +1112,14 @@ function expandMealTimings(internal, options) {
     if (!frequency || frequency < 1 || frequency > 4) {
         return;
     }
+    const needsDefaultExpansion = internal.when.length === 0 && frequency >= 2;
+    const hasBeforeMeal = (0, array_1.arrayIncludes)(internal.when, types_1.EventTiming["Before Meal"]);
+    const hasAfterMeal = (0, array_1.arrayIncludes)(internal.when, types_1.EventTiming["After Meal"]);
+    const hasWithMeal = (0, array_1.arrayIncludes)(internal.when, types_1.EventTiming.Meal);
+    const hasGeneralMealToken = hasBeforeMeal || hasAfterMeal || hasWithMeal;
+    if (!hasGeneralMealToken && !needsDefaultExpansion) {
+        return;
+    }
     if (internal.period !== undefined &&
         internal.periodUnit !== undefined &&
         (internal.periodUnit !== types_1.FhirPeriodUnit.Day || internal.period !== 1)) {
@@ -1099,28 +1136,36 @@ function expandMealTimings(internal, options) {
     if (internal.frequencyMax !== undefined || internal.periodMax !== undefined) {
         return;
     }
-    const pairPreference = (_a = options.twoPerDayPair) !== null && _a !== void 0 ? _a : "breakfast+dinner";
+    const pairPreference = (_a = options === null || options === void 0 ? void 0 : options.twoPerDayPair) !== null && _a !== void 0 ? _a : "breakfast+dinner";
     const replacements = [];
-    if ((0, array_1.arrayIncludes)(internal.when, types_1.EventTiming["Before Meal"])) {
-        const specifics = computeMealExpansions("before", frequency, pairPreference);
+    const addReplacement = (general, base, removeGeneral) => {
+        const specifics = computeMealExpansions(base, frequency, pairPreference);
         if (specifics) {
-            replacements.push({ general: types_1.EventTiming["Before Meal"], specifics });
+            replacements.push({ general, specifics, removeGeneral });
         }
+    };
+    if (hasBeforeMeal) {
+        addReplacement(types_1.EventTiming["Before Meal"], "before", true);
     }
-    if ((0, array_1.arrayIncludes)(internal.when, types_1.EventTiming["After Meal"])) {
-        const specifics = computeMealExpansions("after", frequency, pairPreference);
-        if (specifics) {
-            replacements.push({ general: types_1.EventTiming["After Meal"], specifics });
-        }
+    if (hasAfterMeal) {
+        addReplacement(types_1.EventTiming["After Meal"], "after", true);
     }
-    if ((0, array_1.arrayIncludes)(internal.when, types_1.EventTiming.Meal)) {
-        const specifics = computeMealExpansions("with", frequency, pairPreference);
-        if (specifics) {
-            replacements.push({ general: types_1.EventTiming.Meal, specifics });
-        }
+    if (hasWithMeal) {
+        addReplacement(types_1.EventTiming.Meal, "with", true);
+    }
+    if (needsDefaultExpansion) {
+        const relation = (_c = (_b = options === null || options === void 0 ? void 0 : options.context) === null || _b === void 0 ? void 0 : _b.mealRelation) !== null && _c !== void 0 ? _c : types_1.EventTiming.Meal;
+        const base = relation === types_1.EventTiming["Before Meal"]
+            ? "before"
+            : relation === types_1.EventTiming["After Meal"]
+                ? "after"
+                : "with";
+        addReplacement(relation, base, false);
     }
-    for (const { general, specifics } of replacements) {
-        removeWhen(internal.when, general);
+    for (const { general, specifics, removeGeneral } of replacements) {
+        if (removeGeneral) {
+            removeWhen(internal.when, general);
+        }
         for (const specific of specifics) {
             addWhen(internal.when, specific);
         }
@@ -1857,6 +1902,13 @@ function parseInternal(input, options) {
             internal.unit = fallbackUnit;
         }
     }
+    if ((options === null || options === void 0 ? void 0 : options.assumeSingleDiscreteDose) &&
+        internal.dose === undefined &&
+        internal.doseRange === undefined &&
+        internal.unit !== undefined &&
+        isDiscreteUnit(internal.unit)) {
+        internal.dose = 1;
+    }
     // Frequency defaults when timing code implies it
     if (internal.frequency === undefined &&
         internal.period === undefined &&
@@ -3264,6 +3316,12 @@ function enforceHouseholdUnitPolicy(unit, options) {
     }
     return unit;
 }
+function isDiscreteUnit(unit) {
+    if (!unit) {
+        return false;
+    }
+    return DISCRETE_UNIT_SET.has(unit.trim().toLowerCase());
+}
 function inferUnitFromRouteHints(internal) {
     if (internal.routeCode) {
         const unit = maps_1.DEFAULT_UNIT_BY_ROUTE[internal.routeCode];

package/dist/types.d.ts

@@ -285,6 +285,7 @@ export interface MedicationContext {
     containerValue?: number;
     containerUnit?: string;
     defaultUnit?: string;
+    mealRelation?: (typeof EventTiming)["Before Meal"] | (typeof EventTiming)["After Meal"] | (typeof EventTiming)["Meal"];
 }
 export interface FormatOptions {
     locale?: "en" | "th" | string;
@@ -428,9 +429,17 @@ export interface ParseOptions extends FormatOptions {
     eventClock?: EventClockMap;
     allowDiscouraged?: boolean;
     /**
-     * When enabled the parser will expand generic meal timing tokens (AC/PC/C)
-     * into specific breakfast/lunch/dinner (and bedtime) EventTiming entries
-     * based on the detected daily frequency.
+     * When enabled the parser will assume a single discrete unit (e.g., one
+     * tablet/capsule) when no explicit dose is provided and the inferred unit is
+     * countable.
+     */
+    assumeSingleDiscreteDose?: boolean;
+    /**
+     * Enables inferring with-meal timings when explicit meal language is present
+     * or implied by cadence alone. Generic meal abbreviations (AC/PC/C) and
+     * cadence-only instructions expand into specific breakfast/lunch/dinner (and
+     * bedtime) EventTiming entries. Works in conjunction with
+     * `context.mealRelation` when provided.
      */
     smartMealExpansion?: boolean;
     /**

package/package.json

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