ezmedicationinput 0.1.42 → 0.1.44

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { FhirDosage, FormatBatchOptions, FormatOptions, LintBatchResult, ParseBatchResult, ParseOptions, ParseResult } from "./types";
-export { parseInternal } from "./parser";
 export { suggestSig } from "./suggest";
 export * from "./types";
 export { nextDueDoses, calculateTotalUnits } from "./schedule";

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.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.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 = void 0;
 exports.parseSig = parseSig;
 exports.lintSig = lintSig;
 exports.parseSigAsync = parseSigAsync;
@@ -33,11 +33,10 @@ exports.formatParseBatch = formatParseBatch;
 exports.fromFhirDosage = fromFhirDosage;
 const format_1 = require("./format");
 const fhir_1 = require("./fhir");
+const ir_1 = require("./ir");
 const i18n_1 = require("./i18n");
 const parser_1 = require("./parser");
 const segment_1 = require("./segment");
-var parser_2 = require("./parser");
-Object.defineProperty(exports, "parseInternal", { enumerable: true, get: function () { return parser_2.parseInternal; } });
 var suggest_1 = require("./suggest");
 Object.defineProperty(exports, "suggestSig", { enumerable: true, get: function () { return suggest_1.suggestSig; } });
 __exportStar(require("./types"), exports);
@@ -328,7 +327,9 @@ function mergeParseResults(base, next, options) {
         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 : [])] })
+        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, canonical: {
+                clauses: [...base.meta.canonical.clauses, ...next.meta.canonical.clauses]
+            }, 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 : [])] })
     };
 }
 /**
@@ -347,19 +348,26 @@ function appendParseResult(items, next, options) {
     }
     items.push(next);
 }
+function collectCanonicalClauses(results) {
+    const clauses = [];
+    for (const result of results) {
+        clauses.push(...result.meta.canonical.clauses);
+    }
+    return clauses;
+}
 function parseSig(input, options) {
     const segments = expandMealDashSegments((0, segment_1.splitSigSegments)(input), options);
     const carry = {};
     const results = [];
     for (const segment of segments) {
-        const internal = (0, parser_1.parseInternal)(segment.text, options);
-        applyCarryForward(internal, carry);
-        (0, parser_1.applyPrnReasonCoding)(internal, options);
-        (0, parser_1.applySiteCoding)(internal, options);
-        const result = buildParseResult(internal, options);
+        const state = (0, parser_1.parseClauseState)(segment.text, options);
+        applyCarryForward(state, carry);
+        (0, parser_1.applyPrnReasonCoding)(state, options);
+        (0, parser_1.applySiteCoding)(state, options);
+        const result = buildParseResult(state, options);
         rebaseParseResult(result, input, segment.start);
         appendParseResult(results, result, options);
-        updateCarryForward(carry, internal);
+        updateCarryForward(carry, state);
     }
     const legacy = resolveLegacyParseResult(results, input, options);
     return {
@@ -370,7 +378,11 @@ function parseSig(input, options) {
         shortText: legacy.shortText,
         longText: legacy.longText,
         warnings: legacy.warnings,
-        meta: Object.assign(Object.assign({}, legacy.meta), { segments: toSegmentMeta(segments) })
+        meta: Object.assign(Object.assign({}, legacy.meta), { canonical: {
+                clauses: results.length
+                    ? collectCanonicalClauses(results)
+                    : legacy.meta.canonical.clauses
+            }, segments: toSegmentMeta(segments) })
     };
 }
 function lintSig(input, options) {
@@ -378,13 +390,13 @@ function lintSig(input, options) {
     const carry = {};
     const results = [];
     for (const segment of segments) {
-        const internal = (0, parser_1.parseInternal)(segment.text, options);
-        applyCarryForward(internal, carry);
-        (0, parser_1.applyPrnReasonCoding)(internal, options);
-        (0, parser_1.applySiteCoding)(internal, options);
-        const result = buildParseResult(internal, options);
+        const state = (0, parser_1.parseClauseState)(segment.text, options);
+        applyCarryForward(state, carry);
+        (0, parser_1.applyPrnReasonCoding)(state, options);
+        (0, parser_1.applySiteCoding)(state, options);
+        const result = buildParseResult(state, options);
         rebaseParseResult(result, input, segment.start);
-        const groups = (0, parser_1.findUnparsedTokenGroups)(internal);
+        const groups = (0, parser_1.findUnparsedTokenGroups)(state);
         const issues = groups.map((group) => {
             const shiftedRange = shiftRange(group.range, segment.start);
             const text = shiftedRange
@@ -397,8 +409,12 @@ function lintSig(input, options) {
                 range: shiftedRange
             };
         });
+        issues.push(...buildSemanticLintIssues(result, input, {
+            start: segment.start,
+            end: segment.start + segment.text.length
+        }));
         results.push({ result, issues });
-        updateCarryForward(carry, internal);
+        updateCarryForward(carry, state);
     }
     const legacy = resolveLegacyLintResult(results, input, options);
     return {
@@ -418,14 +434,14 @@ function parseSigAsync(input, options) {
         const carry = {};
         const results = [];
         for (const segment of segments) {
-            const internal = (0, parser_1.parseInternal)(segment.text, options);
-            applyCarryForward(internal, carry);
-            yield (0, parser_1.applyPrnReasonCodingAsync)(internal, options);
-            yield (0, parser_1.applySiteCodingAsync)(internal, options);
-            const result = buildParseResult(internal, options);
+            const state = (0, parser_1.parseClauseState)(segment.text, options);
+            applyCarryForward(state, carry);
+            yield (0, parser_1.applyPrnReasonCodingAsync)(state, options);
+            yield (0, parser_1.applySiteCodingAsync)(state, options);
+            const result = buildParseResult(state, options);
             rebaseParseResult(result, input, segment.start);
             appendParseResult(results, result, options);
-            updateCarryForward(carry, internal);
+            updateCarryForward(carry, state);
         }
         const legacy = resolveLegacyParseResult(results, input, options);
         return {
@@ -436,14 +452,18 @@ function parseSigAsync(input, options) {
             shortText: legacy.shortText,
             longText: legacy.longText,
             warnings: legacy.warnings,
-            meta: Object.assign(Object.assign({}, legacy.meta), { segments: toSegmentMeta(segments) })
+            meta: Object.assign(Object.assign({}, legacy.meta), { canonical: {
+                    clauses: results.length
+                        ? collectCanonicalClauses(results)
+                        : legacy.meta.canonical.clauses
+                }, segments: toSegmentMeta(segments) })
         };
     });
 }
 function formatSig(dosage, style = "short", options) {
-    const internal = (0, fhir_1.internalFromFhir)(dosage);
+    const clause = (0, fhir_1.canonicalFromFhir)(dosage);
     const localization = (0, i18n_1.resolveSigLocalization)(options === null || options === void 0 ? void 0 : options.locale, options === null || options === void 0 ? void 0 : options.i18n);
-    return (0, format_1.formatInternal)(internal, style, localization);
+    return (0, format_1.formatCanonicalClause)(clause, style, localization, options);
 }
 function formatSigBatch(dosages, style = "short", options) {
     var _a;
@@ -464,161 +484,168 @@ function formatParseBatch(batch, style = "short", separator = ", ") {
     return texts.join(separator);
 }
 function fromFhirDosage(dosage, options) {
-    var _a, _b, _c, _d, _e, _f;
-    const internal = (0, fhir_1.internalFromFhir)(dosage);
+    var _a;
+    const clause = (0, fhir_1.canonicalFromFhir)(dosage);
     const localization = (0, i18n_1.resolveSigLocalization)(options === null || options === void 0 ? void 0 : options.locale, options === null || options === void 0 ? void 0 : options.i18n);
-    const shortText = (0, format_1.formatInternal)(internal, "short", localization);
-    const computedLong = (0, format_1.formatInternal)(internal, "long", localization);
-    const longText = localization ? computedLong : (_a = dosage.text) !== null && _a !== void 0 ? _a : computedLong;
+    const shortText = (0, format_1.formatCanonicalClause)(clause, "short", localization, options);
+    const computedLong = (0, format_1.formatCanonicalClause)(clause, "long", localization, options);
+    const longText = computedLong || dosage.text || "";
+    dosage.text = longText;
     return {
         fhir: dosage,
         shortText,
         longText,
-        warnings: [],
+        warnings: (_a = clause.warnings) !== null && _a !== void 0 ? _a : [],
         meta: {
             consumedTokens: [],
-            normalized: {
-                route: internal.routeCode,
-                unit: internal.unit,
-                site: internal.siteText || ((_b = internal.siteCoding) === null || _b === void 0 ? void 0 : _b.code)
-                    ? {
-                        text: internal.siteText,
-                        coding: ((_c = internal.siteCoding) === null || _c === void 0 ? void 0 : _c.code)
-                            ? {
-                                code: internal.siteCoding.code,
-                                display: internal.siteCoding.display,
-                                system: internal.siteCoding.system
-                            }
-                            : undefined
-                    }
-                    : undefined,
-                prnReason: internal.asNeededReason || ((_d = internal.asNeededReasonCoding) === null || _d === void 0 ? void 0 : _d.code)
-                    ? {
-                        text: internal.asNeededReason,
-                        coding: ((_e = internal.asNeededReasonCoding) === null || _e === void 0 ? void 0 : _e.code)
-                            ? {
-                                code: internal.asNeededReasonCoding.code,
-                                display: internal.asNeededReasonCoding.display,
-                                system: internal.asNeededReasonCoding.system
-                            }
-                            : undefined
-                    }
-                    : undefined,
-                additionalInstructions: ((_f = internal.additionalInstructions) === null || _f === void 0 ? void 0 : _f.length)
-                    ? internal.additionalInstructions.map((instruction) => {
-                        var _a;
-                        return ({
-                            text: instruction.text,
-                            coding: ((_a = instruction.coding) === null || _a === void 0 ? void 0 : _a.code)
-                                ? {
-                                    code: instruction.coding.code,
-                                    display: instruction.coding.display,
-                                    system: instruction.coding.system
-                                }
-                                : undefined
-                        });
-                    })
-                    : undefined
+            normalized: buildNormalizedMetaFromClause(clause),
+            canonical: {
+                clauses: [clause]
             }
         }
     };
 }
-function buildParseResult(internal, options) {
-    var _a, _b, _c;
+function createEmptyCanonicalClause(rawText) {
+    return {
+        kind: "administration",
+        rawText,
+        raw: {
+            start: 0,
+            end: rawText.length,
+            text: rawText
+        },
+        leftovers: [],
+        evidence: [],
+        confidence: 1
+    };
+}
+function getPrimaryClause(clauses, rawText) {
+    var _a;
+    return (_a = clauses[0]) !== null && _a !== void 0 ? _a : createEmptyCanonicalClause(rawText);
+}
+function cloneCoding(coding) {
+    if (!(coding === null || coding === void 0 ? void 0 : coding.code) && !(coding === null || coding === void 0 ? void 0 : coding.display) && !(coding === null || coding === void 0 ? void 0 : coding.system)) {
+        return undefined;
+    }
+    return {
+        code: coding.code,
+        display: coding.display,
+        system: coding.system
+    };
+}
+function cloneBodySiteCoding(coding) {
+    if (!(coding === null || coding === void 0 ? void 0 : coding.code)) {
+        return undefined;
+    }
+    return {
+        code: coding.code,
+        display: coding.display,
+        system: coding.system
+    };
+}
+function buildNormalizedMetaFromClause(clause) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+    const additionalInstructions = ((_a = clause.additionalInstructions) === null || _a === void 0 ? void 0 : _a.length)
+        ? clause.additionalInstructions.map((instruction) => ({
+            text: instruction.text,
+            coding: cloneCoding(instruction.coding)
+        }))
+        : undefined;
+    return {
+        route: (_b = clause.route) === null || _b === void 0 ? void 0 : _b.code,
+        unit: (_c = clause.dose) === null || _c === void 0 ? void 0 : _c.unit,
+        site: ((_d = clause.site) === null || _d === void 0 ? void 0 : _d.text) || ((_f = (_e = clause.site) === null || _e === void 0 ? void 0 : _e.coding) === null || _f === void 0 ? void 0 : _f.code)
+            ? {
+                text: (_g = clause.site) === null || _g === void 0 ? void 0 : _g.text,
+                coding: cloneBodySiteCoding((_h = clause.site) === null || _h === void 0 ? void 0 : _h.coding)
+            }
+            : undefined,
+        method: ((_j = clause.method) === null || _j === void 0 ? void 0 : _j.text) || ((_l = (_k = clause.method) === null || _k === void 0 ? void 0 : _k.coding) === null || _l === void 0 ? void 0 : _l.code)
+            ? {
+                text: (_m = clause.method) === null || _m === void 0 ? void 0 : _m.text,
+                coding: cloneCoding((_o = clause.method) === null || _o === void 0 ? void 0 : _o.coding)
+            }
+            : undefined,
+        patientInstruction: clause.patientInstruction,
+        prnReason: ((_q = (_p = clause.prn) === null || _p === void 0 ? void 0 : _p.reason) === null || _q === void 0 ? void 0 : _q.text) || ((_t = (_s = (_r = clause.prn) === null || _r === void 0 ? void 0 : _r.reason) === null || _s === void 0 ? void 0 : _s.coding) === null || _t === void 0 ? void 0 : _t.code)
+            ? {
+                text: (_v = (_u = clause.prn) === null || _u === void 0 ? void 0 : _u.reason) === null || _v === void 0 ? void 0 : _v.text,
+                coding: cloneCoding((_x = (_w = clause.prn) === null || _w === void 0 ? void 0 : _w.reason) === null || _x === void 0 ? void 0 : _x.coding)
+            }
+            : undefined,
+        prnReasons: ((_z = (_y = clause.prn) === null || _y === void 0 ? void 0 : _y.reasons) === null || _z === void 0 ? void 0 : _z.length)
+            ? clause.prn.reasons.map((reason) => ({
+                text: reason.text,
+                coding: cloneCoding(reason.coding)
+            }))
+            : undefined,
+        additionalInstructions
+    };
+}
+function buildParseResult(state, options) {
+    const canonicalClauses = state.clauses;
+    const clause = getPrimaryClause(canonicalClauses, state.input);
     const localization = (0, i18n_1.resolveSigLocalization)(options === null || options === void 0 ? void 0 : options.locale, options === null || options === void 0 ? void 0 : options.i18n);
-    const shortText = (0, format_1.formatInternal)(internal, "short", localization);
-    const longText = (0, format_1.formatInternal)(internal, "long", localization);
-    const fhir = (0, fhir_1.toFhir)(internal);
-    if (longText) {
-        fhir.text = longText;
-    }
-    const consumedTokens = internal.tokens
-        .filter((token) => internal.consumed.has(token.index))
-        .map((token) => token.original);
-    const leftoverTokens = internal.tokens.filter((token) => !internal.consumed.has(token.index));
-    const siteCoding = ((_a = internal.siteCoding) === null || _a === void 0 ? void 0 : _a.code)
-        ? {
-            code: internal.siteCoding.code,
-            display: internal.siteCoding.display,
-            system: internal.siteCoding.system
+    const shortText = (0, format_1.formatCanonicalClause)(clause, "short", localization, options);
+    const longText = (0, format_1.formatCanonicalClause)(clause, "long", localization, options);
+    const fhir = (0, fhir_1.canonicalToFhir)(clause, longText);
+    const consumedTokens = [];
+    const leftoverParts = [];
+    for (const token of state.tokens) {
+        if (state.consumed.has(token.index)) {
+            consumedTokens.push(token.original);
         }
-        : undefined;
-    const prnReasonCoding = ((_b = internal.asNeededReasonCoding) === null || _b === void 0 ? void 0 : _b.code)
-        ? {
-            code: internal.asNeededReasonCoding.code,
-            display: internal.asNeededReasonCoding.display,
-            system: internal.asNeededReasonCoding.system
+        else {
+            leftoverParts.push(token.original);
         }
-        : undefined;
-    const additionalInstructions = ((_c = internal.additionalInstructions) === null || _c === void 0 ? void 0 : _c.length)
-        ? internal.additionalInstructions.map((instruction) => {
-            var _a;
-            return ({
-                text: instruction.text,
-                coding: ((_a = instruction.coding) === null || _a === void 0 ? void 0 : _a.code)
-                    ? {
-                        code: instruction.coding.code,
-                        display: instruction.coding.display,
-                        system: instruction.coding.system
-                    }
-                    : undefined
-            });
-        })
-        : undefined;
-    const siteLookups = internal.siteLookups.length
-        ? internal.siteLookups.map((entry) => ({
-            request: entry.request,
-            suggestions: entry.suggestions.map((suggestion) => ({
-                coding: {
-                    code: suggestion.coding.code,
-                    display: suggestion.coding.display,
-                    system: suggestion.coding.system
-                },
-                text: suggestion.text
-            }))
-        }))
-        : undefined;
-    const prnReasonLookups = internal.prnReasonLookups.length
-        ? internal.prnReasonLookups.map((entry) => ({
-            request: entry.request,
-            suggestions: entry.suggestions.map((suggestion) => ({
-                coding: suggestion.coding
-                    ? {
+    }
+    const siteLookups = state.siteLookups.length ? [] : undefined;
+    if (siteLookups) {
+        for (const entry of state.siteLookups) {
+            const suggestions = [];
+            for (const suggestion of entry.suggestions) {
+                suggestions.push({
+                    coding: {
                         code: suggestion.coding.code,
                         display: suggestion.coding.display,
                         system: suggestion.coding.system
-                    }
-                    : undefined,
-                text: suggestion.text
-            }))
-        }))
-        : undefined;
+                    },
+                    text: suggestion.text
+                });
+            }
+            siteLookups.push({
+                request: entry.request,
+                suggestions
+            });
+        }
+    }
+    const prnReasonLookups = state.prnReasonLookups.length ? [] : undefined;
+    if (prnReasonLookups) {
+        for (const entry of state.prnReasonLookups) {
+            const suggestions = [];
+            for (const suggestion of entry.suggestions) {
+                suggestions.push({
+                    coding: cloneCoding(suggestion.coding),
+                    text: suggestion.text
+                });
+            }
+            prnReasonLookups.push({
+                request: entry.request,
+                suggestions
+            });
+        }
+    }
     return {
         fhir,
         shortText,
         longText,
-        warnings: internal.warnings,
+        warnings: state.warnings,
         meta: {
             consumedTokens,
-            leftoverText: leftoverTokens.length
-                ? leftoverTokens.map((t) => t.original).join(" ")
-                : undefined,
-            normalized: {
-                route: internal.routeCode,
-                unit: internal.unit,
-                site: internal.siteText || siteCoding
-                    ? {
-                        text: internal.siteText,
-                        coding: siteCoding
-                    }
-                    : undefined,
-                prnReason: internal.asNeededReason || prnReasonCoding
-                    ? {
-                        text: internal.asNeededReason,
-                        coding: prnReasonCoding
-                    }
-                    : undefined,
-                additionalInstructions
+            leftoverText: leftoverParts.length ? leftoverParts.join(" ") : undefined,
+            normalized: buildNormalizedMetaFromClause(clause),
+            canonical: {
+                clauses: canonicalClauses
             },
             siteLookups,
             prnReasonLookups
@@ -679,6 +706,7 @@ function rebaseParseResult(result, fullInput, offset) {
             rebaseRequest(lookup.request);
         }
     }
+    (0, ir_1.shiftCanonicalSigClauses)(result.meta.canonical.clauses, offset);
 }
 function shiftRange(range, offset) {
     if (!range) {
@@ -693,23 +721,46 @@ function resolveLegacyParseResult(results, input, options) {
     if (results.length > 0) {
         return results[0];
     }
-    const internal = (0, parser_1.parseInternal)(input, options);
-    (0, parser_1.applyPrnReasonCoding)(internal, options);
-    (0, parser_1.applySiteCoding)(internal, options);
-    return buildParseResult(internal, options);
+    const state = (0, parser_1.parseClauseState)(input, options);
+    (0, parser_1.applyPrnReasonCoding)(state, options);
+    (0, parser_1.applySiteCoding)(state, options);
+    return buildParseResult(state, options);
+}
+function buildSemanticLintIssues(result, input, fallbackRange) {
+    var _a;
+    const issues = [];
+    const clause = result.meta.canonical.clauses[0];
+    const range = (_a = clause === null || clause === void 0 ? void 0 : clause.span) !== null && _a !== void 0 ? _a : fallbackRange;
+    const text = range
+        ? input.slice(range.start, range.end)
+        : input;
+    const trimmedText = text.trim() || text;
+    const tokens = trimmedText ? trimmedText.split(/\s+/).filter((part) => part.length > 0) : [];
+    for (const warning of result.warnings) {
+        if (!warning.startsWith("Incomplete sig:")) {
+            continue;
+        }
+        issues.push({
+            message: warning,
+            text: trimmedText,
+            tokens,
+            range
+        });
+    }
+    return issues;
 }
 function resolveLegacyLintResult(results, input, options) {
     if (results.length > 0) {
         return results[0];
     }
-    const internal = (0, parser_1.parseInternal)(input, options);
-    (0, parser_1.applyPrnReasonCoding)(internal, options);
-    (0, parser_1.applySiteCoding)(internal, options);
-    const result = buildParseResult(internal, options);
-    const groups = (0, parser_1.findUnparsedTokenGroups)(internal);
+    const state = (0, parser_1.parseClauseState)(input, options);
+    (0, parser_1.applyPrnReasonCoding)(state, options);
+    (0, parser_1.applySiteCoding)(state, options);
+    const result = buildParseResult(state, options);
+    const groups = (0, parser_1.findUnparsedTokenGroups)(state);
     const issues = groups.map((group) => {
         const text = group.range
-            ? internal.input.slice(group.range.start, group.range.end)
+            ? state.input.slice(group.range.start, group.range.end)
             : group.tokens.map((token) => token.original).join(" ");
         return {
             message: "Unrecognized text",
@@ -718,5 +769,6 @@ function resolveLegacyLintResult(results, input, options) {
             range: group.range
         };
     });
+    issues.push(...buildSemanticLintIssues(result, input));
     return { result, issues };
 }

package/dist/internal-types.d.ts

@@ -1,4 +1,5 @@
-import { EventTiming, FhirCoding, FhirDayOfWeek, FhirPeriodUnit, PrnReasonLookupRequest, PrnReasonSuggestion, RouteCode, SiteCodeLookupRequest, SiteCodeSuggestion } from "./types";
+import { AnnotatedLexToken } from "./lexer/meaning";
+import { AdviceFrame, CanonicalSigClause, EventTiming, FhirCoding, FhirDayOfWeek, FhirPeriodUnit, PrnReasonLookupRequest, PrnReasonSuggestion, RouteCode, SiteCodeLookupRequest, SiteCodeSuggestion } from "./types";
 export interface SiteLookupDetail {
     request: SiteCodeLookupRequest;
     suggestions: SiteCodeSuggestion[];
@@ -7,10 +8,7 @@ export interface PrnReasonLookupDetail {
     request: PrnReasonLookupRequest;
     suggestions: PrnReasonSuggestion[];
 }
-export interface Token {
-    original: string;
-    lower: string;
-    index: number;
+export interface Token extends AnnotatedLexToken {
 }
 export interface ParsedSigInternal {
     input: string;
@@ -56,5 +54,7 @@ export interface ParsedSigInternal {
         coding?: FhirCoding & {
             i18n?: Record<string, string>;
         };
+        frames?: AdviceFrame[];
     }>;
+    canonicalClauses?: CanonicalSigClause[];
 }

package/dist/ir.d.ts

@@ -0,0 +1,4 @@
+import { ParserState } from "./parser-state";
+import { CanonicalSigClause } from "./types";
+export declare function buildCanonicalSigClauses(internal: ParserState): CanonicalSigClause[];
+export declare function shiftCanonicalSigClauses(clauses: CanonicalSigClause[], offset: number): void;