ezmedicationinput 0.1.36 → 0.1.38

package/README.md

@@ -346,6 +346,10 @@ You can specify the number of times (total count) the medication is supposed to
   combinations (e.g. `1x3` → breakfast/lunch/dinner). This also respects
   `context.mealRelation` when provided and only applies to schedules with four
   or fewer daily doses.
+- `enableMealDashSyntax`: when `true`, enables shorthand meal-dose patterns
+  such as `1-0-1`, `1-0-1 pc`, `10-12-0 ac`, and `1-0-0-1 ac`. The parser
+  expands them into multiple dosage clauses aligned to breakfast/lunch/dinner
+  (plus bedtime for a 4th slot).
 - `twoPerDayPair`: controls whether 2× AC/PC/C doses expand to breakfast+dinner (default) or breakfast+lunch.
 - `assumeSingleDiscreteDose`: when `true`, missing discrete doses (such as
   tablets or capsules) default to a single unit when the parser can infer a

package/dist/i18n.js

@@ -551,8 +551,25 @@ function combineFrequencyAndEventsThai(frequency, events) {
     }
     return { frequency, event: joinWithAndThai(events) };
 }
+function isOralRouteThai(internal) {
+    var _a;
+    if (internal.routeCode === types_1.RouteCode["Oral route"]) {
+        return true;
+    }
+    const text = (_a = internal.routeText) === null || _a === void 0 ? void 0 : _a.trim().toLowerCase();
+    if (!text) {
+        return false;
+    }
+    return (text === "po" ||
+        text === "oral" ||
+        text.includes("mouth") ||
+        text.includes("per os"));
+}
 function buildRoutePhraseThai(internal, grammar, hasSite) {
     var _a;
+    if (grammar.verb === "รับประทาน" && isOralRouteThai(internal)) {
+        return undefined;
+    }
     if (typeof grammar.routePhrase === "function") {
         return grammar.routePhrase({ hasSite, internal });
     }

package/dist/index.js

@@ -58,6 +58,96 @@ Object.defineProperty(exports, "DEFAULT_BODY_SITE_SNOMED_SOURCE", { enumerable:
 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 parseMealDashValues(token) {
+    if (!/^[0-9]+(?:\.[0-9]+)?(?:-[0-9]+(?:\.[0-9]+)?){2,3}$/.test(token)) {
+        return undefined;
+    }
+    const values = token.split("-").map((part) => Number(part));
+    if (values.length !== 3 && values.length !== 4) {
+        return undefined;
+    }
+    if (!values.every((value) => Number.isFinite(value) && value >= 0)) {
+        return undefined;
+    }
+    return values;
+}
+function mealDashEvents(length, relation) {
+    const base = relation === "ac"
+        ? ["ACM", "ACD", "ACV"]
+        : relation === "pc"
+            ? ["PCM", "PCD", "PCV"]
+            : ["CM", "CD", "CV"];
+    if (length === 4) {
+        return [...base, "HS"];
+    }
+    return base;
+}
+function formatMealDashAmount(value) {
+    if (Number.isInteger(value)) {
+        return String(value);
+    }
+    return String(value).replace(/\.0+$/, "").replace(/(\.\d*?)0+$/, "$1");
+}
+function expandMealDashSegment(segment) {
+    const tokens = (0, parser_1.tokenize)(segment.text);
+    if (tokens.length === 0) {
+        return [segment];
+    }
+    const firstToken = tokens[0];
+    const values = parseMealDashValues(firstToken.lower);
+    if (!values) {
+        return [segment];
+    }
+    let relation = "meal";
+    let relationIndex = -1;
+    for (let i = 1; i < tokens.length; i += 1) {
+        const lower = tokens[i].lower.replace(/[.,;:]/g, "");
+        if (lower === "ac") {
+            relation = "ac";
+            relationIndex = i;
+            break;
+        }
+        if (lower === "pc") {
+            relation = "pc";
+            relationIndex = i;
+            break;
+        }
+    }
+    const suffixTokens = tokens
+        .filter((token, index) => index !== 0 && index !== relationIndex)
+        .map((token) => token.original);
+    const events = mealDashEvents(values.length, relation);
+    const expanded = values
+        .map((value, index) => ({ value, event: events[index] }))
+        .filter(({ value }) => value > 0)
+        .map(({ value, event }) => {
+        const text = [formatMealDashAmount(value), ...suffixTokens, event]
+            .filter((part) => part && part.trim().length > 0)
+            .join(" ")
+            .replace(/\s+/g, " ")
+            .trim();
+        return {
+            text,
+            start: segment.start,
+            end: segment.end
+        };
+    })
+        .filter((item) => item.text.length > 0);
+    if (expanded.length === 0) {
+        return [segment];
+    }
+    return expanded;
+}
+function expandMealDashSegments(segments, options) {
+    if (!(options === null || options === void 0 ? void 0 : options.enableMealDashSyntax)) {
+        return segments;
+    }
+    const expanded = [];
+    for (const segment of segments) {
+        expanded.push(...expandMealDashSegment(segment));
+    }
+    return expanded;
+}
 function toSegmentMeta(segments) {
     return segments.map((segment, index) => ({
         index,
@@ -66,7 +156,7 @@ function toSegmentMeta(segments) {
     }));
 }
 function parseSig(input, options) {
-    const segments = (0, segment_1.splitSigSegments)(input);
+    const segments = expandMealDashSegments((0, segment_1.splitSigSegments)(input), options);
     const carry = {};
     const results = [];
     for (const segment of segments) {
@@ -92,7 +182,7 @@ function parseSig(input, options) {
     };
 }
 function lintSig(input, options) {
-    const segments = (0, segment_1.splitSigSegments)(input);
+    const segments = expandMealDashSegments((0, segment_1.splitSigSegments)(input), options);
     const carry = {};
     const results = [];
     for (const segment of segments) {
@@ -132,7 +222,7 @@ function lintSig(input, options) {
 }
 function parseSigAsync(input, options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const segments = (0, segment_1.splitSigSegments)(input);
+        const segments = expandMealDashSegments((0, segment_1.splitSigSegments)(input), options);
         const carry = {};
         const results = [];
         for (const segment of segments) {

package/dist/schedule.js

@@ -419,6 +419,69 @@ function expandWhenCodes(whenCodes, config, repeat) {
         return a.time.localeCompare(b.time);
     });
 }
+const DEFAULT_WHEN_FALLBACK_CLOCKS = {
+    [types_1.EventTiming.Wake]: ["06:00:00"],
+    [types_1.EventTiming["Early Morning"]]: ["06:00:00"],
+    [types_1.EventTiming.Morning]: ["08:00:00"],
+    [types_1.EventTiming["Late Morning"]]: ["10:00:00"],
+    [types_1.EventTiming.Breakfast]: ["08:00:00"],
+    [types_1.EventTiming["Before Breakfast"]]: ["07:30:00"],
+    [types_1.EventTiming["After Breakfast"]]: ["08:30:00"],
+    [types_1.EventTiming.Noon]: ["12:00:00"],
+    [types_1.EventTiming.Lunch]: ["12:30:00"],
+    [types_1.EventTiming["Before Lunch"]]: ["12:00:00"],
+    [types_1.EventTiming["After Lunch"]]: ["13:00:00"],
+    [types_1.EventTiming["Early Afternoon"]]: ["14:00:00"],
+    [types_1.EventTiming.Afternoon]: ["15:00:00"],
+    [types_1.EventTiming["Late Afternoon"]]: ["16:00:00"],
+    [types_1.EventTiming["Early Evening"]]: ["18:00:00"],
+    [types_1.EventTiming.Evening]: ["19:00:00"],
+    [types_1.EventTiming["Late Evening"]]: ["20:00:00"],
+    [types_1.EventTiming.Dinner]: ["18:30:00"],
+    [types_1.EventTiming["Before Dinner"]]: ["18:00:00"],
+    [types_1.EventTiming["After Dinner"]]: ["19:00:00"],
+    [types_1.EventTiming.Night]: ["21:00:00"],
+    [types_1.EventTiming["Before Sleep"]]: ["22:00:00"],
+    [types_1.EventTiming["After Sleep"]]: ["06:30:00"],
+    [types_1.EventTiming.Meal]: ["08:00:00", "12:30:00", "18:30:00"],
+    [types_1.EventTiming["Before Meal"]]: ["07:30:00", "12:00:00", "18:00:00"],
+    [types_1.EventTiming["After Meal"]]: ["08:30:00", "13:00:00", "19:00:00"]
+};
+function inferWhenFallbackEntries(whenCodes, repeat) {
+    const entries = [];
+    const seen = new Set();
+    const addClock = (clock) => {
+        var _a;
+        const normalized = normalizeClock(clock);
+        const adjusted = repeat.offset
+            ? applyOffset(normalized, (_a = repeat.offset) !== null && _a !== void 0 ? _a : 0)
+            : { time: normalized, dayShift: 0 };
+        const key = `${adjusted.dayShift}|${adjusted.time}`;
+        if (seen.has(key)) {
+            return;
+        }
+        seen.add(key);
+        entries.push(adjusted);
+    };
+    for (const code of whenCodes) {
+        if (code === types_1.EventTiming.Immediate) {
+            continue;
+        }
+        const fallbackClocks = DEFAULT_WHEN_FALLBACK_CLOCKS[code];
+        if (!fallbackClocks) {
+            continue;
+        }
+        for (const clock of fallbackClocks) {
+            addClock(clock);
+        }
+    }
+    return entries.sort((a, b) => {
+        if (a.dayShift !== b.dayShift) {
+            return a.dayShift - b.dayShift;
+        }
+        return a.time.localeCompare(b.time);
+    });
+}
 function mergeFrequencyDefaults(base, override) {
     var _a, _b, _c, _d;
     if (!base && !override) {
@@ -571,6 +634,11 @@ function nextDueDoses(dosage, options) {
                 return a.time.localeCompare(b.time);
             });
         }
+        if (expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            (!repeat.frequency || !repeat.period || !repeat.periodUnit)) {
+            expanded.push(...inferWhenFallbackEntries(whenCodes, repeat));
+        }
         const includesImmediate = (0, array_1.arrayIncludes)(whenCodes, types_1.EventTiming.Immediate);
         if (includesImmediate) {
             const immediateSource = orderedAt !== null && orderedAt !== void 0 ? orderedAt : from;
@@ -731,6 +799,11 @@ function derivePriorCountFromHistory(timing, repeat, config, orderedAt, from, ti
                 return a.time.localeCompare(b.time);
             });
         }
+        if (expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            (!repeat.frequency || !repeat.period || !repeat.periodUnit)) {
+            expanded.push(...inferWhenFallbackEntries(whenCodes, repeat));
+        }
         if ((0, array_1.arrayIncludes)(whenCodes, types_1.EventTiming.Immediate)) {
             if (recordCandidate(orderedAt) && normalizedCount !== undefined && seen.size >= normalizedCount) {
                 return count;
@@ -981,6 +1054,11 @@ function countScheduleEvents(dosage, from, to, config, baseTime, orderedAt, limi
                 return a.time.localeCompare(b.time);
             });
         }
+        if (expanded.length === 0 &&
+            timeOfDayEntries.length === 0 &&
+            (!repeat.frequency || !repeat.period || !repeat.periodUnit)) {
+            expanded.push(...inferWhenFallbackEntries(whenCodes, repeat));
+        }
         if ((0, array_1.arrayIncludes)(whenCodes, types_1.EventTiming.Immediate)) {
             const immediateSource = orderedAt !== null && orderedAt !== void 0 ? orderedAt : from;
             if (!orderedAt || orderedAt >= from) {

package/dist/types.d.ts

@@ -457,6 +457,13 @@ export interface ParseOptions extends FormatOptions {
      * `context.mealRelation` when provided.
      */
     smartMealExpansion?: boolean;
+    /**
+     * Enables parsing meal dash shorthand like `1-0-1` / `1-0-0-1` into
+     * multiple dosage clauses aligned to breakfast/lunch/dinner/(bedtime).
+     * Optional trailing `ac` / `pc` maps meal anchors to before/after meal
+     * variants.
+     */
+    enableMealDashSyntax?: boolean;
     /**
      * Controls which meal pair is assumed for twice-daily meal expansions.
      * Defaults to "breakfast+dinner" to mirror common clinical practice.

package/package.json

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