ezmedicationinput 0.1.3 → 0.1.5

package/dist/parser.js

@@ -110,6 +110,7 @@ const COMBO_EVENT_TIMINGS = {
     "after sleep": types_1.EventTiming["After Sleep"],
     "upon waking": types_1.EventTiming.Wake
 };
+const MEAL_CONTEXT_CONNECTORS = new Set(["and", "or", "&", "+", "plus"]);
 // Tracking explicit breakfast/lunch/dinner markers lets the meal-expansion
 // logic bail early when the clinician already specified precise events.
 const SPECIFIC_MEAL_TIMINGS = new Set([
@@ -976,20 +977,31 @@ function applyWhenToken(internal, token, code) {
 }
 function parseMealContext(internal, tokens, index, code) {
     const token = tokens[index];
-    const next = tokens[index + 1];
-    if (!next || internal.consumed.has(next.index)) {
-        applyWhenToken(internal, token, code);
-        return;
-    }
-    const meal = maps_1.MEAL_KEYWORDS[next.lower];
-    if (meal) {
+    let converted = 0;
+    for (let lookahead = index + 1; lookahead < tokens.length; lookahead++) {
+        const nextToken = tokens[lookahead];
+        if (internal.consumed.has(nextToken.index)) {
+            continue;
+        }
+        if (MEAL_CONTEXT_CONNECTORS.has(nextToken.lower)) {
+            mark(internal.consumed, nextToken);
+            continue;
+        }
+        const meal = maps_1.MEAL_KEYWORDS[nextToken.lower];
+        if (!meal) {
+            break;
+        }
         const whenCode = code === types_1.EventTiming["After Meal"]
             ? meal.pc
             : code === types_1.EventTiming["Before Meal"]
                 ? meal.ac
                 : code;
-        applyWhenToken(internal, token, whenCode);
-        mark(internal.consumed, next);
+        addWhen(internal.when, whenCode);
+        mark(internal.consumed, nextToken);
+        converted++;
+    }
+    if (converted > 0) {
+        mark(internal.consumed, token);
         return;
     }
     applyWhenToken(internal, token, code);

package/dist/suggest.js

@@ -288,6 +288,7 @@ function buildWhenSequences() {
     }
     return sequences;
 }
+const PRECOMPUTED_WHEN_SEQUENCES = buildWhenSequences();
 function tokenizeForMatching(value) {
     return value
         .toLowerCase()
@@ -403,68 +404,94 @@ function buildDoseValues(input) {
     }
     return [...values];
 }
-function generateCandidateDirections(pairs, doseValues, prnReasons, intervalTokens, whenSequences) {
+function generateCandidateDirections(pairs, doseValues, prnReasons, intervalTokens, whenSequences, limit, matcher) {
     const suggestions = [];
     const seen = new Set();
     const push = (value) => {
         const normalized = normalizeSpacing(value);
         if (!normalized) {
-            return;
+            return false;
         }
         const key = normalizeKey(normalized);
         if (seen.has(key)) {
-            return;
+            return false;
         }
         seen.add(key);
+        if (!matcher(normalized)) {
+            return false;
+        }
         suggestions.push(normalized);
+        return suggestions.length >= limit;
     };
     for (const pair of pairs) {
         const unitVariants = getUnitVariants(pair.unit);
         for (const code of FREQUENCY_CODES) {
             for (const unitVariant of unitVariants) {
                 for (const dose of doseValues) {
-                    push(`${dose} ${unitVariant} ${pair.route} ${code}`);
+                    if (push(`${dose} ${unitVariant} ${pair.route} ${code}`)) {
+                        return suggestions;
+                    }
                 }
             }
-            push(`${pair.route} ${code}`);
+            if (push(`${pair.route} ${code}`)) {
+                return suggestions;
+            }
         }
         for (const interval of intervalTokens) {
             for (const unitVariant of unitVariants) {
                 for (const dose of doseValues) {
-                    push(`${dose} ${unitVariant} ${pair.route} ${interval}`);
+                    if (push(`${dose} ${unitVariant} ${pair.route} ${interval}`)) {
+                        return suggestions;
+                    }
                     for (const reason of prnReasons) {
-                        push(`${dose} ${unitVariant} ${pair.route} ${interval} prn ${reason}`);
+                        if (push(`${dose} ${unitVariant} ${pair.route} ${interval} prn ${reason}`)) {
+                            return suggestions;
+                        }
                     }
                 }
             }
-            push(`${pair.route} ${interval}`);
+            if (push(`${pair.route} ${interval}`)) {
+                return suggestions;
+            }
         }
         for (const freq of FREQUENCY_NUMBERS) {
             const freqToken = FREQ_TOKEN_BY_NUMBER[freq];
             if (!freqToken) {
                 continue;
             }
-            push(`1x${freq} ${pair.route} ${freqToken}`);
+            if (push(`1x${freq} ${pair.route} ${freqToken}`)) {
+                return suggestions;
+            }
             for (const when of CORE_WHEN_TOKENS) {
-                push(`1x${freq} ${pair.route} ${when}`);
+                if (push(`1x${freq} ${pair.route} ${when}`)) {
+                    return suggestions;
+                }
             }
         }
         for (const whenSequence of whenSequences) {
             const suffix = whenSequence.join(" ");
             for (const unitVariant of unitVariants) {
                 for (const dose of doseValues) {
-                    push(`${dose} ${unitVariant} ${pair.route} ${suffix}`);
+                    if (push(`${dose} ${unitVariant} ${pair.route} ${suffix}`)) {
+                        return suggestions;
+                    }
                 }
             }
-            push(`${pair.route} ${suffix}`);
+            if (push(`${pair.route} ${suffix}`)) {
+                return suggestions;
+            }
         }
         for (const reason of prnReasons) {
             for (const unitVariant of unitVariants) {
                 for (const dose of doseValues) {
-                    push(`${dose} ${unitVariant} ${pair.route} prn ${reason}`);
+                    if (push(`${dose} ${unitVariant} ${pair.route} prn ${reason}`)) {
+                        return suggestions;
+                    }
                 }
             }
-            push(`${pair.route} prn ${reason}`);
+            if (push(`${pair.route} prn ${reason}`)) {
+                return suggestions;
+            }
         }
     }
     return suggestions;
@@ -507,6 +534,9 @@ function matchesPrefix(candidate, prefix, prefixCompact, prefixTokens, prefixTok
 function suggestSig(input, options) {
     var _a, _b;
     const limit = (_a = options === null || options === void 0 ? void 0 : options.limit) !== null && _a !== void 0 ? _a : DEFAULT_LIMIT;
+    if (limit <= 0) {
+        return [];
+    }
     const prefix = normalizeSpacing(input.toLowerCase());
     const prefixCompact = prefix.replace(/\s+/g, "");
     const prefixNoDashes = prefix.replace(/-/g, "");
@@ -520,16 +550,7 @@ function suggestSig(input, options) {
     const doseValues = buildDoseValues(input);
     const prnReasons = buildPrnReasons(options === null || options === void 0 ? void 0 : options.prnReasons);
     const intervalTokens = buildIntervalTokens(input);
-    const whenSequences = buildWhenSequences();
-    const candidates = generateCandidateDirections(pairs, doseValues, prnReasons, intervalTokens, whenSequences);
-    const results = [];
-    for (const candidate of candidates) {
-        if (matchesPrefix(candidate, prefix, prefixCompact, prefixTokens, prefixTokensNoDashes, prefixCanonical, prefixCanonicalCompact, prefixNoDashes, prefixCanonicalNoDashes)) {
-            results.push(candidate);
-        }
-        if (results.length >= limit) {
-            break;
-        }
-    }
-    return results;
+    const whenSequences = PRECOMPUTED_WHEN_SEQUENCES;
+    const matcher = (candidate) => matchesPrefix(candidate, prefix, prefixCompact, prefixTokens, prefixTokensNoDashes, prefixCanonical, prefixCanonicalCompact, prefixNoDashes, prefixCanonicalNoDashes);
+    return generateCandidateDirections(pairs, doseValues, prnReasons, intervalTokens, whenSequences, limit, matcher);
 }

package/package.json

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