ezmedicationinput 0.1.22 → 0.1.23

package/dist/parser.js

@@ -1513,13 +1513,14 @@ function parseInternal(input, options) {
         }
     }
     // Multiplicative tokens like 1x3
-    for (const token of tokens) {
+    for (let i = 0; i < tokens.length; i++) {
+        const token = tokens[i];
         if (internal.consumed.has(token.index))
             continue;
-        const match = token.lower.match(/^([0-9]+(?:\.[0-9]+)?)[x*]([0-9]+(?:\.[0-9]+)?)$/);
-        if (match) {
-            const dose = parseFloat(match[1]);
-            const freq = parseFloat(match[2]);
+        const combined = token.lower.match(/^([0-9]+(?:\.[0-9]+)?)[x*]([0-9]+(?:\.[0-9]+)?)$/);
+        if (combined) {
+            const dose = parseFloat(combined[1]);
+            const freq = parseFloat(combined[2]);
             if (internal.dose === undefined) {
                 internal.dose = dose;
             }
@@ -1527,6 +1528,55 @@ function parseInternal(input, options) {
             internal.period = 1;
             internal.periodUnit = types_1.FhirPeriodUnit.Day;
             mark(internal.consumed, token);
+            continue;
+        }
+        const hasNumericDoseBefore = () => {
+            for (let j = i - 1; j >= 0; j--) {
+                const prev = tokens[j];
+                if (!prev) {
+                    continue;
+                }
+                if (internal.consumed.has(prev.index)) {
+                    continue;
+                }
+                if (/^[0-9]+(?:\.[0-9]+)?$/.test(prev.lower)) {
+                    return true;
+                }
+                if (normalizeUnit(prev.lower, options)) {
+                    continue;
+                }
+                break;
+            }
+            return false;
+        };
+        if (internal.frequency === undefined && hasNumericDoseBefore()) {
+            const prefix = token.lower.match(/^[x*]([0-9]+(?:\.[0-9]+)?)$/);
+            if (prefix) {
+                const freq = parseFloat(prefix[1]);
+                if (Number.isFinite(freq)) {
+                    internal.frequency = freq;
+                    internal.period = 1;
+                    internal.periodUnit = types_1.FhirPeriodUnit.Day;
+                    mark(internal.consumed, token);
+                    continue;
+                }
+            }
+            if (token.lower === "x" || token.lower === "*") {
+                const next = tokens[i + 1];
+                if (next &&
+                    !internal.consumed.has(next.index) &&
+                    /^[0-9]+(?:\.[0-9]+)?$/.test(next.lower)) {
+                    const freq = parseFloat(next.original);
+                    if (Number.isFinite(freq)) {
+                        internal.frequency = freq;
+                        internal.period = 1;
+                        internal.periodUnit = types_1.FhirPeriodUnit.Day;
+                        mark(internal.consumed, token);
+                        mark(internal.consumed, next);
+                        continue;
+                    }
+                }
+            }
         }
     }
     const applyRouteDescriptor = (code, text) => {

package/package.json

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