ezmedicationinput 0.1.31 → 0.1.33

package/dist/index.d.ts

@@ -6,6 +6,7 @@ export { nextDueDoses, calculateTotalUnits } from "./schedule";
 export { parseStrength, parseStrengthIntoRatio } from "./utils/strength";
 export { getRegisteredSigLocalizations, registerSigLocalization, resolveSigLocalization, resolveSigTranslation } from "./i18n";
 export type { SigLocalization, SigLocalizationConfig, SigTranslation, SigTranslationConfig } from "./i18n";
+export { DEFAULT_BODY_SITE_SNOMED, DEFAULT_BODY_SITE_SNOMED_SOURCE, DEFAULT_ROUTE_SYNONYMS, DEFAULT_UNIT_BY_ROUTE, KNOWN_DOSAGE_FORMS_TO_DOSE } from './maps';
 export declare function parseSig(input: string, options?: ParseOptions): ParseResult;
 export declare function lintSig(input: string, options?: ParseOptions): LintResult;
 export declare function parseSigAsync(input: string, options?: ParseOptions): Promise<ParseResult>;

package/dist/index.js

@@ -23,7 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveSigTranslation = exports.resolveSigLocalization = exports.registerSigLocalization = exports.getRegisteredSigLocalizations = exports.parseStrengthIntoRatio = exports.parseStrength = exports.calculateTotalUnits = exports.nextDueDoses = exports.suggestSig = exports.parseInternal = void 0;
+exports.KNOWN_DOSAGE_FORMS_TO_DOSE = exports.DEFAULT_UNIT_BY_ROUTE = exports.DEFAULT_ROUTE_SYNONYMS = exports.DEFAULT_BODY_SITE_SNOMED_SOURCE = exports.DEFAULT_BODY_SITE_SNOMED = exports.resolveSigTranslation = exports.resolveSigLocalization = exports.registerSigLocalization = exports.getRegisteredSigLocalizations = exports.parseStrengthIntoRatio = exports.parseStrength = exports.calculateTotalUnits = exports.nextDueDoses = exports.suggestSig = exports.parseInternal = void 0;
 exports.parseSig = parseSig;
 exports.lintSig = lintSig;
 exports.parseSigAsync = parseSigAsync;
@@ -49,6 +49,12 @@ Object.defineProperty(exports, "getRegisteredSigLocalizations", { enumerable: tr
 Object.defineProperty(exports, "registerSigLocalization", { enumerable: true, get: function () { return i18n_2.registerSigLocalization; } });
 Object.defineProperty(exports, "resolveSigLocalization", { enumerable: true, get: function () { return i18n_2.resolveSigLocalization; } });
 Object.defineProperty(exports, "resolveSigTranslation", { enumerable: true, get: function () { return i18n_2.resolveSigTranslation; } });
+var maps_1 = require("./maps");
+Object.defineProperty(exports, "DEFAULT_BODY_SITE_SNOMED", { enumerable: true, get: function () { return maps_1.DEFAULT_BODY_SITE_SNOMED; } });
+Object.defineProperty(exports, "DEFAULT_BODY_SITE_SNOMED_SOURCE", { enumerable: true, get: function () { return maps_1.DEFAULT_BODY_SITE_SNOMED_SOURCE; } });
+Object.defineProperty(exports, "DEFAULT_ROUTE_SYNONYMS", { enumerable: true, get: function () { return maps_1.DEFAULT_ROUTE_SYNONYMS; } });
+Object.defineProperty(exports, "DEFAULT_UNIT_BY_ROUTE", { enumerable: true, get: function () { return maps_1.DEFAULT_UNIT_BY_ROUTE; } });
+Object.defineProperty(exports, "KNOWN_DOSAGE_FORMS_TO_DOSE", { enumerable: true, get: function () { return maps_1.KNOWN_DOSAGE_FORMS_TO_DOSE; } });
 function parseSig(input, options) {
     const internal = (0, parser_1.parseInternal)(input, options);
     (0, parser_1.applyPrnReasonCoding)(internal, options);

package/dist/maps.d.ts

@@ -25,6 +25,10 @@ export declare const DEFAULT_ROUTE_SYNONYMS: Record<string, RouteSynonym>;
  * same logic to ensure consistent lookups.
  */
 export declare function normalizeBodySiteKey(value: string): string;
+export declare const DEFAULT_BODY_SITE_SNOMED_SOURCE: Array<{
+    names: string[];
+    definition: BodySiteDefinition;
+}>;
 export declare const DEFAULT_BODY_SITE_SNOMED: Record<string, BodySiteDefinition>;
 export declare const HOUSEHOLD_VOLUME_UNITS: readonly ["tsp", "tbsp"];
 export declare const DEFAULT_UNIT_SYNONYMS: Record<string, string>;

package/dist/maps.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_ADDITIONAL_INSTRUCTION_DEFINITIONS = exports.DEFAULT_ADDITIONAL_INSTRUCTION_ENTRIES = exports.DEFAULT_PRN_REASON_DEFINITIONS = exports.DEFAULT_PRN_REASON_ENTRIES = exports.DEFAULT_UNIT_BY_ROUTE = exports.DEFAULT_UNIT_BY_NORMALIZED_FORM = exports.KNOWN_TMT_DOSAGE_FORM_TO_SNOMED_ROUTE = exports.KNOWN_DOSAGE_FORMS_TO_DOSE = exports.WORD_FREQUENCIES = exports.DAY_OF_WEEK_TOKENS = exports.DISCOURAGED_TOKENS = exports.MEAL_KEYWORDS = exports.EVENT_TIMING_TOKENS = exports.TIMING_ABBREVIATIONS = exports.DEFAULT_UNIT_SYNONYMS = exports.HOUSEHOLD_VOLUME_UNITS = exports.DEFAULT_BODY_SITE_SNOMED = exports.DEFAULT_ROUTE_SYNONYMS = exports.ROUTE_BY_SNOMED = exports.ROUTE_TEXT = exports.ROUTE_SNOMED = void 0;
+exports.DEFAULT_ADDITIONAL_INSTRUCTION_DEFINITIONS = exports.DEFAULT_ADDITIONAL_INSTRUCTION_ENTRIES = exports.DEFAULT_PRN_REASON_DEFINITIONS = exports.DEFAULT_PRN_REASON_ENTRIES = exports.DEFAULT_UNIT_BY_ROUTE = exports.DEFAULT_UNIT_BY_NORMALIZED_FORM = exports.KNOWN_TMT_DOSAGE_FORM_TO_SNOMED_ROUTE = exports.KNOWN_DOSAGE_FORMS_TO_DOSE = exports.WORD_FREQUENCIES = exports.DAY_OF_WEEK_TOKENS = exports.DISCOURAGED_TOKENS = exports.MEAL_KEYWORDS = exports.EVENT_TIMING_TOKENS = exports.TIMING_ABBREVIATIONS = exports.DEFAULT_UNIT_SYNONYMS = exports.HOUSEHOLD_VOLUME_UNITS = exports.DEFAULT_BODY_SITE_SNOMED = exports.DEFAULT_BODY_SITE_SNOMED_SOURCE = exports.DEFAULT_ROUTE_SYNONYMS = exports.ROUTE_BY_SNOMED = exports.ROUTE_TEXT = exports.ROUTE_SNOMED = void 0;
 exports.normalizeBodySiteKey = normalizeBodySiteKey;
 exports.normalizePrnReasonKey = normalizePrnReasonKey;
 exports.normalizeAdditionalInstructionKey = normalizeAdditionalInstructionKey;
@@ -182,7 +182,7 @@ function normalizeBodySiteKey(value) {
         .replace(/\s+/g, " ")
         .trim();
 }
-const DEFAULT_BODY_SITE_SNOMED_SOURCE = [
+exports.DEFAULT_BODY_SITE_SNOMED_SOURCE = [
     {
         names: ["eye", "eyes"],
         definition: { coding: { code: "81745001", display: "Eye" } }
@@ -201,7 +201,7 @@ const DEFAULT_BODY_SITE_SNOMED_SOURCE = [
     },
     {
         names: ["both eyes", "bilateral eyes"],
-        definition: { coding: { code: "362508001", display: "Both eyes, entire" } }
+        definition: { coding: { code: "40638003", display: "Structure of both eyes" } }
     },
     {
         names: ["ear", "ears"],
@@ -447,7 +447,7 @@ const DEFAULT_BODY_SITE_SNOMED_SOURCE = [
         }
     }
 ];
-exports.DEFAULT_BODY_SITE_SNOMED = (0, object_1.objectFromEntries)(DEFAULT_BODY_SITE_SNOMED_SOURCE.reduce((entries, source) => {
+exports.DEFAULT_BODY_SITE_SNOMED = (0, object_1.objectFromEntries)(exports.DEFAULT_BODY_SITE_SNOMED_SOURCE.reduce((entries, source) => {
     const { names, definition } = source;
     for (const name of names) {
         const key = normalizeBodySiteKey(name);
@@ -701,6 +701,7 @@ exports.EVENT_TIMING_TOKENS = {
     hs: types_1.EventTiming["Before Sleep"],
     bedtime: types_1.EventTiming["Before Sleep"],
     bed: types_1.EventTiming["Before Sleep"],
+    sleep: types_1.EventTiming["Before Sleep"],
     wake: types_1.EventTiming.Wake,
     waking: types_1.EventTiming.Wake,
     stat: types_1.EventTiming.Immediate
@@ -1335,6 +1336,18 @@ const DEFAULT_PRN_REASON_SOURCE = [
             i18n: { th: "นอนหลับ" }
         }
     },
+    {
+        names: ["sleepiness", "sleepy", "drowsiness", "drowsy"],
+        definition: {
+            coding: {
+                system: SNOMED_SYSTEM,
+                code: "79519003",
+                display: "Drowsiness"
+            },
+            text: "Sleepiness",
+            i18n: { th: "ง่วงนอน" }
+        }
+    },
     {
         names: ["cough", "coughing"],
         definition: {

package/dist/parser.js

@@ -1499,10 +1499,14 @@ function applyWhenToken(internal, token, code) {
     addWhen(internal.when, code);
     mark(internal.consumed, token);
 }
-function isTimingAnchorOrPrefix(tokens, index) {
+function isTimingAnchorOrPrefix(tokens, index, prnReasonStart) {
     const token = tokens[index];
     if (!token)
         return false;
+    // Cautious handling of "sleep" in PRN zone
+    if (prnReasonStart !== undefined && index >= prnReasonStart && token.lower === "sleep") {
+        return false;
+    }
     const lower = token.lower;
     const nextToken = tokens[index + 1];
     const comboKey = nextToken ? `${lower} ${nextToken.lower}` : undefined;
@@ -1933,7 +1937,7 @@ function parseInternal(input, options) {
         }
         // 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)) {
+            if (isTimingAnchorOrPrefix(tokens, i + 1, prnReasonStart)) {
                 mark(internal.consumed, token);
                 continue;
             }
@@ -1977,8 +1981,15 @@ function parseInternal(input, options) {
         }
         const whenCode = maps_1.EVENT_TIMING_TOKENS[token.lower];
         if (whenCode) {
-            applyWhenToken(internal, token, whenCode);
-            continue;
+            // If we are in the PRN zone, be cautious about common reason words like "sleep"
+            // unless they were already handled by combo/anchor logic (which happens above).
+            if (prnReasonStart !== undefined && i >= prnReasonStart && token.lower === "sleep") {
+                // Leave for PRN reason
+            }
+            else {
+                applyWhenToken(internal, token, whenCode);
+                continue;
+            }
         }
         // Day of week
         const day = maps_1.DAY_OF_WEEK_TOKENS[token.lower];

package/package.json

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