ezmedicationinput 0.1.17 → 0.1.18

package/dist/parser.js

@@ -1901,7 +1901,7 @@ function parseInternal(input, options) {
         for (let i = prnReasonStart; i < tokens.length; i++) {
             const token = tokens[i];
             if (internal.consumed.has(token.index)) {
-                continue;
+                internal.consumed.delete(token.index);
             }
             reasonTokens.push(token.original);
             reasonIndices.push(token.index);
@@ -1948,6 +1948,26 @@ 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;
+                    }
+                }
+            }
             if (reasonTokens.length > 0) {
                 const joined = reasonTokens.join(" ").trim();
                 if (joined) {
@@ -2492,18 +2512,52 @@ function normalizeSiteDisplayText(text, customSiteMap) {
         return trimmed;
     }
     const canonicalInput = (0, maps_1.normalizeBodySiteKey)(trimmed);
-    if (!canonicalInput || !isAdjectivalSitePhrase(canonicalInput)) {
-        return trimmed;
-    }
-    const definition = (_a = lookupBodySiteDefinition(customSiteMap, canonicalInput)) !== null && _a !== void 0 ? _a : maps_1.DEFAULT_BODY_SITE_SNOMED[canonicalInput];
-    if (!definition) {
+    if (!canonicalInput) {
         return trimmed;
     }
-    const preferred = pickPreferredBodySitePhrase(canonicalInput, definition, customSiteMap);
-    if (!preferred) {
-        return trimmed;
+    const resolvePreferred = (canonical) => {
+        var _a;
+        const definition = (_a = lookupBodySiteDefinition(customSiteMap, canonical)) !== null && _a !== void 0 ? _a : maps_1.DEFAULT_BODY_SITE_SNOMED[canonical];
+        if (!definition) {
+            return undefined;
+        }
+        const preferred = pickPreferredBodySitePhrase(canonical, definition, customSiteMap);
+        const textValue = preferred !== null && preferred !== void 0 ? preferred : canonical;
+        const normalized = (0, maps_1.normalizeBodySiteKey)(textValue);
+        if (!normalized) {
+            return undefined;
+        }
+        return { text: textValue, canonical: normalized };
+    };
+    if (isAdjectivalSitePhrase(canonicalInput)) {
+        const direct = resolvePreferred(canonicalInput);
+        return (_a = direct === null || direct === void 0 ? void 0 : direct.text) !== null && _a !== void 0 ? _a : trimmed;
+    }
+    const words = canonicalInput.split(/\s+/).filter((word) => word.length > 0);
+    for (let i = 1; i < words.length; i++) {
+        const prefix = words.slice(0, i);
+        if (!prefix.every((word) => isAdjectivalSitePhrase(word))) {
+            continue;
+        }
+        const candidateCanonical = words.slice(i).join(" ");
+        if (!candidateCanonical) {
+            continue;
+        }
+        const candidatePreferred = resolvePreferred(candidateCanonical);
+        if (!candidatePreferred) {
+            continue;
+        }
+        const prefixMatches = prefix.every((word) => {
+            const normalizedPrefix = resolvePreferred(word);
+            return (normalizedPrefix !== undefined &&
+                normalizedPrefix.canonical === candidatePreferred.canonical);
+        });
+        if (!prefixMatches) {
+            continue;
+        }
+        return candidatePreferred.text;
     }
-    return preferred;
+    return trimmed;
 }
 function pickPreferredBodySitePhrase(canonical, definition, customSiteMap) {
     const synonyms = new Set();
@@ -2532,12 +2586,12 @@ function pickPreferredBodySitePhrase(canonical, definition, customSiteMap) {
                 if (normalizedKey) {
                     synonyms.add(normalizedKey);
                 }
-            }
-            if (candidate.aliases) {
-                for (const alias of candidate.aliases) {
-                    const normalizedAlias = (0, maps_1.normalizeBodySiteKey)(alias);
-                    if (normalizedAlias) {
-                        synonyms.add(normalizedAlias);
+                if (candidate.aliases) {
+                    for (const alias of candidate.aliases) {
+                        const normalizedAlias = (0, maps_1.normalizeBodySiteKey)(alias);
+                        if (normalizedAlias) {
+                            synonyms.add(normalizedAlias);
+                        }
                     }
                 }
             }
@@ -2810,6 +2864,72 @@ function findPrnReasonSeparator(sourceText) {
     }
     return undefined;
 }
+function findTrailingPrnSiteSuffix(tokens, internal, options) {
+    var _a;
+    let suffixStart;
+    let hasSiteHint = false;
+    let hasConnector = false;
+    for (let i = tokens.length - 1; i >= 0; i--) {
+        const token = tokens[i];
+        const lower = normalizeTokenLower(token);
+        if (!lower) {
+            if (suffixStart !== undefined && token.original.trim()) {
+                break;
+            }
+            continue;
+        }
+        if (isBodySiteHint(lower, internal.customSiteHints)) {
+            hasSiteHint = true;
+            suffixStart = i;
+            continue;
+        }
+        if (suffixStart !== undefined) {
+            if (SITE_CONNECTORS.has(lower)) {
+                hasConnector = true;
+                suffixStart = i;
+                continue;
+            }
+            if (SITE_FILLER_WORDS.has(lower) || ROUTE_DESCRIPTOR_FILLER_WORDS.has(lower)) {
+                suffixStart = i;
+                continue;
+            }
+        }
+        if (suffixStart !== undefined) {
+            break;
+        }
+    }
+    if (!hasSiteHint || !hasConnector || suffixStart === undefined || suffixStart === 0) {
+        return undefined;
+    }
+    const suffixTokens = tokens.slice(suffixStart);
+    const siteWords = [];
+    for (const token of suffixTokens) {
+        const trimmed = token.original.trim();
+        if (!trimmed) {
+            continue;
+        }
+        const lower = normalizeTokenLower(token);
+        if (SITE_CONNECTORS.has(lower) ||
+            SITE_FILLER_WORDS.has(lower) ||
+            ROUTE_DESCRIPTOR_FILLER_WORDS.has(lower)) {
+            continue;
+        }
+        siteWords.push(trimmed);
+    }
+    if (!siteWords.length) {
+        return undefined;
+    }
+    const sitePhrase = siteWords.join(" ");
+    const canonical = (0, maps_1.normalizeBodySiteKey)(sitePhrase);
+    if (!canonical) {
+        return undefined;
+    }
+    const definition = (_a = lookupBodySiteDefinition(options === null || options === void 0 ? void 0 : options.siteCodeMap, canonical)) !== null && _a !== void 0 ? _a : maps_1.DEFAULT_BODY_SITE_SNOMED[canonical];
+    if (!definition) {
+        return undefined;
+    }
+    return suffixStart;
+}
 function lookupPrnReasonDefinition(map, canonical) {
     if (!map) {
         return undefined;

package/package.json

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