ezmedicationinput 0.1.25 → 0.1.26

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

@@ -1925,13 +1925,20 @@ function parseInternal(input, options) {
         }
         const nextToken = tokens[i + 1];
         if (nextToken && !internal.consumed.has(nextToken.index)) {
-            const combo = `${token.lower} ${nextToken.lower}`;
+            const lowerNext = nextToken.lower;
+            const combo = `${token.lower} ${lowerNext}`;
             const comboWhen = (_e = COMBO_EVENT_TIMINGS[combo]) !== null && _e !== void 0 ? _e : 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];
         if (customWhen) {
@@ -2216,10 +2223,19 @@ 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'.
             }
             reasonTokens.push(token.original);
             reasonIndices.push(token.index);

package/package.json

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