ezmedicationinput 0.1.18 → 0.1.19

package/dist/parser.js

@@ -1445,6 +1445,7 @@ function parseInternal(input, options) {
     }
     // PRN detection
     let prnReasonStart;
+    const prnSiteSuffixIndices = new Set();
     for (let i = 0; i < tokens.length; i++) {
         const token = tokens[i];
         if (token.lower === "prn") {
@@ -1529,6 +1530,9 @@ function parseInternal(input, options) {
     };
     // Process tokens sequentially
     const tryRouteSynonym = (startIndex) => {
+        if (prnReasonStart !== undefined && startIndex >= prnReasonStart) {
+            return false;
+        }
         const maxSpan = Math.min(24, tokens.length - startIndex);
         for (let span = maxSpan; span >= 1; span--) {
             const slice = tokens.slice(startIndex, startIndex + span);
@@ -1949,22 +1953,10 @@ function parseInternal(input, options) {
                 }
             }
             if (reasonTokens.length > 0) {
-                const siteStart = findTrailingPrnSiteSuffix(reasonObjects, internal, options);
-                if (siteStart !== undefined) {
-                    for (let i = siteStart; i < reasonObjects.length; i++) {
-                        internal.consumed.delete(reasonObjects[i].index);
-                    }
-                    reasonObjects.splice(siteStart);
-                    reasonTokens.splice(siteStart);
-                    reasonIndices.splice(siteStart);
-                    if (reasonTokens.length > 0) {
-                        sortedIndices = reasonIndices.slice().sort((a, b) => a - b);
-                        range = computeTokenRange(internal.input, tokens, sortedIndices);
-                        sourceText = range ? internal.input.slice(range.start, range.end) : undefined;
-                    }
-                    else {
-                        range = undefined;
-                        sourceText = undefined;
+                const suffixTokens = findTrailingPrnSiteSuffix(reasonObjects, internal, options);
+                if (suffixTokens === null || suffixTokens === void 0 ? void 0 : suffixTokens.length) {
+                    for (const token of suffixTokens) {
+                        prnSiteSuffixIndices.add(token.index);
                     }
                 }
             }
@@ -2003,21 +1995,31 @@ function parseInternal(input, options) {
     // Determine site text from leftover tokens (excluding PRN reason tokens)
     const leftoverTokens = tokens.filter((t) => !internal.consumed.has(t.index));
     const siteCandidateIndices = new Set();
+    const leftoverSiteIndices = new Set();
     for (const token of leftoverTokens) {
+        if (prnSiteSuffixIndices.has(token.index)) {
+            continue;
+        }
         const normalized = normalizeTokenLower(token);
         if (isBodySiteHint(normalized, internal.customSiteHints)) {
             siteCandidateIndices.add(token.index);
+            leftoverSiteIndices.add(token.index);
             continue;
         }
         if (SITE_CONNECTORS.has(normalized)) {
             const next = tokens[token.index + 1];
-            if (next && !internal.consumed.has(next.index)) {
+            if (next && !internal.consumed.has(next.index) && !prnSiteSuffixIndices.has(next.index)) {
                 siteCandidateIndices.add(next.index);
             }
         }
     }
-    for (const idx of internal.siteTokenIndices) {
-        siteCandidateIndices.add(idx);
+    if (leftoverSiteIndices.size === 0) {
+        for (const idx of internal.siteTokenIndices) {
+            if (prnSiteSuffixIndices.has(idx)) {
+                continue;
+            }
+            siteCandidateIndices.add(idx);
+        }
     }
     if (siteCandidateIndices.size > 0) {
         const indicesToInclude = new Set(siteCandidateIndices);
@@ -2903,6 +2905,7 @@ function findTrailingPrnSiteSuffix(tokens, internal, options) {
     }
     const suffixTokens = tokens.slice(suffixStart);
     const siteWords = [];
+    const siteHintTokens = [];
     for (const token of suffixTokens) {
         const trimmed = token.original.trim();
         if (!trimmed) {
@@ -2914,6 +2917,7 @@ function findTrailingPrnSiteSuffix(tokens, internal, options) {
             ROUTE_DESCRIPTOR_FILLER_WORDS.has(lower)) {
             continue;
         }
+        siteHintTokens.push(token);
         siteWords.push(trimmed);
     }
     if (!siteWords.length) {
@@ -2928,7 +2932,7 @@ function findTrailingPrnSiteSuffix(tokens, internal, options) {
     if (!definition) {
         return undefined;
     }
-    return suffixStart;
+    return siteHintTokens;
 }
 function lookupPrnReasonDefinition(map, canonical) {
     if (!map) {

package/package.json

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