ezmedicationinput 0.1.28 → 0.1.30

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/i18n.js

@@ -116,16 +116,6 @@ const WHEN_TEXT_THAI = {
     [types_1.EventTiming["After Sleep"]]: "หลังจากนอน",
     [types_1.EventTiming.Immediate]: "ทันที"
 };
-const INSTRUCTION_TEXT_THAI = {
-    "Take with or after food": "รับประทานพร้อมหรือหลังอาหาร",
-    "With or after food": "พร้อมหรือหลังอาหาร",
-    "Take before food": "รับประทานก่อนอาหาร",
-    "Take on an empty stomach": "รับประทานขณะท้องว่าง",
-    "Take with plenty of water": "รับประทานพร้อมน้ำดื่มจำนวนมาก",
-    "Dissolve or mix with water before taking": "ละลายหรือผสมน้ำก่อนรับประทาน",
-    "Avoid alcoholic drinks": "หลีกเลี่ยงเครื่องดื่มแอลกอฮอล์",
-    "May cause drowsiness; do not drive if affected": "อาจทำให้ง่วงซึม; ห้ามขับขี่ยานพาหนะหรือทำงานกับเครื่องจักรหากมีอาการ",
-};
 const DAY_NAMES_THAI = {
     mon: "วันจันทร์",
     tue: "วันอังคาร",
@@ -635,11 +625,13 @@ function describeDayOfWeekThai(internal) {
     return `ใน${joinWithAndThai(days)}`;
 }
 function formatAsNeededThai(internal) {
+    var _a, _b;
     if (!internal.asNeeded) {
         return undefined;
     }
     if (internal.asNeededReason) {
-        return `ใช้เมื่อจำเป็นสำหรับ ${internal.asNeededReason}`;
+        const translation = (_b = (_a = internal.asNeededReasonCoding) === null || _a === void 0 ? void 0 : _a.i18n) === null || _b === void 0 ? void 0 : _b.th;
+        return `ใช้เมื่อจำเป็นสำหรับ ${translation || internal.asNeededReason}`;
     }
     return "ใช้เมื่อจำเป็น";
 }
@@ -770,12 +762,14 @@ function formatAdditionalInstructionsThai(internal) {
     }
     const phrases = internal.additionalInstructions
         .map((instruction) => {
-        var _a;
-        const original = instruction.text || ((_a = instruction.coding) === null || _a === void 0 ? void 0 : _a.display);
+        var _a, _b, _c;
+        const translation = (_b = (_a = instruction.coding) === null || _a === void 0 ? void 0 : _a.i18n) === null || _b === void 0 ? void 0 : _b.th;
+        if (translation)
+            return translation;
+        const original = instruction.text || ((_c = instruction.coding) === null || _c === void 0 ? void 0 : _c.display);
         if (!original)
             return undefined;
-        const normalized = original.trim();
-        return INSTRUCTION_TEXT_THAI[normalized] || normalized;
+        return original.trim();
     })
         .filter((text) => Boolean(text))
         .map((text) => text.trim())

package/dist/internal-types.d.ts

@@ -36,12 +36,16 @@ export interface ParsedSigInternal {
     timingCode?: string;
     asNeeded?: boolean;
     asNeededReason?: string;
-    asNeededReasonCoding?: FhirCoding;
+    asNeededReasonCoding?: FhirCoding & {
+        i18n?: Record<string, string>;
+    };
     warnings: string[];
     siteText?: string;
     siteSource?: "abbreviation" | "text";
     siteTokenIndices: Set<number>;
-    siteCoding?: FhirCoding;
+    siteCoding?: FhirCoding & {
+        i18n?: Record<string, string>;
+    };
     siteLookupRequest?: SiteCodeLookupRequest;
     siteLookups: SiteLookupDetail[];
     customSiteHints?: Set<string>;
@@ -49,6 +53,8 @@ export interface ParsedSigInternal {
     prnReasonLookups: PrnReasonLookupDetail[];
     additionalInstructions: Array<{
         text?: string;
-        coding?: FhirCoding;
+        coding?: FhirCoding & {
+            i18n?: Record<string, string>;
+        };
     }>;
 }

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";
@@ -1288,14 +1290,16 @@ const DEFAULT_PRN_REASON_SOURCE = [
         names: ["pain", "ache", "aches", "pains"],
         definition: {
             coding: { system: SNOMED_SYSTEM, code: "22253000", display: "Pain" },
-            text: "Pain"
+            text: "Pain",
+            i18n: { th: "ปวด" }
         }
     },
     {
         names: ["nausea", "queasiness", "vomiting", "n/v", "nausea and vomiting"],
         definition: {
             coding: { system: SNOMED_SYSTEM, code: "422587007", display: "Nausea" },
-            text: "Nausea"
+            text: "Nausea",
+            i18n: { th: "คลื่นไส้" }
         }
     },
     {
@@ -1306,14 +1310,16 @@ const DEFAULT_PRN_REASON_SOURCE = [
                 code: "418363000",
                 display: "Itching of skin"
             },
-            text: "Itching"
+            text: "Itching",
+            i18n: { th: "คัน" }
         }
     },
     {
         names: ["anxiety", "nervousness"],
         definition: {
             coding: { system: SNOMED_SYSTEM, code: "48694002", display: "Anxiety" },
-            text: "Anxiety"
+            text: "Anxiety",
+            i18n: { th: "วิตกกังวล" }
         }
     },
     {
@@ -1324,28 +1330,32 @@ const DEFAULT_PRN_REASON_SOURCE = [
                 code: "193462001",
                 display: "Insomnia"
             },
-            text: "Sleep"
+            text: "Sleep",
+            i18n: { th: "นอนหลับ" }
         }
     },
     {
         names: ["cough", "coughing"],
         definition: {
             coding: { system: SNOMED_SYSTEM, code: "49727002", display: "Cough" },
-            text: "Cough"
+            text: "Cough",
+            i18n: { th: "ไอ" }
         }
     },
     {
         names: ["fever", "temperature", "pyrexia"],
         definition: {
             coding: { system: SNOMED_SYSTEM, code: "386661006", display: "Fever" },
-            text: "Fever"
+            text: "Fever",
+            i18n: { th: "ไข้" }
         }
     },
     {
         names: ["spasm", "spasms", "muscle spasm"],
         definition: {
             coding: { system: SNOMED_SYSTEM, code: "45352006", display: "Spasm" },
-            text: "Spasm"
+            text: "Spasm",
+            i18n: { th: "ตะคริวหรือเกร็ง" }
         }
     },
     {
@@ -1356,7 +1366,8 @@ const DEFAULT_PRN_REASON_SOURCE = [
                 code: "14760008",
                 display: "Constipation"
             },
-            text: "Constipation"
+            text: "Constipation",
+            i18n: { th: "ท้องผูก" }
         }
     },
     {
@@ -1367,7 +1378,8 @@ const DEFAULT_PRN_REASON_SOURCE = [
                 code: "257553007",
                 display: "Irritation"
             },
-            text: "Irritation"
+            text: "Irritation",
+            i18n: { th: "ระคายเคือง" }
         }
     },
     {
@@ -1378,7 +1390,8 @@ const DEFAULT_PRN_REASON_SOURCE = [
                 code: "267036007",
                 display: "Dyspnea"
             },
-            text: "Shortness of breath"
+            text: "Shortness of breath",
+            i18n: { th: "เหนื่อยหรือหายใจลำบาก" }
         }
     }
 ];
@@ -1419,7 +1432,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "311504000",
                 display: "With or after food"
             },
-            text: "Take with or after food"
+            text: "Take with or after food",
+            i18n: { th: "รับประทานพร้อมหรือหลังอาหาร" }
         }
     },
     {
@@ -1430,7 +1444,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "311501008",
                 display: "Half to one hour before food"
             },
-            text: "Take before food"
+            text: "Take before food",
+            i18n: { th: "รับประทานก่อนอาหาร" }
         }
     },
     {
@@ -1441,7 +1456,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "717154004",
                 display: "Take on an empty stomach (qualifier value)"
             },
-            text: "Take on an empty stomach"
+            text: "Take on an empty stomach",
+            i18n: { th: "รับประทานขณะท้องว่าง" }
         }
     },
     {
@@ -1452,7 +1468,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "419303009",
                 display: "With plenty of water"
             },
-            text: "Take with plenty of water"
+            text: "Take with plenty of water",
+            i18n: { th: "รับประทานพร้อมน้ำดื่มจำนวนมาก" }
         }
     },
     {
@@ -1463,7 +1480,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "417995008",
                 display: "Dissolve or mix with water before taking"
             },
-            text: "Dissolve or mix with water before taking"
+            text: "Dissolve or mix with water before taking",
+            i18n: { th: "ละลายหรือผสมน้ำก่อนรับประทาน" }
         }
     },
     {
@@ -1474,7 +1492,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "419822006",
                 display: "Warning. Avoid alcoholic drink (qualifier value)"
             },
-            text: "Avoid alcoholic drinks"
+            text: "Avoid alcoholic drinks",
+            i18n: { th: "หลีกเลี่ยงเครื่องดื่มแอลกอฮอล์" }
         }
     },
     {
@@ -1485,7 +1504,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "418954008",
                 display: "Warning. May cause drowsiness. If affected do not drive or operate machinery (qualifier value)"
             },
-            text: "May cause drowsiness; do not drive if affected"
+            text: "May cause drowsiness; do not drive if affected",
+            i18n: { th: "อาจทำให้ง่วงซึม; ห้ามขับขี่ยานพาหนะหรือทำงานกับเครื่องจักรหากมีอาการ" }
         }
     },
     {
@@ -1506,7 +1526,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "418914006",
                 display: "Warning. May cause drowsiness. If affected do not drive or operate machinery. Avoid alcoholic drink (qualifier value)"
             },
-            text: "May cause drowsiness; avoid driving or alcohol"
+            text: "May cause drowsiness; avoid driving or alcohol",
+            i18n: { th: "อาจทำให้ง่วงซึม; หลีกเลี่ยงการขับขี่ยานพาหนะหรือดื่มแอลกอฮอล์" }
         }
     },
     {
@@ -1523,7 +1544,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "418071006",
                 display: "Warning. Causes drowsiness which may continue the next day. If affected do not drive or operate machinery. Avoid alcoholic drink (qualifier value)"
             },
-            text: "May cause next-day drowsiness; avoid driving or alcohol"
+            text: "May cause next-day drowsiness; avoid driving or alcohol",
+            i18n: { th: "อาจทำให้ง่วงซึมในวันถัดมา; หลีกเลี่ยงการขับขี่ยานพาหนะหรือดื่มแอลกอฮอล์" }
         }
     },
     {
@@ -1534,7 +1556,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "418521000",
                 display: "Avoid exposure of skin to direct sunlight or sun lamps (qualifier value)"
             },
-            text: "Avoid sunlight or sun lamps"
+            text: "Avoid sunlight or sun lamps",
+            i18n: { th: "หลีกเลี่ยงแสงแดดหรือหลอดไฟแสงยูวี" }
         }
     },
     {
@@ -1545,7 +1568,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "418693002",
                 display: "Swallowed whole, not chewed (qualifier value)"
             },
-            text: "Swallow whole; do not crush or chew"
+            text: "Swallow whole; do not crush or chew",
+            i18n: { th: "กลืนทั้งเม็ด; ห้ามเคี้ยวหรือบด" }
         }
     },
     {
@@ -1556,7 +1580,8 @@ const DEFAULT_ADDITIONAL_INSTRUCTION_SOURCE = [
                 code: "418991002",
                 display: "Sucked or chewed (qualifier value)"
             },
-            text: "Suck or chew before swallowing"
+            text: "Suck or chew before swallowing",
+            i18n: { th: "เคี้ยวหรืออมให้ละลายก่อนกลืน" }
         }
     }
 ];
@@ -1588,3 +1613,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

@@ -3126,7 +3126,7 @@ function collectAdditionalInstructions(internal, tokens) {
             if (/\s/.test(ch)) {
                 continue;
             }
-            if (/-|;|:|\.|,/.test(ch)) {
+            if (/-|;|:|\.|\,/.test(ch)) {
                 separatorDetected = true;
             }
             break;
@@ -3135,9 +3135,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 +3143,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 = [];
@@ -3168,7 +3177,8 @@ function collectAdditionalInstructions(internal, tokens) {
                     ? {
                         code: definition.coding.code,
                         display: definition.coding.display,
-                        system: (_f = definition.coding.system) !== null && _f !== void 0 ? _f : SNOMED_SYSTEM
+                        system: (_f = definition.coding.system) !== null && _f !== void 0 ? _f : SNOMED_SYSTEM,
+                        i18n: definition.i18n
                     }
                     : undefined
             });
@@ -3398,7 +3408,8 @@ function applyPrnReasonDefinition(internal, definition) {
         ? {
             code: coding.code,
             display: coding.display,
-            system: (_a = coding.system) !== null && _a !== void 0 ? _a : SNOMED_SYSTEM
+            system: (_a = coding.system) !== null && _a !== void 0 ? _a : SNOMED_SYSTEM,
+            i18n: definition.i18n
         }
         : undefined;
     if (definition.text && !internal.asNeededReason) {

package/dist/types.d.ts

@@ -316,6 +316,8 @@ export interface CodeableConceptDefinition {
     coding?: FhirCoding;
     text?: string;
     aliases?: string[];
+    /** Optional translations for different locales (e.g., { "th": "ปวด" }) */
+    i18n?: Record<string, string>;
 }
 export interface PrnReasonDefinition extends CodeableConceptDefinition {
 }

package/package.json

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