ezmedicationinput 0.1.30 → 0.1.31

package/dist/maps.js

@@ -700,6 +700,7 @@ exports.EVENT_TIMING_TOKENS = {
     night: types_1.EventTiming.Night,
     hs: types_1.EventTiming["Before Sleep"],
     bedtime: types_1.EventTiming["Before Sleep"],
+    bed: types_1.EventTiming["Before Sleep"],
     wake: types_1.EventTiming.Wake,
     waking: types_1.EventTiming.Wake,
     stat: types_1.EventTiming.Immediate

package/dist/parser.js

@@ -190,6 +190,9 @@ const COMBO_EVENT_TIMINGS = {
     "early evening": types_1.EventTiming["Early Evening"],
     "late evening": types_1.EventTiming["Late Evening"],
     "after sleep": types_1.EventTiming["After Sleep"],
+    "before bed": types_1.EventTiming["Before Sleep"],
+    "before bedtime": types_1.EventTiming["Before Sleep"],
+    "before sleep": types_1.EventTiming["Before Sleep"],
     "upon waking": types_1.EventTiming.Wake
 };
 const MEAL_CONTEXT_CONNECTORS = new Set(["and", "or", "&", "+", "plus"]);
@@ -781,39 +784,17 @@ function tryParseTimeBasedSchedule(internal, tokens, index) {
     const token = tokens[index];
     if (internal.consumed.has(token.index))
         return false;
-    // Handle connectors like "and at" or just "and" before a time.
-    // This prevents rogue "and" from leaking into Additional Instructions
-    // when it serves as a connector between schedule parts.
-    let isAndPrefix = false;
     let isAtPrefix = token.lower === "@" || token.lower === "at";
-    if (token.lower === "and" && !isAtPrefix) {
-        const next = tokens[index + 1];
-        if (next && !internal.consumed.has(next.index)) {
-            const nextLower = next.lower;
-            // If "and" is followed by "at", "@", or a number, it's a connector for this time block
-            if (nextLower === "@" || nextLower === "at" || /^\d/.test(nextLower)) {
-                isAndPrefix = true;
-                if (nextLower === "@" || nextLower === "at") {
-                    isAtPrefix = true;
-                }
-            }
-        }
-    }
-    if (!isAtPrefix && !isAndPrefix && !/^\d/.test(token.lower))
+    if (!isAtPrefix && !/^\d/.test(token.lower))
         return false;
     let nextIndex = index;
-    if (isAndPrefix)
-        nextIndex++;
     if (isAtPrefix)
         nextIndex++;
     const times = [];
     const consumedIndices = [];
     const timeTokens = [];
-    if (isAndPrefix)
-        consumedIndices.push(index);
     if (isAtPrefix) {
-        // If we have "and at", at is the second token (index + 1)
-        consumedIndices.push(isAndPrefix ? index + 1 : index);
+        consumedIndices.push(index);
     }
     while (nextIndex < tokens.length) {
         const nextToken = tokens[nextIndex];
@@ -1518,6 +1499,20 @@ function applyWhenToken(internal, token, code) {
     addWhen(internal.when, code);
     mark(internal.consumed, token);
 }
+function isTimingAnchorOrPrefix(tokens, index) {
+    const token = tokens[index];
+    if (!token)
+        return false;
+    const lower = token.lower;
+    const nextToken = tokens[index + 1];
+    const comboKey = nextToken ? `${lower} ${nextToken.lower}` : undefined;
+    return Boolean(maps_1.EVENT_TIMING_TOKENS[lower] ||
+        maps_1.TIMING_ABBREVIATIONS[lower] ||
+        (comboKey && COMBO_EVENT_TIMINGS[comboKey]) ||
+        (lower === "pc" || lower === "ac" || lower === "after" || lower === "before") ||
+        (lower === "at" || lower === "@" || lower === "on" || lower === "with") ||
+        /^\d/.test(lower));
+}
 function parseAnchorSequence(internal, tokens, index, prefixCode) {
     var _a;
     const token = tokens[index];
@@ -1936,7 +1931,25 @@ function parseInternal(input, options) {
         if (tryParseCompactQ(internal, tokens, i)) {
             continue;
         }
+        // Skip connectors if they are followed by recognized timing tokens or prefixes
+        if (MEAL_CONTEXT_CONNECTORS.has(token.lower) || token.lower === ",") {
+            if (isTimingAnchorOrPrefix(tokens, i + 1)) {
+                mark(internal.consumed, token);
+                continue;
+            }
+        }
         // Event timing tokens
+        const nextToken = tokens[i + 1];
+        if (nextToken && !internal.consumed.has(nextToken.index)) {
+            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;
+            }
+        }
         if (token.lower === "pc" || token.lower === "ac" || token.lower === "after" || token.lower === "before") {
             parseAnchorSequence(internal, tokens, i, (token.lower === "pc" || token.lower === "after")
                 ? types_1.EventTiming["After Meal"]
@@ -1957,17 +1970,6 @@ function parseInternal(input, options) {
                 continue;
             }
         }
-        const nextToken = tokens[i + 1];
-        if (nextToken && !internal.consumed.has(nextToken.index)) {
-            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;
-            }
-        }
         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);
@@ -3183,7 +3185,7 @@ function collectAdditionalInstructions(internal, tokens) {
                     : undefined
             });
         }
-        else {
+        else if (!MEAL_CONTEXT_CONNECTORS.has(phrase.toLowerCase())) {
             instructions.push({ text: phrase });
         }
     }

package/package.json

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