ezmedicationinput 0.1.19 → 0.1.21

package/dist/maps.js

@@ -1349,6 +1349,17 @@ const DEFAULT_PRN_REASON_SOURCE = [
             text: "Constipation"
         }
     },
+    {
+        names: ["irritation", "irritated"],
+        definition: {
+            coding: {
+                system: SNOMED_SYSTEM,
+                code: "257553007",
+                display: "Irritation"
+            },
+            text: "Irritation"
+        }
+    },
     {
         names: ["dyspnea", "shortness of breath", "sob", "breathlessness"],
         definition: {

package/dist/parser.js

@@ -1069,13 +1069,10 @@ function reconcileMealTimingSpecificity(internal) {
 // Optionally replace generic meal tokens with concrete breakfast/lunch/dinner
 // EventTiming codes when the cadence makes the intent obvious.
 function expandMealTimings(internal, options) {
-    var _a;
+    var _a, _b, _c;
     if (!(options === null || options === void 0 ? void 0 : options.smartMealExpansion)) {
         return;
     }
-    if (!internal.when.length) {
-        return;
-    }
     if (internal.when.some((code) => SPECIFIC_MEAL_TIMINGS.has(code))) {
         return;
     }
@@ -1083,6 +1080,13 @@ function expandMealTimings(internal, options) {
     if (!frequency || frequency < 1 || frequency > 4) {
         return;
     }
+    const hasGeneralMealToken = (0, array_1.arrayIncludes)(internal.when, types_1.EventTiming["Before Meal"]) ||
+        (0, array_1.arrayIncludes)(internal.when, types_1.EventTiming["After Meal"]) ||
+        (0, array_1.arrayIncludes)(internal.when, types_1.EventTiming.Meal);
+    const needsDefaultExpansion = internal.when.length === 0 && frequency >= 2;
+    if (!hasGeneralMealToken && !needsDefaultExpansion) {
+        return;
+    }
     if (internal.period !== undefined &&
         internal.periodUnit !== undefined &&
         (internal.periodUnit !== types_1.FhirPeriodUnit.Day || internal.period !== 1)) {
@@ -1101,26 +1105,34 @@ function expandMealTimings(internal, options) {
     }
     const pairPreference = (_a = 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 ((0, array_1.arrayIncludes)(internal.when, types_1.EventTiming["Before Meal"])) {
+        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 });
-        }
+        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 });
-        }
+        addReplacement(types_1.EventTiming.Meal, "with", true);
     }
-    for (const { general, specifics } of replacements) {
-        removeWhen(internal.when, general);
+    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, removeGeneral } of replacements) {
+        if (removeGeneral) {
+            removeWhen(internal.when, general);
+        }
         for (const specific of specifics) {
             addWhen(internal.when, specific);
         }
@@ -1413,7 +1425,7 @@ function applyCountLimit(internal, value) {
     return true;
 }
 function parseInternal(input, options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const tokens = tokenize(input);
     const internal = {
         input,
@@ -1952,13 +1964,25 @@ function parseInternal(input, options) {
                     }
                 }
             }
+            let canonicalPrefix;
             if (reasonTokens.length > 0) {
-                const suffixTokens = findTrailingPrnSiteSuffix(reasonObjects, internal, options);
-                if (suffixTokens === null || suffixTokens === void 0 ? void 0 : suffixTokens.length) {
-                    for (const token of suffixTokens) {
+                const suffixInfo = findTrailingPrnSiteSuffix(reasonObjects, internal, options);
+                if ((_g = suffixInfo === null || suffixInfo === void 0 ? void 0 : suffixInfo.tokens) === null || _g === void 0 ? void 0 : _g.length) {
+                    for (const token of suffixInfo.tokens) {
                         prnSiteSuffixIndices.add(token.index);
                     }
                 }
+                if (suffixInfo && suffixInfo.startIndex > 0) {
+                    const prefixTokens = reasonObjects
+                        .slice(0, suffixInfo.startIndex)
+                        .map((token) => token.original)
+                        .join(" ")
+                        .replace(/\s+/g, " ")
+                        .trim();
+                    if (prefixTokens) {
+                        canonicalPrefix = prefixTokens.replace(/[{}]/g, " ").replace(/\s+/g, " ").trim();
+                    }
+                }
             }
             if (reasonTokens.length > 0) {
                 const joined = reasonTokens.join(" ").trim();
@@ -1974,8 +1998,9 @@ function parseInternal(input, options) {
                     const text = sanitized || joined;
                     internal.asNeededReason = text;
                     const normalized = text.toLowerCase();
-                    const canonical = sanitized
-                        ? (0, maps_1.normalizePrnReasonKey)(sanitized)
+                    const canonicalSource = canonicalPrefix || sanitized || text;
+                    const canonical = canonicalSource
+                        ? (0, maps_1.normalizePrnReasonKey)(canonicalSource)
                         : (0, maps_1.normalizePrnReasonKey)(text);
                     internal.prnReasonLookupRequest = {
                         originalText: joined,
@@ -2932,7 +2957,10 @@ function findTrailingPrnSiteSuffix(tokens, internal, options) {
     if (!definition) {
         return undefined;
     }
-    return siteHintTokens;
+    return {
+        tokens: siteHintTokens,
+        startIndex: suffixStart
+    };
 }
 function lookupPrnReasonDefinition(map, canonical) {
     if (!map) {

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;

package/package.json

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