ezmedicationinput 0.1.39 → 0.1.40

package/dist/index.js

@@ -58,6 +58,15 @@ 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; } });
+const REPEAT_NON_ANCHOR_KEYS = [
+    "count",
+    "frequency",
+    "frequencyMax",
+    "period",
+    "periodMax",
+    "periodUnit",
+    "offset"
+];
 function parseMealDashValues(token) {
     if (!/^[0-9]+(?:\.[0-9]+)?(?:-[0-9]+(?:\.[0-9]+)?){2,3}$/.test(token)) {
         return undefined;
@@ -155,6 +164,189 @@ function toSegmentMeta(segments) {
         range: { start: segment.start, end: segment.end }
     }));
 }
+/**
+ * Deep equality helper for plain JSON-like parser output objects.
+ *
+ * @param left Left-side value.
+ * @param right Right-side value.
+ * @returns `true` when both values are structurally equal.
+ */
+function deepEqual(left, right) {
+    if (left === right) {
+        return true;
+    }
+    if (left === null || right === null) {
+        return left === right;
+    }
+    if (Array.isArray(left) || Array.isArray(right)) {
+        if (!Array.isArray(left) || !Array.isArray(right)) {
+            return false;
+        }
+        if (left.length !== right.length) {
+            return false;
+        }
+        for (let i = 0; i < left.length; i += 1) {
+            if (!deepEqual(left[i], right[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+    if (typeof left !== "object" || typeof right !== "object") {
+        return false;
+    }
+    const leftRecord = left;
+    const rightRecord = right;
+    const leftKeys = Object.keys(leftRecord).filter((key) => leftRecord[key] !== undefined);
+    const rightKeys = Object.keys(rightRecord).filter((key) => rightRecord[key] !== undefined);
+    if (leftKeys.length !== rightKeys.length) {
+        return false;
+    }
+    for (const key of leftKeys) {
+        if (!Object.prototype.hasOwnProperty.call(rightRecord, key)) {
+            return false;
+        }
+        if (!deepEqual(leftRecord[key], rightRecord[key])) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Compares two string arrays as sets.
+ *
+ * @param left Left array.
+ * @param right Right array.
+ * @returns `true` when both arrays contain the same unique values.
+ */
+function sameStringSet(left, right) {
+    const a = left !== null && left !== void 0 ? left : [];
+    const b = right !== null && right !== void 0 ? right : [];
+    if (a.length !== b.length) {
+        return false;
+    }
+    const set = new Set(a);
+    if (set.size !== b.length) {
+        return false;
+    }
+    for (const value of b) {
+        if (!set.has(value)) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Determines whether a repeat block only uses merge-safe anchor fields.
+ *
+ * @param repeat FHIR timing repeat payload.
+ * @returns `true` when repeat contains only `when`/`timeOfDay`/`dayOfWeek`.
+ */
+function isMergeableAnchorRepeat(repeat) {
+    if (!repeat) {
+        return true;
+    }
+    for (const key of REPEAT_NON_ANCHOR_KEYS) {
+        if (repeat[key] !== undefined) {
+            return false;
+        }
+    }
+    return true;
+}
+/**
+ * Checks whether two parsed items can be merged without changing semantics.
+ *
+ * @param base Existing merged item candidate.
+ * @param next Incoming parsed item.
+ * @returns `true` when both items differ only by merge-safe timing anchors.
+ */
+function canMergeTimingOnly(base, next) {
+    const baseTiming = base.fhir.timing;
+    const nextTiming = next.fhir.timing;
+    const baseRepeat = baseTiming === null || baseTiming === void 0 ? void 0 : baseTiming.repeat;
+    const nextRepeat = nextTiming === null || nextTiming === void 0 ? void 0 : nextTiming.repeat;
+    if (!baseRepeat || !nextRepeat) {
+        return false;
+    }
+    if (!isMergeableAnchorRepeat(baseRepeat) || !isMergeableAnchorRepeat(nextRepeat)) {
+        return false;
+    }
+    if (!sameStringSet(baseRepeat.dayOfWeek, nextRepeat.dayOfWeek)) {
+        return false;
+    }
+    if (!deepEqual(baseTiming === null || baseTiming === void 0 ? void 0 : baseTiming.code, nextTiming === null || nextTiming === void 0 ? void 0 : nextTiming.code)) {
+        return false;
+    }
+    if (!deepEqual(baseTiming === null || baseTiming === void 0 ? void 0 : baseTiming.event, nextTiming === null || nextTiming === void 0 ? void 0 : nextTiming.event)) {
+        return false;
+    }
+    return (deepEqual(base.fhir.doseAndRate, next.fhir.doseAndRate) &&
+        deepEqual(base.fhir.route, next.fhir.route) &&
+        deepEqual(base.fhir.site, next.fhir.site) &&
+        deepEqual(base.fhir.additionalInstruction, next.fhir.additionalInstruction) &&
+        deepEqual(base.fhir.asNeededBoolean, next.fhir.asNeededBoolean) &&
+        deepEqual(base.fhir.asNeededFor, next.fhir.asNeededFor));
+}
+/**
+ * Returns a stable unique list preserving first-seen order.
+ *
+ * @param values Input values.
+ * @returns Deduplicated values in insertion order.
+ */
+function uniqueStrings(values) {
+    const seen = new Set();
+    const output = [];
+    for (const value of values) {
+        if (!seen.has(value)) {
+            seen.add(value);
+            output.push(value);
+        }
+    }
+    return output;
+}
+/**
+ * Merges two parse results that are known to be timing-compatible.
+ *
+ * @param base Existing merged result.
+ * @param next Next result to fold into `base`.
+ * @param options Parse options used to render localized text.
+ * @returns New merged parse result.
+ */
+function mergeParseResults(base, next, options) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    const baseRepeat = (_b = (_a = base.fhir.timing) === null || _a === void 0 ? void 0 : _a.repeat) !== null && _b !== void 0 ? _b : {};
+    const nextRepeat = (_d = (_c = next.fhir.timing) === null || _c === void 0 ? void 0 : _c.repeat) !== null && _d !== void 0 ? _d : {};
+    const mergedWhen = uniqueStrings([...((_e = baseRepeat.when) !== null && _e !== void 0 ? _e : []), ...((_f = nextRepeat.when) !== null && _f !== void 0 ? _f : [])]);
+    const mergedTimeOfDay = uniqueStrings([...((_g = baseRepeat.timeOfDay) !== null && _g !== void 0 ? _g : []), ...((_h = nextRepeat.timeOfDay) !== null && _h !== void 0 ? _h : [])]).sort();
+    const mergedRepeat = Object.assign(Object.assign(Object.assign(Object.assign({}, baseRepeat), (nextRepeat.dayOfWeek ? { dayOfWeek: nextRepeat.dayOfWeek } : {})), (mergedWhen.length ? { when: mergedWhen } : {})), (mergedTimeOfDay.length ? { timeOfDay: mergedTimeOfDay } : {}));
+    const mergedFhir = Object.assign(Object.assign({}, base.fhir), { timing: Object.assign(Object.assign({}, ((_j = base.fhir.timing) !== null && _j !== void 0 ? _j : {})), { repeat: mergedRepeat }) });
+    const shortText = formatSig(mergedFhir, "short", options);
+    const longText = formatSig(mergedFhir, "long", options);
+    mergedFhir.text = longText;
+    return {
+        fhir: mergedFhir,
+        shortText,
+        longText,
+        warnings: uniqueStrings([...((_k = base.warnings) !== null && _k !== void 0 ? _k : []), ...((_l = next.warnings) !== null && _l !== void 0 ? _l : [])]),
+        meta: Object.assign(Object.assign({}, base.meta), { consumedTokens: uniqueStrings([...((_m = base.meta.consumedTokens) !== null && _m !== void 0 ? _m : []), ...((_o = next.meta.consumedTokens) !== null && _o !== void 0 ? _o : [])]), leftoverText: uniqueStrings([base.meta.leftoverText, next.meta.leftoverText].filter((value) => !!value)).join(" ").trim() || undefined, siteLookups: [...((_p = base.meta.siteLookups) !== null && _p !== void 0 ? _p : []), ...((_q = next.meta.siteLookups) !== null && _q !== void 0 ? _q : [])], prnReasonLookups: [...((_r = base.meta.prnReasonLookups) !== null && _r !== void 0 ? _r : []), ...((_s = next.meta.prnReasonLookups) !== null && _s !== void 0 ? _s : [])] })
+    };
+}
+/**
+ * Appends a parsed segment result to the batch, reusing the current item when
+ * timing-only expansion can be represented as a single dosage element.
+ *
+ * @param items Accumulated batch items.
+ * @param next Newly parsed segment result.
+ * @param options Parse options used to format merged text.
+ */
+function appendParseResult(items, next, options) {
+    const previous = items[items.length - 1];
+    if (previous && canMergeTimingOnly(previous, next)) {
+        items[items.length - 1] = mergeParseResults(previous, next, options);
+        return;
+    }
+    items.push(next);
+}
 function parseSig(input, options) {
     const segments = expandMealDashSegments((0, segment_1.splitSigSegments)(input), options);
     const carry = {};
@@ -166,7 +358,7 @@ function parseSig(input, options) {
         (0, parser_1.applySiteCoding)(internal, options);
         const result = buildParseResult(internal, options);
         rebaseParseResult(result, input, segment.start);
-        results.push(result);
+        appendParseResult(results, result, options);
         updateCarryForward(carry, internal);
     }
     const legacy = resolveLegacyParseResult(results, input, options);
@@ -232,7 +424,7 @@ function parseSigAsync(input, options) {
             yield (0, parser_1.applySiteCodingAsync)(internal, options);
             const result = buildParseResult(internal, options);
             rebaseParseResult(result, input, segment.start);
-            results.push(result);
+            appendParseResult(results, result, options);
             updateCarryForward(carry, internal);
         }
         const legacy = resolveLegacyParseResult(results, input, options);

package/package.json

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