ezmedicationinput 0.1.25 → 0.1.27

package/dist/maps.js

@@ -663,6 +663,9 @@ exports.EVENT_TIMING_TOKENS = {
     pcv: types_1.EventTiming["After Dinner"],
     wm: types_1.EventTiming.Meal,
     "with meals": types_1.EventTiming.Meal,
+    "with meal": types_1.EventTiming.Meal,
+    "with food": types_1.EventTiming.Meal,
+    cc: types_1.EventTiming.Meal,
     "@m": types_1.EventTiming.Meal,
     "@meal": types_1.EventTiming.Meal,
     "@meals": types_1.EventTiming.Meal,

package/dist/parser.js

@@ -1657,7 +1657,7 @@ function applyCountLimit(internal, value) {
     return true;
 }
 function parseInternal(input, options) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const tokens = tokenize(input);
     const internal = {
         input,
@@ -1695,15 +1695,20 @@ function parseInternal(input, options) {
         if (token.lower === "prn") {
             internal.asNeeded = true;
             mark(internal.consumed, token);
-            prnReasonStart = i + 1;
+            let reasonIndex = i + 1;
+            if (((_b = tokens[reasonIndex]) === null || _b === void 0 ? void 0 : _b.lower) === "for") {
+                mark(internal.consumed, tokens[reasonIndex]);
+                reasonIndex += 1;
+            }
+            prnReasonStart = reasonIndex;
             break;
         }
-        if (token.lower === "as" && ((_b = tokens[i + 1]) === null || _b === void 0 ? void 0 : _b.lower) === "needed") {
+        if (token.lower === "as" && ((_c = tokens[i + 1]) === null || _c === void 0 ? void 0 : _c.lower) === "needed") {
             internal.asNeeded = true;
             mark(internal.consumed, token);
             mark(internal.consumed, tokens[i + 1]);
             let reasonIndex = i + 2;
-            if (((_c = tokens[reasonIndex]) === null || _c === void 0 ? void 0 : _c.lower) === "for") {
+            if (((_d = tokens[reasonIndex]) === null || _d === void 0 ? void 0 : _d.lower) === "for") {
                 mark(internal.consumed, tokens[reasonIndex]);
                 reasonIndex += 1;
             }
@@ -1898,7 +1903,7 @@ function parseInternal(input, options) {
         // Frequency abbreviation map
         const freqDescriptor = normalizedLower === "od"
             ? undefined
-            : (_d = maps_1.TIMING_ABBREVIATIONS[token.lower]) !== null && _d !== void 0 ? _d : maps_1.TIMING_ABBREVIATIONS[normalizedLower];
+            : (_e = maps_1.TIMING_ABBREVIATIONS[token.lower]) !== null && _e !== void 0 ? _e : maps_1.TIMING_ABBREVIATIONS[normalizedLower];
         if (freqDescriptor) {
             applyFrequencyDescriptor(internal, token, freqDescriptor, options);
             continue;
@@ -1925,15 +1930,22 @@ function parseInternal(input, options) {
         }
         const nextToken = tokens[i + 1];
         if (nextToken && !internal.consumed.has(nextToken.index)) {
-            const combo = `${token.lower} ${nextToken.lower}`;
-            const comboWhen = (_e = COMBO_EVENT_TIMINGS[combo]) !== null && _e !== void 0 ? _e : maps_1.EVENT_TIMING_TOKENS[combo];
+            const lowerNext = nextToken.lower;
+            const combo = `${token.lower} ${lowerNext}`;
+            const comboWhen = (_f = COMBO_EVENT_TIMINGS[combo]) !== null && _f !== void 0 ? _f : maps_1.EVENT_TIMING_TOKENS[combo];
             if (comboWhen) {
                 applyWhenToken(internal, token, comboWhen);
                 mark(internal.consumed, nextToken);
                 continue;
             }
+            // Issue 2: Support "with meal" and "with food" combos explicitly if needed
+            if (token.lower === "with" && (lowerNext === "meal" || lowerNext === "food")) {
+                applyWhenToken(internal, token, types_1.EventTiming.Meal);
+                mark(internal.consumed, nextToken);
+                continue;
+            }
         }
-        const customWhen = (_f = options === null || options === void 0 ? void 0 : options.whenMap) === null || _f === void 0 ? void 0 : _f[token.lower];
+        const customWhen = (_g = options === null || options === void 0 ? void 0 : options.whenMap) === null || _g === void 0 ? void 0 : _g[token.lower];
         if (customWhen) {
             applyWhenToken(internal, token, customWhen);
             continue;
@@ -2216,10 +2228,36 @@ function parseInternal(input, options) {
         const reasonTokens = [];
         const reasonIndices = [];
         const reasonObjects = [];
+        const PRN_RECLAIMABLE_CONNECTORS = new Set(["at", "to", "in", "into", "on", "onto"]);
         for (let i = prnReasonStart; i < tokens.length; i++) {
             const token = tokens[i];
             if (internal.consumed.has(token.index)) {
-                internal.consumed.delete(token.index);
+                // We only allow reclaiming certain generic connectors if they were used
+                // as standalone markers (like 'at' or 'to') and not if they were clearly
+                // part of a frequency/period instruction (which would be skipped here
+                // if they were consumed by those specific logic paths).
+                if (!PRN_RECLAIMABLE_CONNECTORS.has(token.lower)) {
+                    continue;
+                }
+                // If it is a reclaimable connector, we can pull it back into the reason
+                // if it helps form a coherent phrase like 'irritation at rectum'.
+            }
+            // If we haven't started collecting the reason yet, we should skip introductory
+            // connectors to avoid phrases like "as needed for if pain".
+            const PRN_INTRODUCTIONS = new Set(["for", "if", "when", "upon", "due", "to"]);
+            if (reasonTokens.length === 0 && PRN_INTRODUCTIONS.has(token.lower)) {
+                // Special handling for "due to" - if we skipped "due", we should also skip "to"
+                if (token.lower === "due") {
+                    const next = tokens[i + 1];
+                    if (next && next.lower === "to") {
+                        mark(internal.consumed, token);
+                        mark(internal.consumed, next);
+                        i++; // skip next token in loop
+                        continue;
+                    }
+                }
+                mark(internal.consumed, token);
+                continue;
             }
             reasonTokens.push(token.original);
             reasonIndices.push(token.index);
@@ -2269,7 +2307,7 @@ function parseInternal(input, options) {
             let canonicalPrefix;
             if (reasonTokens.length > 0) {
                 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) {
+                if ((_h = suffixInfo === null || suffixInfo === void 0 ? void 0 : suffixInfo.tokens) === null || _h === void 0 ? void 0 : _h.length) {
                     for (const token of suffixInfo.tokens) {
                         prnSiteSuffixIndices.add(token.index);
                     }

package/package.json

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