ezmedicationinput 0.1.29 → 0.1.31

package/dist/fhir.js

@@ -162,7 +162,7 @@ function toFhir(internal) {
     return dosage;
 }
 function internalFromFhir(dosage) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14;
     const internal = {
         input: (_a = dosage.text) !== null && _a !== void 0 ? _a : "",
         tokens: [],
@@ -212,34 +212,41 @@ function internalFromFhir(dosage) {
     }
     const reasonCoding = (_9 = (_8 = (_7 = dosage.asNeededFor) === null || _7 === void 0 ? void 0 : _7[0]) === null || _8 === void 0 ? void 0 : _8.coding) === null || _9 === void 0 ? void 0 : _9[0];
     if (reasonCoding === null || reasonCoding === void 0 ? void 0 : reasonCoding.code) {
+        const defaultDef = (0, maps_1.findPrnReasonDefinitionByCoding)((_10 = reasonCoding.system) !== null && _10 !== void 0 ? _10 : SNOMED_SYSTEM, reasonCoding.code);
         internal.asNeededReasonCoding = {
             code: reasonCoding.code,
             display: reasonCoding.display,
-            system: reasonCoding.system
+            system: reasonCoding.system,
+            i18n: defaultDef === null || defaultDef === void 0 ? void 0 : defaultDef.i18n
         };
     }
-    if ((_10 = dosage.additionalInstruction) === null || _10 === void 0 ? void 0 : _10.length) {
+    if ((_11 = dosage.additionalInstruction) === null || _11 === void 0 ? void 0 : _11.length) {
         internal.additionalInstructions = dosage.additionalInstruction.map((concept) => {
-            var _a;
-            return ({
+            var _a, _b;
+            const coding = (_a = concept.coding) === null || _a === void 0 ? void 0 : _a[0];
+            const defaultDef = (coding === null || coding === void 0 ? void 0 : coding.code)
+                ? (0, maps_1.findAdditionalInstructionDefinitionByCoding)((_b = coding.system) !== null && _b !== void 0 ? _b : SNOMED_SYSTEM, coding.code)
+                : undefined;
+            return {
                 text: concept.text,
-                coding: ((_a = concept.coding) === null || _a === void 0 ? void 0 : _a[0])
+                coding: (coding === null || coding === void 0 ? void 0 : coding.code)
                     ? {
-                        code: concept.coding[0].code,
-                        display: concept.coding[0].display,
-                        system: concept.coding[0].system
+                        code: coding.code,
+                        display: coding.display,
+                        system: coding.system,
+                        i18n: defaultDef === null || defaultDef === void 0 ? void 0 : defaultDef.i18n
                     }
                     : undefined
-            });
+            };
         });
     }
-    const doseAndRate = (_11 = dosage.doseAndRate) === null || _11 === void 0 ? void 0 : _11[0];
+    const doseAndRate = (_12 = dosage.doseAndRate) === null || _12 === void 0 ? void 0 : _12[0];
     if (doseAndRate === null || doseAndRate === void 0 ? void 0 : doseAndRate.doseRange) {
         const { low, high } = doseAndRate.doseRange;
         if ((low === null || low === void 0 ? void 0 : low.value) !== undefined && (high === null || high === void 0 ? void 0 : high.value) !== undefined) {
             internal.doseRange = { low: low.value, high: high.value };
         }
-        internal.unit = (_13 = (_12 = low === null || low === void 0 ? void 0 : low.unit) !== null && _12 !== void 0 ? _12 : high === null || high === void 0 ? void 0 : high.unit) !== null && _13 !== void 0 ? _13 : internal.unit;
+        internal.unit = (_14 = (_13 = low === null || low === void 0 ? void 0 : low.unit) !== null && _13 !== void 0 ? _13 : high === null || high === void 0 ? void 0 : high.unit) !== null && _14 !== void 0 ? _14 : internal.unit;
     }
     else if (doseAndRate === null || doseAndRate === void 0 ? void 0 : doseAndRate.doseQuantity) {
         const dose = doseAndRate.doseQuantity;

package/dist/maps.d.ts

@@ -74,3 +74,11 @@ export interface AdditionalInstructionDictionaryEntry {
 }
 export declare const DEFAULT_ADDITIONAL_INSTRUCTION_ENTRIES: AdditionalInstructionDictionaryEntry[];
 export declare const DEFAULT_ADDITIONAL_INSTRUCTION_DEFINITIONS: Record<string, AdditionalInstructionDefinition>;
+/**
+ * Finds a default PRN reason definition by its SNOMED coding.
+ */
+export declare function findPrnReasonDefinitionByCoding(system: string, code: string): PrnReasonDefinition | undefined;
+/**
+ * Finds a default additional instruction definition by its SNOMED coding.
+ */
+export declare function findAdditionalInstructionDefinitionByCoding(system: string, code: string): AdditionalInstructionDefinition | undefined;

package/dist/maps.js

@@ -4,6 +4,8 @@ exports.DEFAULT_ADDITIONAL_INSTRUCTION_DEFINITIONS = exports.DEFAULT_ADDITIONAL_
 exports.normalizeBodySiteKey = normalizeBodySiteKey;
 exports.normalizePrnReasonKey = normalizePrnReasonKey;
 exports.normalizeAdditionalInstructionKey = normalizeAdditionalInstructionKey;
+exports.findPrnReasonDefinitionByCoding = findPrnReasonDefinitionByCoding;
+exports.findAdditionalInstructionDefinitionByCoding = findAdditionalInstructionDefinitionByCoding;
 const types_1 = require("./types");
 const object_1 = require("./utils/object");
 const SNOMED_SYSTEM = "http://snomed.info/sct";
@@ -698,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
@@ -1611,3 +1614,17 @@ exports.DEFAULT_ADDITIONAL_INSTRUCTION_DEFINITIONS = (0, object_1.objectFromEntr
     }
     return entries;
 }, []));
+/**
+ * Finds a default PRN reason definition by its SNOMED coding.
+ */
+function findPrnReasonDefinitionByCoding(system, code) {
+    var _a;
+    return (_a = DEFAULT_PRN_REASON_SOURCE.find((source) => { var _a, _b; return ((_a = source.definition.coding) === null || _a === void 0 ? void 0 : _a.system) === system && ((_b = source.definition.coding) === null || _b === void 0 ? void 0 : _b.code) === code; })) === null || _a === void 0 ? void 0 : _a.definition;
+}
+/**
+ * Finds a default additional instruction definition by its SNOMED coding.
+ */
+function findAdditionalInstructionDefinitionByCoding(system, code) {
+    var _a;
+    return (_a = DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE.find((source) => { var _a, _b; return ((_a = source.definition.coding) === null || _a === void 0 ? void 0 : _a.system) === system && ((_b = source.definition.coding) === null || _b === void 0 ? void 0 : _b.code) === code; })) === null || _a === void 0 ? void 0 : _a.definition;
+}

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);
@@ -3126,7 +3128,7 @@ function collectAdditionalInstructions(internal, tokens) {
             if (/\s/.test(ch)) {
                 continue;
             }
-            if (/-|;|:|\.|,/.test(ch)) {
+            if (/-|;|:|\.|\,/.test(ch)) {
                 separatorDetected = true;
             }
             break;
@@ -3135,9 +3137,6 @@ function collectAdditionalInstructions(internal, tokens) {
     const sourceText = range
         ? internal.input.slice(range.start, range.end)
         : joined;
-    if (!separatorDetected && !/[-;:.]/.test(sourceText)) {
-        return;
-    }
     const normalized = sourceText
         .replace(/\s*[-:]+\s*/g, "; ")
         .replace(/\s*(?:\r?\n)+\s*/g, "; ")
@@ -3146,6 +3145,18 @@ function collectAdditionalInstructions(internal, tokens) {
         .split(/(?:;|\.)/)
         .map((segment) => segment.trim())
         .filter((segment) => segment.length > 0);
+    // If no punctuation was detected, we only collect if at least one segment matches a known definition.
+    // This avoids capturing random trailing text as instructions unless it's codified.
+    if (!separatorDetected && !/[-;:.]/.test(sourceText)) {
+        const hasKnownDefinition = segments.some((phrase) => {
+            const canonical = (0, maps_1.normalizeAdditionalInstructionKey)(phrase);
+            return (maps_1.DEFAULT_ADDITIONAL_INSTRUCTION_DEFINITIONS[canonical] ||
+                findAdditionalInstructionDefinition(phrase, canonical));
+        });
+        if (!hasKnownDefinition) {
+            return;
+        }
+    }
     const phrases = segments.length ? segments : [joined];
     const seen = new Set();
     const instructions = [];
@@ -3174,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.29",
+  "version": "0.1.31",
   "description": "Parse concise medication sigs into FHIR R5 Dosage JSON",
   "type": "module",
   "main": "dist/index.js",