ezmedicationinput 0.1.41 → 0.1.42

package/dist/context.d.ts

@@ -1,3 +1,4 @@
-import { MedicationContext } from "./types";
+import { MedicationContext, RouteCode } from "./types";
 export declare function normalizeDosageForm(form: string | undefined): string | undefined;
 export declare function inferUnitFromContext(ctx: MedicationContext | undefined): string | undefined;
+export declare function inferRouteFromContext(ctx: MedicationContext | undefined): RouteCode | undefined;

package/dist/context.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeDosageForm = normalizeDosageForm;
 exports.inferUnitFromContext = inferUnitFromContext;
+exports.inferRouteFromContext = inferRouteFromContext;
 const maps_1 = require("./maps");
 function normalizeDosageForm(form) {
     var _a;
@@ -32,3 +33,18 @@ function inferUnitFromContext(ctx) {
     }
     return undefined;
 }
+function inferRouteFromContext(ctx) {
+    var _a;
+    if (!(ctx === null || ctx === void 0 ? void 0 : ctx.dosageForm)) {
+        return undefined;
+    }
+    const normalized = normalizeDosageForm(ctx.dosageForm);
+    if (!normalized) {
+        return undefined;
+    }
+    const snomed = maps_1.KNOWN_TMT_DOSAGE_FORM_TO_SNOMED_ROUTE[normalized];
+    if (!snomed) {
+        return (_a = maps_1.DEFAULT_ROUTE_SYNONYMS[normalized]) === null || _a === void 0 ? void 0 : _a.code;
+    }
+    return maps_1.ROUTE_BY_SNOMED[snomed];
+}

package/dist/i18n.js

@@ -231,7 +231,6 @@ const THAI_ROUTE_GRAMMAR = {
     [types_1.RouteCode["Buccal route"]]: { verb: "อมกระพุ้งแก้ม", routePhrase: "ที่กระพุ้งแก้ม" },
     [types_1.RouteCode["Respiratory tract route (qualifier value)"]]: {
         verb: "สูด",
-        routePhrase: ({ hasSite }) => (hasSite ? undefined : "โดยการสูดดม"),
         sitePreposition: "ที่"
     },
     [types_1.RouteCode["Nasal route"]]: {
@@ -291,12 +290,18 @@ const THAI_ROUTE_GRAMMAR = {
     }
 };
 function resolveRouteGrammarThai(internal) {
-    var _a;
+    var _a, _b, _c;
     if (internal.routeCode && THAI_ROUTE_GRAMMAR[internal.routeCode]) {
         return (_a = THAI_ROUTE_GRAMMAR[internal.routeCode]) !== null && _a !== void 0 ? _a : DEFAULT_THAI_ROUTE_GRAMMAR;
     }
     const grammar = grammarFromRouteTextThai(internal.routeText);
-    return grammar !== null && grammar !== void 0 ? grammar : DEFAULT_THAI_ROUTE_GRAMMAR;
+    if (grammar) {
+        return grammar;
+    }
+    if (((_b = internal.unit) === null || _b === void 0 ? void 0 : _b.trim().toLowerCase()) === "puff") {
+        return (_c = THAI_ROUTE_GRAMMAR[types_1.RouteCode["Respiratory tract route (qualifier value)"]]) !== null && _c !== void 0 ? _c : DEFAULT_THAI_ROUTE_GRAMMAR;
+    }
+    return DEFAULT_THAI_ROUTE_GRAMMAR;
 }
 function grammarFromRouteTextThai(text) {
     if (!text)
@@ -606,7 +611,7 @@ function buildRoutePhraseThai(internal, grammar, hasSite) {
         return "ทางจมูก";
     }
     if (normalized.includes("inhal")) {
-        return "โดยการสูดดม";
+        return undefined;
     }
     return text;
 }

package/dist/parser.js

@@ -336,6 +336,7 @@ const EYE_SITE_TOKENS = {
 };
 const OPHTHALMIC_ROUTE_CODES = new Set([
     types_1.RouteCode["Ophthalmic route"],
+    types_1.RouteCode["Ocular route (qualifier value)"],
     types_1.RouteCode["Intravitreal route (qualifier value)"]
 ]);
 const OPHTHALMIC_CONTEXT_TOKENS = new Set([
@@ -538,9 +539,13 @@ function shouldTreatEyeTokenAsSite(internal, tokens, index, context) {
     const currentToken = tokens[index];
     const normalizedSelf = normalizeTokenLower(currentToken);
     const eyeMeta = EYE_SITE_TOKENS[normalizedSelf];
+    const contextRoute = (0, context_1.inferRouteFromContext)(context !== null && context !== void 0 ? context : undefined);
     if (internal.routeCode && !OPHTHALMIC_ROUTE_CODES.has(internal.routeCode)) {
         return false;
     }
+    if (contextRoute && !OPHTHALMIC_ROUTE_CODES.has(contextRoute)) {
+        return false;
+    }
     if (internal.siteText) {
         return false;
     }
@@ -548,7 +553,9 @@ function shouldTreatEyeTokenAsSite(internal, tokens, index, context) {
         return false;
     }
     const dosageForm = (_a = context === null || context === void 0 ? void 0 : context.dosageForm) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-    const contextImpliesOphthalmic = Boolean(dosageForm && /(eye|ophth|ocular|intravit)/i.test(dosageForm));
+    const contextImpliesOphthalmic = contextRoute
+        ? OPHTHALMIC_ROUTE_CODES.has(contextRoute)
+        : Boolean(dosageForm && /(eye|ophth|ocular|intravit)/i.test(dosageForm));
     const eyeRouteImpliesOphthalmic = (eyeMeta === null || eyeMeta === void 0 ? void 0 : eyeMeta.route) === types_1.RouteCode["Intravitreal route (qualifier value)"];
     const ophthalmicContext = hasOphthalmicContextHint(tokens, index) ||
         (internal.routeCode !== undefined && OPHTHALMIC_ROUTE_CODES.has(internal.routeCode)) ||

package/dist/utils/enum.d.ts

@@ -0,0 +1,2 @@
+export declare function enumEntries<T extends Record<string, string | number>>(enumeration: T): Array<[keyof T, T[keyof T]]>;
+export declare function enumValues<T extends Record<string, string | number>>(enumeration: T): Array<T[keyof T]>;

package/dist/utils/enum.js

@@ -0,0 +1,7 @@
+import { objectEntries, objectValues } from "./object";
+export function enumEntries(enumeration) {
+    return objectEntries(enumeration);
+}
+export function enumValues(enumeration) {
+    return objectValues(enumeration);
+}

package/package.json

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