ezmedicationinput 0.1.52 → 0.1.54

package/dist/hpsg/lexical-classes.d.ts

@@ -6,6 +6,7 @@ type CompoundDoseUnit = {
     head: string;
     tails: string[];
     tailSequences?: string[][];
+    requiresSiteContext?: boolean;
     unit: string;
 };
 export declare const SITE_ANCHORS: Set<string>;

package/dist/index.cjs

@@ -2252,6 +2252,14 @@ var DEFAULT_BODY_SITE_SNOMED_SOURCE = [
     names: ["axilla", "axillae", "armpit", "armpits"],
     definition: { coding: { code: "34797008", display: "Axilla structure" }, routeHint: RouteCode["Topical route"] }
   },
+  {
+    names: ["axillary hair", "armpit hair", "armpit hairs", "underarm hair", "underarm hairs"],
+    definition: {
+      coding: { code: "75703003", display: "Structure of hair of axilla" },
+      text: "axillary hair",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
   {
     names: ["groin"],
     definition: { coding: { code: "26893007", display: "Inguinal region structure" }, routeHint: RouteCode["Topical route"] }
@@ -2322,6 +2330,71 @@ var DEFAULT_BODY_SITE_SNOMED_SOURCE = [
     names: ["face"],
     definition: { coding: { code: "89545001", display: "Face" }, routeHint: RouteCode["Topical route"] }
   },
+  {
+    names: ["eyebrow", "brow"],
+    definition: {
+      coding: { code: "392262008", display: "Eyebrow structure" },
+      text: "eyebrow",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["eyebrows", "brows"],
+    definition: {
+      coding: { code: "392262008", display: "Eyebrow structure" },
+      text: "eyebrows",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["left eyebrow", "left brow"],
+    definition: {
+      coding: { code: "722011002", display: "Structure of eyebrow of left eye region" },
+      text: "left eyebrow",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["right eyebrow", "right brow"],
+    definition: {
+      coding: { code: "722012009", display: "Structure of eyebrow of right eye region" },
+      text: "right eyebrow",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: [
+      "both eyebrows",
+      "bilateral eyebrows",
+      "each eyebrow",
+      "left and right eyebrow",
+      "left and right eyebrows",
+      "right and left eyebrow",
+      "right and left eyebrows",
+      "left right eyebrow",
+      "left right eyebrows"
+    ],
+    definition: {
+      coding: {
+        code: buildSnomedBodySiteLateralityPostcoordinationCode(
+          "392262008",
+          SNOMED_CT_BILATERAL_QUALIFIER_CODE
+        ),
+        display: "both eyebrows"
+      },
+      text: "both eyebrows",
+      administrationTargetCount: 2,
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["eyebrow hair", "eyebrow hairs", "brow hair", "brow hairs"],
+    definition: {
+      coding: { code: "392261001", display: "Hair structure of eyebrow" },
+      text: "eyebrow hair",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
   {
     names: ["eyelid", "eyelids"],
     definition: { coding: { code: "80243003", display: "Eyelid" }, routeHint: RouteCode["Ophthalmic route"] }
@@ -2442,6 +2515,30 @@ var DEFAULT_BODY_SITE_SNOMED_SOURCE = [
     names: ["perineum"],
     definition: { coding: { code: "243990009", display: "Entire perineum" }, routeHint: RouteCode["Topical route"] }
   },
+  {
+    names: ["mustache", "moustache", "mustache hair", "moustache hair"],
+    definition: {
+      coding: { code: "256925006", display: "Structure of hair of mustache" },
+      text: "mustache",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["beard", "beard hair", "facial hair"],
+    definition: {
+      coding: { code: "367576007", display: "Structure of beard hair" },
+      text: "beard",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["pubic hair"],
+    definition: {
+      coding: { code: "75776007", display: "Structure of hair of pubis" },
+      text: "pubic hair",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
   {
     names: ["skin"],
     definition: { coding: { code: "181469002", display: "Entire skin" }, routeHint: RouteCode["Topical route"] }
@@ -2452,6 +2549,38 @@ var DEFAULT_BODY_SITE_SNOMED_SOURCE = [
       coding: { code: "386045008", display: "Hair structure (body structure)" },
       routeHint: RouteCode["Topical route"]
     }
+  },
+  {
+    names: ["joint"],
+    definition: {
+      coding: { code: "39352004", display: "Joint structure" },
+      text: "joint",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["joints"],
+    definition: {
+      coding: { code: "81087007", display: "Joints" },
+      text: "joints",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["finger joint", "finger joints"],
+    definition: {
+      coding: { code: "125682004", display: "Finger joint structure" },
+      text: "finger joints",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["knuckle", "knuckles"],
+    definition: {
+      coding: { code: "70420003", display: "Metacarpophalangeal joint structure" },
+      text: "knuckles",
+      routeHint: RouteCode["Topical route"]
+    }
   }
 ];
 var DEFAULT_BODY_SITE_SNOMED = objectFromEntries(
@@ -4363,6 +4492,7 @@ var lexical_classes_default = {
     "Use shampoo": "\u0E2A\u0E23\u0E30"
   },
   compoundDoseUnits: [
+    { head: "cm", tails: [], requiresSiteContext: true, unit: "cm line" },
     { head: "cm", tails: ["ribbon", "ribbons"], unit: "cm ribbon" },
     { head: "cm", tails: ["strip", "strips"], unit: "cm strip" },
     { head: "cm", tails: ["line", "lines"], unit: "cm line" },
@@ -4371,6 +4501,8 @@ var lexical_classes_default = {
     { head: "fingertip", tails: ["unit", "units"], unit: "FTU" },
     { head: "eye", tails: ["drop", "drops"], unit: "drop" },
     { head: "pea-sized", tails: ["amount"], unit: "pea-sized amount" },
+    { head: "pea-size", tails: ["amount"], unit: "pea-sized amount" },
+    { head: "peasize", tails: [], tailSequences: [[]], unit: "pea-sized amount" },
     { head: "\u0E40\u0E21\u0E47\u0E14\u0E16\u0E31\u0E48\u0E27", tails: [], unit: "pea-sized amount" },
     { head: "\u0E40\u0E21\u0E47\u0E14\u0E16\u0E31\u0E48\u0E27\u0E40\u0E02\u0E35\u0E22\u0E27", tails: [], unit: "pea-sized amount" },
     { head: "\u0E40\u0E21\u0E25\u0E47\u0E14\u0E16\u0E31\u0E48\u0E27", tails: [], unit: "pea-sized amount" },
@@ -4380,7 +4512,7 @@ var lexical_classes_default = {
     {
       head: "pea",
       tails: [],
-      tailSequences: [["sized", "amount"], ["size", "amount"]],
+      tailSequences: [["sized", "amount"], ["size", "amount"], ["amount"], ["sized"], ["size"], []],
       unit: "pea-sized amount"
     },
     { head: "hand", tails: ["print", "prints"], unit: "handprint" },
@@ -15026,6 +15158,11 @@ var unit_terminology_default = {
       unit: "pea-sized amount",
       kind: "product_specific_amount",
       aliases: [
+        "pea",
+        "pea amount",
+        "peasize",
+        "pea-size",
+        "pea size",
         "pea sized amount",
         "pea-sized",
         "pea sized",
@@ -15122,10 +15259,96 @@ var unit_terminology_default = {
   ]
 };
 
+// src/utils/units.ts
+var MASS_UNITS = {
+  kg: 1e6,
+  g: 1e3,
+  mg: 1,
+  mcg: 1e-3,
+  ug: 1e-3,
+  microg: 1e-3,
+  ng: 1e-6
+};
+var VOLUME_UNITS = {
+  l: 1e3,
+  dl: 100,
+  ml: 1,
+  ul: 1e-3,
+  microl: 1e-3,
+  cm3: 1,
+  tsp: 5,
+  tbsp: 15
+};
+function getUnitCategory(unit) {
+  if (!unit) return "other";
+  const u = unit.toLowerCase();
+  if (MASS_UNITS[u] !== void 0) return "mass";
+  if (VOLUME_UNITS[u] !== void 0) return "volume";
+  return "other";
+}
+function getBaseUnitFactor(unit) {
+  var _a2, _b;
+  if (!unit) return 1;
+  const u = unit.toLowerCase();
+  return (_b = (_a2 = MASS_UNITS[u]) != null ? _a2 : VOLUME_UNITS[u]) != null ? _b : 1;
+}
+function convertValue(value, fromUnit, toUnit, strength) {
+  const f = fromUnit.toLowerCase();
+  const t = toUnit.toLowerCase();
+  if (f === t) return value;
+  const fCat = getUnitCategory(f);
+  const tCat = getUnitCategory(t);
+  if (fCat === tCat && fCat !== "other") {
+    const fFactor = getBaseUnitFactor(f);
+    const tFactor = getBaseUnitFactor(t);
+    return value * fFactor / tFactor;
+  }
+  if (strength && (fCat === "mass" && tCat === "volume" || fCat === "volume" && tCat === "mass")) {
+    const numUnit = strength.numerator.unit.toLowerCase();
+    const denUnit = strength.denominator.unit.toLowerCase();
+    const numCat = getUnitCategory(numUnit);
+    const denCat = getUnitCategory(denUnit);
+    if (numCat !== denCat && numCat !== "other" && denCat !== "other") {
+      const massSide = numCat === "mass" ? strength.numerator : strength.denominator;
+      const volSide = numCat === "volume" ? strength.numerator : strength.denominator;
+      const bridgeDensity = massSide.value * getBaseUnitFactor(massSide.unit) / (volSide.value * getBaseUnitFactor(volSide.unit));
+      if (fCat === "mass") {
+        const valueMg = value * getBaseUnitFactor(fromUnit);
+        const valueMl = valueMg / bridgeDensity;
+        return valueMl / getBaseUnitFactor(toUnit);
+      } else {
+        const valueMl = value * getBaseUnitFactor(fromUnit);
+        const valueMg = valueMl * bridgeDensity;
+        return valueMg / getBaseUnitFactor(toUnit);
+      }
+    }
+  }
+  return null;
+}
+
 // src/unit-lexicon.ts
 var HOUSEHOLD_VOLUME_UNIT_SET = new Set(
   HOUSEHOLD_VOLUME_UNITS.map((unit) => unit.toLowerCase())
 );
+var MASS_DISPENSED_SEMISOLID_DOSAGE_FORMS = /* @__PURE__ */ new Set([
+  "cream",
+  "ointment",
+  "gel",
+  "paste",
+  "cutaneous paste",
+  "vaginal cream",
+  "vaginal gel",
+  "oral gel",
+  "oral paste",
+  "oromucosal gel",
+  "oromucosal paste",
+  "dental gel",
+  "dental paste",
+  "gingival gel",
+  "nasal gel",
+  "eye gel",
+  "eye ointment"
+]);
 var DOSE_UNIT_TERMINOLOGY = unit_terminology_default.terms;
 var DOSE_UNIT_TERMINOLOGY_BY_KEY = /* @__PURE__ */ new Map();
 var DISCRETE_UNIT_KINDS = /* @__PURE__ */ new Set([
@@ -15188,6 +15411,47 @@ function unitApproximationOverride(unit, context) {
   }
   return void 0;
 }
+function normalizeDosageFormKey(form) {
+  var _a2;
+  const normalized = form == null ? void 0 : form.trim().toLowerCase();
+  if (!normalized) {
+    return void 0;
+  }
+  return (_a2 = KNOWN_DOSAGE_FORMS_TO_DOSE[normalized]) != null ? _a2 : normalized;
+}
+function getPreferredMassApproximationUnit(context) {
+  var _a2;
+  const normalizedDosageForm = normalizeDosageFormKey(context == null ? void 0 : context.dosageForm);
+  if (!normalizedDosageForm || !MASS_DISPENSED_SEMISOLID_DOSAGE_FORMS.has(normalizedDosageForm)) {
+    return void 0;
+  }
+  const containerUnit = (_a2 = context == null ? void 0 : context.containerUnit) == null ? void 0 : _a2.trim();
+  if (containerUnit && getUnitCategory(containerUnit) === "mass") {
+    return containerUnit;
+  }
+  const defaultUnit = normalizedDosageForm ? DEFAULT_UNIT_BY_NORMALIZED_FORM[normalizedDosageForm] : void 0;
+  return defaultUnit && getUnitCategory(defaultUnit) === "mass" ? defaultUnit : void 0;
+}
+function bridgeApproximationToMassDispensedTopical(approximation, context) {
+  const preferredMassUnit = getPreferredMassApproximationUnit(context);
+  if (!preferredMassUnit || getUnitCategory(approximation.unit) !== "volume") {
+    return approximation;
+  }
+  const sourceVolumeFactor = VOLUME_UNITS[approximation.unit.toLowerCase()];
+  const targetMassFactor = MASS_UNITS[preferredMassUnit.toLowerCase()];
+  if (!sourceVolumeFactor || !targetMassFactor) {
+    return approximation;
+  }
+  const valueMl = approximation.value * sourceVolumeFactor;
+  const valueG = valueMl;
+  const convertedValue = valueG * MASS_UNITS.g / targetMassFactor;
+  const bridgeBasis = "Mass-dispensed semisolid topical default bridge assumes 1 mL approximately equals 1 g unless a product-specific override is provided";
+  return __spreadProps(__spreadValues({}, approximation), {
+    value: convertedValue,
+    unit: preferredMassUnit,
+    basis: approximation.basis ? `${approximation.basis}; ${bridgeBasis}` : bridgeBasis
+  });
+}
 function getDoseUnitTerminologyEntry(unit) {
   var _a2;
   if (!unit) {
@@ -15209,7 +15473,11 @@ function getDoseUnitApproximation(unit, context) {
   if (override) {
     return override;
   }
-  return terminologyEntry == null ? void 0 : terminologyEntry.approximateQuantity;
+  const approximation = terminologyEntry == null ? void 0 : terminologyEntry.approximateQuantity;
+  if (!approximation) {
+    return void 0;
+  }
+  return bridgeApproximationToMassDispensedTopical(approximation, context);
 }
 function getDoseUnitSemantics(unit, context) {
   if (!unit) {
@@ -16456,6 +16724,64 @@ function productLexicalRule() {
 }
 function matchCompoundDoseUnit(context, start, lower) {
   var _a2;
+  const MAX_SITE_CONTEXT_TOKENS = 3;
+  const hasSiteMeaning = (lowerValue) => {
+    var _a3, _b, _c;
+    return Boolean(
+      lowerValue && (DEFAULT_BODY_SITE_SNOMED[normalizeBodySiteKey(lowerValue)] || resolveBodySitePhrase(lowerValue, (_a3 = context.options) == null ? void 0 : _a3.siteCodeMap, {
+        bodySiteContext: (_c = (_b = context.options) == null ? void 0 : _b.context) == null ? void 0 : _c.bodySiteContext
+      }))
+    );
+  };
+  const collectForwardSitePhrases = (phraseStart) => {
+    const parts = [];
+    const phrases = [];
+    for (let index = phraseStart; index < context.limit && parts.length < MAX_SITE_CONTEXT_TOKENS; index += 1) {
+      const token = context.tokens[index];
+      if (!token || context.state.consumed.has(token.index)) {
+        break;
+      }
+      const lowerValue = normalizeTokenLower(token);
+      if (!lowerValue || isPunctuation(lowerValue)) {
+        break;
+      }
+      parts.push(lowerValue);
+      phrases.push(parts.join(" "));
+    }
+    return phrases;
+  };
+  const matchesSiteContext = () => {
+    const next = context.tokens[start + 1];
+    const nextLower = next && !context.state.consumed.has(next.index) ? normalizeTokenLower(next) : void 0;
+    if (nextLower && (ROUTE_SITE_PREPOSITIONS.has(nextLower) || SITE_ANCHORS.has(nextLower))) {
+      const followingSitePhrases = collectForwardSitePhrases(start + 2);
+      if (followingSitePhrases.some((phrase) => hasSiteMeaning(phrase))) {
+        return true;
+      }
+    }
+    const previous = context.tokens[start - 1];
+    const previousLower = previous && !context.state.consumed.has(previous.index) ? normalizeTokenLower(previous) : void 0;
+    const trailingNumberBeforeUnit = Boolean(
+      previousLower && /^[0-9]+(?:\.[0-9]+)?$/.test(previousLower)
+    );
+    const siteEnd = start - (trailingNumberBeforeUnit ? 2 : 1);
+    for (let phraseLength = 1; phraseLength <= MAX_SITE_CONTEXT_TOKENS; phraseLength += 1) {
+      const phraseStart = siteEnd - phraseLength + 1;
+      if (phraseStart < 0) {
+        break;
+      }
+      const precedingAnchor = context.tokens[phraseStart - 1];
+      const precedingAnchorLower = precedingAnchor && !context.state.consumed.has(precedingAnchor.index) ? normalizeTokenLower(precedingAnchor) : void 0;
+      if (!precedingAnchorLower || !ROUTE_SITE_PREPOSITIONS.has(precedingAnchorLower) && !SITE_ANCHORS.has(precedingAnchorLower)) {
+        continue;
+      }
+      const phrase = collectForwardSitePhrases(phraseStart)[phraseLength - 1];
+      if (hasSiteMeaning(phrase)) {
+        return true;
+      }
+    }
+    return false;
+  };
   for (const compound of COMPOUND_DOSE_UNITS) {
     if (compound.head !== lower) {
       continue;
@@ -16485,6 +16811,10 @@ function matchCompoundDoseUnit(context, start, lower) {
         return head ? { unit: compound.unit, tokens: [head, next] } : void 0;
       }
     }
+    if (compound.requiresSiteContext && matchesSiteContext()) {
+      const head = context.tokens[start];
+      return head ? { unit: compound.unit, tokens: [head] } : void 0;
+    }
   }
   return void 0;
 }
@@ -19682,73 +20012,6 @@ function suggestSig(input, options) {
   );
 }
 
-// src/utils/units.ts
-var MASS_UNITS = {
-  kg: 1e6,
-  g: 1e3,
-  mg: 1,
-  mcg: 1e-3,
-  ug: 1e-3,
-  microg: 1e-3,
-  ng: 1e-6
-};
-var VOLUME_UNITS = {
-  l: 1e3,
-  dl: 100,
-  ml: 1,
-  ul: 1e-3,
-  microl: 1e-3,
-  cm3: 1,
-  tsp: 5,
-  tbsp: 15
-};
-function getUnitCategory(unit) {
-  if (!unit) return "other";
-  const u = unit.toLowerCase();
-  if (MASS_UNITS[u] !== void 0) return "mass";
-  if (VOLUME_UNITS[u] !== void 0) return "volume";
-  return "other";
-}
-function getBaseUnitFactor(unit) {
-  var _a2, _b;
-  if (!unit) return 1;
-  const u = unit.toLowerCase();
-  return (_b = (_a2 = MASS_UNITS[u]) != null ? _a2 : VOLUME_UNITS[u]) != null ? _b : 1;
-}
-function convertValue(value, fromUnit, toUnit, strength) {
-  const f = fromUnit.toLowerCase();
-  const t = toUnit.toLowerCase();
-  if (f === t) return value;
-  const fCat = getUnitCategory(f);
-  const tCat = getUnitCategory(t);
-  if (fCat === tCat && fCat !== "other") {
-    const fFactor = getBaseUnitFactor(f);
-    const tFactor = getBaseUnitFactor(t);
-    return value * fFactor / tFactor;
-  }
-  if (strength && (fCat === "mass" && tCat === "volume" || fCat === "volume" && tCat === "mass")) {
-    const numUnit = strength.numerator.unit.toLowerCase();
-    const denUnit = strength.denominator.unit.toLowerCase();
-    const numCat = getUnitCategory(numUnit);
-    const denCat = getUnitCategory(denUnit);
-    if (numCat !== denCat && numCat !== "other" && denCat !== "other") {
-      const massSide = numCat === "mass" ? strength.numerator : strength.denominator;
-      const volSide = numCat === "volume" ? strength.numerator : strength.denominator;
-      const bridgeDensity = massSide.value * getBaseUnitFactor(massSide.unit) / (volSide.value * getBaseUnitFactor(volSide.unit));
-      if (fCat === "mass") {
-        const valueMg = value * getBaseUnitFactor(fromUnit);
-        const valueMl = valueMg / bridgeDensity;
-        return valueMl / getBaseUnitFactor(toUnit);
-      } else {
-        const valueMl = value * getBaseUnitFactor(fromUnit);
-        const valueMg = valueMl * bridgeDensity;
-        return valueMg / getBaseUnitFactor(toUnit);
-      }
-    }
-  }
-  return null;
-}
-
 // src/utils/strength.ts
 function parseStrength(strength, context) {
   var _a2, _b, _c;
@@ -20188,6 +20451,24 @@ function estimateIngredientQuantity(quantity, context) {
   if (!(numerator == null ? void 0 : numerator.unit) || numerator.value === void 0 || !(denominator == null ? void 0 : denominator.unit) || denominator.value === void 0) {
     return void 0;
   }
+  const quantityCategory = getUnitCategory(quantity.unit);
+  const denominatorCategory = getUnitCategory(denominator.unit);
+  if (quantityCategory !== "other" && quantityCategory === denominatorCategory) {
+    const quantityInDenominatorBase = quantity.value * getBaseUnitFactor(quantity.unit);
+    const denominatorInBase = denominator.value * getBaseUnitFactor(denominator.unit);
+    const numeratorInBase = numerator.value * getBaseUnitFactor(numerator.unit);
+    if (denominatorInBase !== 0) {
+      return {
+        value: roundCalculatedUnits(
+          quantityInDenominatorBase * numeratorInBase / denominatorInBase / getBaseUnitFactor(numerator.unit)
+        ),
+        unit: numerator.unit,
+        confidence: quantity.confidence,
+        basis: quantity.basis,
+        source: quantity.source
+      };
+    }
+  }
   const converted = convertValue(
     quantity.value,
     quantity.unit,

package/dist/index.js

@@ -2152,6 +2152,14 @@ var DEFAULT_BODY_SITE_SNOMED_SOURCE = [
     names: ["axilla", "axillae", "armpit", "armpits"],
     definition: { coding: { code: "34797008", display: "Axilla structure" }, routeHint: RouteCode["Topical route"] }
   },
+  {
+    names: ["axillary hair", "armpit hair", "armpit hairs", "underarm hair", "underarm hairs"],
+    definition: {
+      coding: { code: "75703003", display: "Structure of hair of axilla" },
+      text: "axillary hair",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
   {
     names: ["groin"],
     definition: { coding: { code: "26893007", display: "Inguinal region structure" }, routeHint: RouteCode["Topical route"] }
@@ -2222,6 +2230,71 @@ var DEFAULT_BODY_SITE_SNOMED_SOURCE = [
     names: ["face"],
     definition: { coding: { code: "89545001", display: "Face" }, routeHint: RouteCode["Topical route"] }
   },
+  {
+    names: ["eyebrow", "brow"],
+    definition: {
+      coding: { code: "392262008", display: "Eyebrow structure" },
+      text: "eyebrow",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["eyebrows", "brows"],
+    definition: {
+      coding: { code: "392262008", display: "Eyebrow structure" },
+      text: "eyebrows",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["left eyebrow", "left brow"],
+    definition: {
+      coding: { code: "722011002", display: "Structure of eyebrow of left eye region" },
+      text: "left eyebrow",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["right eyebrow", "right brow"],
+    definition: {
+      coding: { code: "722012009", display: "Structure of eyebrow of right eye region" },
+      text: "right eyebrow",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: [
+      "both eyebrows",
+      "bilateral eyebrows",
+      "each eyebrow",
+      "left and right eyebrow",
+      "left and right eyebrows",
+      "right and left eyebrow",
+      "right and left eyebrows",
+      "left right eyebrow",
+      "left right eyebrows"
+    ],
+    definition: {
+      coding: {
+        code: buildSnomedBodySiteLateralityPostcoordinationCode(
+          "392262008",
+          SNOMED_CT_BILATERAL_QUALIFIER_CODE
+        ),
+        display: "both eyebrows"
+      },
+      text: "both eyebrows",
+      administrationTargetCount: 2,
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["eyebrow hair", "eyebrow hairs", "brow hair", "brow hairs"],
+    definition: {
+      coding: { code: "392261001", display: "Hair structure of eyebrow" },
+      text: "eyebrow hair",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
   {
     names: ["eyelid", "eyelids"],
     definition: { coding: { code: "80243003", display: "Eyelid" }, routeHint: RouteCode["Ophthalmic route"] }
@@ -2342,6 +2415,30 @@ var DEFAULT_BODY_SITE_SNOMED_SOURCE = [
     names: ["perineum"],
     definition: { coding: { code: "243990009", display: "Entire perineum" }, routeHint: RouteCode["Topical route"] }
   },
+  {
+    names: ["mustache", "moustache", "mustache hair", "moustache hair"],
+    definition: {
+      coding: { code: "256925006", display: "Structure of hair of mustache" },
+      text: "mustache",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["beard", "beard hair", "facial hair"],
+    definition: {
+      coding: { code: "367576007", display: "Structure of beard hair" },
+      text: "beard",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["pubic hair"],
+    definition: {
+      coding: { code: "75776007", display: "Structure of hair of pubis" },
+      text: "pubic hair",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
   {
     names: ["skin"],
     definition: { coding: { code: "181469002", display: "Entire skin" }, routeHint: RouteCode["Topical route"] }
@@ -2352,6 +2449,38 @@ var DEFAULT_BODY_SITE_SNOMED_SOURCE = [
       coding: { code: "386045008", display: "Hair structure (body structure)" },
       routeHint: RouteCode["Topical route"]
     }
+  },
+  {
+    names: ["joint"],
+    definition: {
+      coding: { code: "39352004", display: "Joint structure" },
+      text: "joint",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["joints"],
+    definition: {
+      coding: { code: "81087007", display: "Joints" },
+      text: "joints",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["finger joint", "finger joints"],
+    definition: {
+      coding: { code: "125682004", display: "Finger joint structure" },
+      text: "finger joints",
+      routeHint: RouteCode["Topical route"]
+    }
+  },
+  {
+    names: ["knuckle", "knuckles"],
+    definition: {
+      coding: { code: "70420003", display: "Metacarpophalangeal joint structure" },
+      text: "knuckles",
+      routeHint: RouteCode["Topical route"]
+    }
   }
 ];
 var DEFAULT_BODY_SITE_SNOMED = objectFromEntries(
@@ -4263,6 +4392,7 @@ var lexical_classes_default = {
     "Use shampoo": "\u0E2A\u0E23\u0E30"
   },
   compoundDoseUnits: [
+    { head: "cm", tails: [], requiresSiteContext: true, unit: "cm line" },
     { head: "cm", tails: ["ribbon", "ribbons"], unit: "cm ribbon" },
     { head: "cm", tails: ["strip", "strips"], unit: "cm strip" },
     { head: "cm", tails: ["line", "lines"], unit: "cm line" },
@@ -4271,6 +4401,8 @@ var lexical_classes_default = {
     { head: "fingertip", tails: ["unit", "units"], unit: "FTU" },
     { head: "eye", tails: ["drop", "drops"], unit: "drop" },
     { head: "pea-sized", tails: ["amount"], unit: "pea-sized amount" },
+    { head: "pea-size", tails: ["amount"], unit: "pea-sized amount" },
+    { head: "peasize", tails: [], tailSequences: [[]], unit: "pea-sized amount" },
     { head: "\u0E40\u0E21\u0E47\u0E14\u0E16\u0E31\u0E48\u0E27", tails: [], unit: "pea-sized amount" },
     { head: "\u0E40\u0E21\u0E47\u0E14\u0E16\u0E31\u0E48\u0E27\u0E40\u0E02\u0E35\u0E22\u0E27", tails: [], unit: "pea-sized amount" },
     { head: "\u0E40\u0E21\u0E25\u0E47\u0E14\u0E16\u0E31\u0E48\u0E27", tails: [], unit: "pea-sized amount" },
@@ -4280,7 +4412,7 @@ var lexical_classes_default = {
     {
       head: "pea",
       tails: [],
-      tailSequences: [["sized", "amount"], ["size", "amount"]],
+      tailSequences: [["sized", "amount"], ["size", "amount"], ["amount"], ["sized"], ["size"], []],
       unit: "pea-sized amount"
     },
     { head: "hand", tails: ["print", "prints"], unit: "handprint" },
@@ -14926,6 +15058,11 @@ var unit_terminology_default = {
       unit: "pea-sized amount",
       kind: "product_specific_amount",
       aliases: [
+        "pea",
+        "pea amount",
+        "peasize",
+        "pea-size",
+        "pea size",
         "pea sized amount",
         "pea-sized",
         "pea sized",
@@ -15022,10 +15159,96 @@ var unit_terminology_default = {
   ]
 };
 
+// src/utils/units.ts
+var MASS_UNITS = {
+  kg: 1e6,
+  g: 1e3,
+  mg: 1,
+  mcg: 1e-3,
+  ug: 1e-3,
+  microg: 1e-3,
+  ng: 1e-6
+};
+var VOLUME_UNITS = {
+  l: 1e3,
+  dl: 100,
+  ml: 1,
+  ul: 1e-3,
+  microl: 1e-3,
+  cm3: 1,
+  tsp: 5,
+  tbsp: 15
+};
+function getUnitCategory(unit) {
+  if (!unit) return "other";
+  const u = unit.toLowerCase();
+  if (MASS_UNITS[u] !== void 0) return "mass";
+  if (VOLUME_UNITS[u] !== void 0) return "volume";
+  return "other";
+}
+function getBaseUnitFactor(unit) {
+  var _a2, _b;
+  if (!unit) return 1;
+  const u = unit.toLowerCase();
+  return (_b = (_a2 = MASS_UNITS[u]) != null ? _a2 : VOLUME_UNITS[u]) != null ? _b : 1;
+}
+function convertValue(value, fromUnit, toUnit, strength) {
+  const f = fromUnit.toLowerCase();
+  const t = toUnit.toLowerCase();
+  if (f === t) return value;
+  const fCat = getUnitCategory(f);
+  const tCat = getUnitCategory(t);
+  if (fCat === tCat && fCat !== "other") {
+    const fFactor = getBaseUnitFactor(f);
+    const tFactor = getBaseUnitFactor(t);
+    return value * fFactor / tFactor;
+  }
+  if (strength && (fCat === "mass" && tCat === "volume" || fCat === "volume" && tCat === "mass")) {
+    const numUnit = strength.numerator.unit.toLowerCase();
+    const denUnit = strength.denominator.unit.toLowerCase();
+    const numCat = getUnitCategory(numUnit);
+    const denCat = getUnitCategory(denUnit);
+    if (numCat !== denCat && numCat !== "other" && denCat !== "other") {
+      const massSide = numCat === "mass" ? strength.numerator : strength.denominator;
+      const volSide = numCat === "volume" ? strength.numerator : strength.denominator;
+      const bridgeDensity = massSide.value * getBaseUnitFactor(massSide.unit) / (volSide.value * getBaseUnitFactor(volSide.unit));
+      if (fCat === "mass") {
+        const valueMg = value * getBaseUnitFactor(fromUnit);
+        const valueMl = valueMg / bridgeDensity;
+        return valueMl / getBaseUnitFactor(toUnit);
+      } else {
+        const valueMl = value * getBaseUnitFactor(fromUnit);
+        const valueMg = valueMl * bridgeDensity;
+        return valueMg / getBaseUnitFactor(toUnit);
+      }
+    }
+  }
+  return null;
+}
+
 // src/unit-lexicon.ts
 var HOUSEHOLD_VOLUME_UNIT_SET = new Set(
   HOUSEHOLD_VOLUME_UNITS.map((unit) => unit.toLowerCase())
 );
+var MASS_DISPENSED_SEMISOLID_DOSAGE_FORMS = /* @__PURE__ */ new Set([
+  "cream",
+  "ointment",
+  "gel",
+  "paste",
+  "cutaneous paste",
+  "vaginal cream",
+  "vaginal gel",
+  "oral gel",
+  "oral paste",
+  "oromucosal gel",
+  "oromucosal paste",
+  "dental gel",
+  "dental paste",
+  "gingival gel",
+  "nasal gel",
+  "eye gel",
+  "eye ointment"
+]);
 var DOSE_UNIT_TERMINOLOGY = unit_terminology_default.terms;
 var DOSE_UNIT_TERMINOLOGY_BY_KEY = /* @__PURE__ */ new Map();
 var DISCRETE_UNIT_KINDS = /* @__PURE__ */ new Set([
@@ -15088,6 +15311,47 @@ function unitApproximationOverride(unit, context) {
   }
   return void 0;
 }
+function normalizeDosageFormKey(form) {
+  var _a2;
+  const normalized = form == null ? void 0 : form.trim().toLowerCase();
+  if (!normalized) {
+    return void 0;
+  }
+  return (_a2 = KNOWN_DOSAGE_FORMS_TO_DOSE[normalized]) != null ? _a2 : normalized;
+}
+function getPreferredMassApproximationUnit(context) {
+  var _a2;
+  const normalizedDosageForm = normalizeDosageFormKey(context == null ? void 0 : context.dosageForm);
+  if (!normalizedDosageForm || !MASS_DISPENSED_SEMISOLID_DOSAGE_FORMS.has(normalizedDosageForm)) {
+    return void 0;
+  }
+  const containerUnit = (_a2 = context == null ? void 0 : context.containerUnit) == null ? void 0 : _a2.trim();
+  if (containerUnit && getUnitCategory(containerUnit) === "mass") {
+    return containerUnit;
+  }
+  const defaultUnit = normalizedDosageForm ? DEFAULT_UNIT_BY_NORMALIZED_FORM[normalizedDosageForm] : void 0;
+  return defaultUnit && getUnitCategory(defaultUnit) === "mass" ? defaultUnit : void 0;
+}
+function bridgeApproximationToMassDispensedTopical(approximation, context) {
+  const preferredMassUnit = getPreferredMassApproximationUnit(context);
+  if (!preferredMassUnit || getUnitCategory(approximation.unit) !== "volume") {
+    return approximation;
+  }
+  const sourceVolumeFactor = VOLUME_UNITS[approximation.unit.toLowerCase()];
+  const targetMassFactor = MASS_UNITS[preferredMassUnit.toLowerCase()];
+  if (!sourceVolumeFactor || !targetMassFactor) {
+    return approximation;
+  }
+  const valueMl = approximation.value * sourceVolumeFactor;
+  const valueG = valueMl;
+  const convertedValue = valueG * MASS_UNITS.g / targetMassFactor;
+  const bridgeBasis = "Mass-dispensed semisolid topical default bridge assumes 1 mL approximately equals 1 g unless a product-specific override is provided";
+  return __spreadProps(__spreadValues({}, approximation), {
+    value: convertedValue,
+    unit: preferredMassUnit,
+    basis: approximation.basis ? `${approximation.basis}; ${bridgeBasis}` : bridgeBasis
+  });
+}
 function getDoseUnitTerminologyEntry(unit) {
   var _a2;
   if (!unit) {
@@ -15109,7 +15373,11 @@ function getDoseUnitApproximation(unit, context) {
   if (override) {
     return override;
   }
-  return terminologyEntry == null ? void 0 : terminologyEntry.approximateQuantity;
+  const approximation = terminologyEntry == null ? void 0 : terminologyEntry.approximateQuantity;
+  if (!approximation) {
+    return void 0;
+  }
+  return bridgeApproximationToMassDispensedTopical(approximation, context);
 }
 function getDoseUnitSemantics(unit, context) {
   if (!unit) {
@@ -16356,6 +16624,64 @@ function productLexicalRule() {
 }
 function matchCompoundDoseUnit(context, start, lower) {
   var _a2;
+  const MAX_SITE_CONTEXT_TOKENS = 3;
+  const hasSiteMeaning = (lowerValue) => {
+    var _a3, _b, _c;
+    return Boolean(
+      lowerValue && (DEFAULT_BODY_SITE_SNOMED[normalizeBodySiteKey(lowerValue)] || resolveBodySitePhrase(lowerValue, (_a3 = context.options) == null ? void 0 : _a3.siteCodeMap, {
+        bodySiteContext: (_c = (_b = context.options) == null ? void 0 : _b.context) == null ? void 0 : _c.bodySiteContext
+      }))
+    );
+  };
+  const collectForwardSitePhrases = (phraseStart) => {
+    const parts = [];
+    const phrases = [];
+    for (let index = phraseStart; index < context.limit && parts.length < MAX_SITE_CONTEXT_TOKENS; index += 1) {
+      const token = context.tokens[index];
+      if (!token || context.state.consumed.has(token.index)) {
+        break;
+      }
+      const lowerValue = normalizeTokenLower(token);
+      if (!lowerValue || isPunctuation(lowerValue)) {
+        break;
+      }
+      parts.push(lowerValue);
+      phrases.push(parts.join(" "));
+    }
+    return phrases;
+  };
+  const matchesSiteContext = () => {
+    const next = context.tokens[start + 1];
+    const nextLower = next && !context.state.consumed.has(next.index) ? normalizeTokenLower(next) : void 0;
+    if (nextLower && (ROUTE_SITE_PREPOSITIONS.has(nextLower) || SITE_ANCHORS.has(nextLower))) {
+      const followingSitePhrases = collectForwardSitePhrases(start + 2);
+      if (followingSitePhrases.some((phrase) => hasSiteMeaning(phrase))) {
+        return true;
+      }
+    }
+    const previous = context.tokens[start - 1];
+    const previousLower = previous && !context.state.consumed.has(previous.index) ? normalizeTokenLower(previous) : void 0;
+    const trailingNumberBeforeUnit = Boolean(
+      previousLower && /^[0-9]+(?:\.[0-9]+)?$/.test(previousLower)
+    );
+    const siteEnd = start - (trailingNumberBeforeUnit ? 2 : 1);
+    for (let phraseLength = 1; phraseLength <= MAX_SITE_CONTEXT_TOKENS; phraseLength += 1) {
+      const phraseStart = siteEnd - phraseLength + 1;
+      if (phraseStart < 0) {
+        break;
+      }
+      const precedingAnchor = context.tokens[phraseStart - 1];
+      const precedingAnchorLower = precedingAnchor && !context.state.consumed.has(precedingAnchor.index) ? normalizeTokenLower(precedingAnchor) : void 0;
+      if (!precedingAnchorLower || !ROUTE_SITE_PREPOSITIONS.has(precedingAnchorLower) && !SITE_ANCHORS.has(precedingAnchorLower)) {
+        continue;
+      }
+      const phrase = collectForwardSitePhrases(phraseStart)[phraseLength - 1];
+      if (hasSiteMeaning(phrase)) {
+        return true;
+      }
+    }
+    return false;
+  };
   for (const compound of COMPOUND_DOSE_UNITS) {
     if (compound.head !== lower) {
       continue;
@@ -16385,6 +16711,10 @@ function matchCompoundDoseUnit(context, start, lower) {
         return head ? { unit: compound.unit, tokens: [head, next] } : void 0;
       }
     }
+    if (compound.requiresSiteContext && matchesSiteContext()) {
+      const head = context.tokens[start];
+      return head ? { unit: compound.unit, tokens: [head] } : void 0;
+    }
   }
   return void 0;
 }
@@ -19582,73 +19912,6 @@ function suggestSig(input, options) {
   );
 }
 
-// src/utils/units.ts
-var MASS_UNITS = {
-  kg: 1e6,
-  g: 1e3,
-  mg: 1,
-  mcg: 1e-3,
-  ug: 1e-3,
-  microg: 1e-3,
-  ng: 1e-6
-};
-var VOLUME_UNITS = {
-  l: 1e3,
-  dl: 100,
-  ml: 1,
-  ul: 1e-3,
-  microl: 1e-3,
-  cm3: 1,
-  tsp: 5,
-  tbsp: 15
-};
-function getUnitCategory(unit) {
-  if (!unit) return "other";
-  const u = unit.toLowerCase();
-  if (MASS_UNITS[u] !== void 0) return "mass";
-  if (VOLUME_UNITS[u] !== void 0) return "volume";
-  return "other";
-}
-function getBaseUnitFactor(unit) {
-  var _a2, _b;
-  if (!unit) return 1;
-  const u = unit.toLowerCase();
-  return (_b = (_a2 = MASS_UNITS[u]) != null ? _a2 : VOLUME_UNITS[u]) != null ? _b : 1;
-}
-function convertValue(value, fromUnit, toUnit, strength) {
-  const f = fromUnit.toLowerCase();
-  const t = toUnit.toLowerCase();
-  if (f === t) return value;
-  const fCat = getUnitCategory(f);
-  const tCat = getUnitCategory(t);
-  if (fCat === tCat && fCat !== "other") {
-    const fFactor = getBaseUnitFactor(f);
-    const tFactor = getBaseUnitFactor(t);
-    return value * fFactor / tFactor;
-  }
-  if (strength && (fCat === "mass" && tCat === "volume" || fCat === "volume" && tCat === "mass")) {
-    const numUnit = strength.numerator.unit.toLowerCase();
-    const denUnit = strength.denominator.unit.toLowerCase();
-    const numCat = getUnitCategory(numUnit);
-    const denCat = getUnitCategory(denUnit);
-    if (numCat !== denCat && numCat !== "other" && denCat !== "other") {
-      const massSide = numCat === "mass" ? strength.numerator : strength.denominator;
-      const volSide = numCat === "volume" ? strength.numerator : strength.denominator;
-      const bridgeDensity = massSide.value * getBaseUnitFactor(massSide.unit) / (volSide.value * getBaseUnitFactor(volSide.unit));
-      if (fCat === "mass") {
-        const valueMg = value * getBaseUnitFactor(fromUnit);
-        const valueMl = valueMg / bridgeDensity;
-        return valueMl / getBaseUnitFactor(toUnit);
-      } else {
-        const valueMl = value * getBaseUnitFactor(fromUnit);
-        const valueMg = valueMl * bridgeDensity;
-        return valueMg / getBaseUnitFactor(toUnit);
-      }
-    }
-  }
-  return null;
-}
-
 // src/utils/strength.ts
 function parseStrength(strength, context) {
   var _a2, _b, _c;
@@ -20088,6 +20351,24 @@ function estimateIngredientQuantity(quantity, context) {
   if (!(numerator == null ? void 0 : numerator.unit) || numerator.value === void 0 || !(denominator == null ? void 0 : denominator.unit) || denominator.value === void 0) {
     return void 0;
   }
+  const quantityCategory = getUnitCategory(quantity.unit);
+  const denominatorCategory = getUnitCategory(denominator.unit);
+  if (quantityCategory !== "other" && quantityCategory === denominatorCategory) {
+    const quantityInDenominatorBase = quantity.value * getBaseUnitFactor(quantity.unit);
+    const denominatorInBase = denominator.value * getBaseUnitFactor(denominator.unit);
+    const numeratorInBase = numerator.value * getBaseUnitFactor(numerator.unit);
+    if (denominatorInBase !== 0) {
+      return {
+        value: roundCalculatedUnits(
+          quantityInDenominatorBase * numeratorInBase / denominatorInBase / getBaseUnitFactor(numerator.unit)
+        ),
+        unit: numerator.unit,
+        confidence: quantity.confidence,
+        basis: quantity.basis,
+        source: quantity.source
+      };
+    }
+  }
   const converted = convertValue(
     quantity.value,
     quantity.unit,

package/dist/types.d.ts

@@ -301,9 +301,14 @@ export declare enum FhirDayOfWeek {
     Saturday = "sat",
     Sunday = "sun"
 }
+export interface FhirPeriod {
+    start?: string;
+    end?: string;
+}
 export interface FhirTimingRepeat {
     count?: number;
     boundsDuration?: FhirQuantity;
+    boundsPeriod?: FhirPeriod;
     boundsRange?: FhirRange;
     frequency?: number;
     frequencyMax?: number;

package/package.json

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