@cosyte/terminology 0.1.5 → 0.1.6

package/dist/index.mjs

@@ -210,7 +210,7 @@ var FATAL_CODES = {
   /**
    * An **inversion** of a directional crosswalk was requested: a forbidden operation. The GEMs and
    * the SNOMED→ICD-10-CM map are authoritative in **one direction only**; a forward map is not the
-   * inverse of the backward map. Thrown by {@link ../crosswalk/gems.invertGem} so the
+   * inverse of the backward map. Thrown by {@link invertGem} so the
    * never-invert refusal is a first-class, discoverable contract rather than a silent absence.
    */
   TERM_MAP_NOT_INVERTIBLE: "TERM_MAP_NOT_INVERTIBLE"
@@ -762,10 +762,10 @@ function parseCsvSource(source) {
   const codeIdx = requireHeader(header, source.columns.code, "code");
   const displayIdx = requireHeader(header, source.columns.display, "display");
   const statusIdx = source.columns.status !== void 0 ? requireHeader(header, source.columns.status, "status") : void 0;
-  const propIdx = (source.columns.properties ?? []).map((n) => ({
-    name: n,
-    index: requireHeader(header, n, "property")
-  }));
+  const propIdx = [];
+  for (const n of source.columns.properties ?? []) {
+    propIdx.push({ name: n, index: requireHeader(header, n, "property") });
+  }
   const needCols = Math.max(codeIdx, displayIdx, statusIdx ?? 0, ...propIdx.map((p) => p.index)) + 1;
   const concepts = /* @__PURE__ */ new Map();
   for (let r = 1; r < rows.length; r++) {
@@ -854,9 +854,10 @@ function collectConcepts(rawConcepts, into, warnings, parentCode) {
     if (code !== void 0 && code !== "" && !into.has(code)) {
       const props = [];
       for (const p of getArray(raw, "property") ?? []) {
+        if (!isJsonObject(p)) continue;
         const pcode = getString(p, "code");
         if (pcode === void 0) continue;
-        const value = isJsonObject(p) ? readPropertyValue(p) : void 0;
+        const value = readPropertyValue(p);
         if (value !== void 0) props.push(Object.freeze({ code: pcode, value }));
       }
       if (parentCode !== void 0 && !props.some((p) => p.code === "parent" && p.value === parentCode)) {
@@ -919,9 +920,21 @@ var ICD10CM_ORDER_FILE_FIELDS = Object.freeze({
     Object.freeze({ name: "shortDescription", slice: Object.freeze({ start: 16, end: 76 }) })
   ])
 });
+function requirePropertyFields(fields) {
+  for (const p of fields.properties ?? []) {
+    const entry = p;
+    if (typeof entry !== "object" || entry === null) {
+      throw new TerminologyError(
+        FATAL_CODES.TERM_CODESYSTEM_MALFORMED,
+        "fixed-width source: a configured property field is not an object"
+      );
+    }
+  }
+}
 function parseFixedWidth(source) {
   const statusMap = source.statusMap ?? defaultStatusMapper;
   const fields = source.fields;
+  requirePropertyFields(fields);
   const concepts = /* @__PURE__ */ new Map();
   const warnings = [];
   const lines = source.content.split(/\r?\n/);
@@ -983,7 +996,16 @@ function parseRrfLine(line) {
 function maxColumn(source) {
   const { code, display, status, properties } = source.columns;
   let max = Math.max(code, display, status ?? 0);
-  for (const p of properties ?? []) max = Math.max(max, p.column);
+  for (const p of properties ?? []) {
+    const entry = p;
+    if (typeof entry !== "object" || entry === null) {
+      throw new TerminologyError(
+        FATAL_CODES.TERM_CODESYSTEM_MALFORMED,
+        "RRF source: a configured property column is not an object"
+      );
+    }
+    max = Math.max(max, p.column);
+  }
   return max;
 }
 function cell(cells, index) {
@@ -1390,8 +1412,7 @@ function makeCoding(system, code, display, version) {
   return coding(init);
 }
 function cannotExpand(detail, path) {
-  const d = { code: "TERM_VALUESET_CANNOT_EXPAND", detail };
-  if (path !== void 0) d.path = path;
+  const d = { code: "TERM_VALUESET_CANNOT_EXPAND", detail, path };
   return Object.freeze(d);
 }
 function truncated(detail, path) {
@@ -1405,9 +1426,9 @@ function truncated(detail, path) {
 function enumeratedUndefined(detail, path) {
   const d = {
     code: "TERM_VALUESET_ENUMERATED_CODE_UNDEFINED",
-    detail
+    detail,
+    path
   };
-  if (path !== void 0) d.path = path;
   return Object.freeze(d);
 }
 function expansionIncompleteDetail(unclosed) {
@@ -1441,7 +1462,8 @@ function screenActive(members, component, ctx) {
 }
 function underPath(d, prefix) {
   const out = { code: d.code, detail: d.detail };
-  out.path = d.path === void 0 ? prefix : `${prefix}/${d.path}`;
+  if (d.path === void 0) out.path = prefix;
+  else out.path = `${prefix}/${d.path}`;
   return Object.freeze(out);
 }
 function intersectInto(into, other) {
@@ -1637,8 +1659,7 @@ function expand(vs, ctx = {}) {
 
 // src/valueset/validate.ts
 function cannotExpand2(detail, path) {
-  const d = { code: "TERM_VALUESET_CANNOT_EXPAND", detail };
-  if (path !== void 0) d.path = path;
+  const d = { code: "TERM_VALUESET_CANNOT_EXPAND", detail, path };
   return Object.freeze(d);
 }
 function expansionIncompleteDetail2(unclosed) {
@@ -1656,7 +1677,8 @@ function usableRelease2(component, system, ctx) {
 }
 function underPath2(d, prefix) {
   const out = { code: d.code, detail: d.detail };
-  out.path = d.path === void 0 ? prefix : `${prefix}/${d.path}`;
+  if (d.path === void 0) out.path = prefix;
+  else out.path = `${prefix}/${d.path}`;
   return Object.freeze(out);
 }
 function matchComponent(target, component, ctx, visited, path, activeOnly = false) {
@@ -1716,10 +1738,13 @@ function matchComponent(target, component, ctx, visited, path, activeOnly = fals
     }
   }
   if (system !== void 0 && target.system === void 0 && baseComplete) baseMatched = false;
+  if (baseMatched === null && !hasVs) return { matched: false, complete: true, diagnostics };
   let refDefiniteFalse = false;
   let refUndetermined = false;
   if (hasVs) {
+    let refsRead = 0;
     for (const [i, url] of valueSet2.entries()) {
+      refsRead++;
       const refPath = `${path}.valueSet[${String(i)}]`;
       if (visited.has(url)) {
         diagnostics.push(cannotExpand2("cyclic value set reference", refPath));
@@ -1740,6 +1765,7 @@ function matchComponent(target, component, ctx, visited, path, activeOnly = fals
         refDefiniteFalse = true;
       }
     }
+    if (refsRead === 0) refDefiniteFalse = true;
   }
   const baseDefiniteFalse = baseMatched === false && baseComplete;
   const baseDefiniteTrue = baseMatched === null || baseMatched === true && baseComplete;
@@ -3991,6 +4017,9 @@ function atBoundary(s, pos) {
   const c = s[pos];
   return c === "." || c === "/" || c === ")";
 }
+function prefixRank(m) {
+  return m.prefix ? 1 : 0;
+}
 function simpleMatches(essence, s, pos) {
   const out = [];
   for (const atom of essence.atoms) {
@@ -4005,7 +4034,7 @@ function simpleMatches(essence, s, pos) {
       }
     }
   }
-  out.sort((a, b) => b.len - a.len || (a.prefix ? 1 : 0) - (b.prefix ? 1 : 0));
+  out.sort((a, b) => b.len - a.len || prefixRank(a) - prefixRank(b));
   return out;
 }
 var MAX_PAREN_DEPTH = 100;
@@ -4410,7 +4439,7 @@ var MAP_CATEGORIES = {
   NO_MAP: "447638001",
   /** `447639009`: "Map of source concept is context dependent" (needs runtime patient context). */
   CONTEXT_DEPENDENT: "447639009",
-  /** `447640006`: "Source concept is ambiguous" (surface candidates, never pick one). */
+  /** `447640006`: "Source concept is ambiguous" (carried through on the result; the rule decides). */
   AMBIGUOUS: "447640006"
 };
 var NO_MAP_CATEGORIES = /* @__PURE__ */ new Set([MAP_CATEGORIES.NO_MAP]);
@@ -4543,8 +4572,15 @@ function evaluateConjunct(clause, context) {
     const bound = Number(ageMatch[2]);
     if (context.ageYears === void 0 || !Number.isFinite(bound)) return "unknown";
     const age = context.ageYears;
-    const ok = op === "<=" ? age <= bound : op === ">=" ? age >= bound : op === "<" ? age < bound : op === ">" ? age > bound : op === "=" ? age === bound : void 0;
-    if (ok === void 0) return "unknown";
+    let ok;
+    if (op === "<=") ok = age <= bound;
+    else if (op === ">=") ok = age >= bound;
+    else if (op === "<") ok = age < bound;
+    else if (op === ">") ok = age > bound;
+    else {
+      if (op === "=") ok = age === bound;
+      else return "unknown";
+    }
     return ok ? "match" : "no-match";
   }
   return "unknown";
@@ -4963,7 +4999,8 @@ function jaccard(a, b) {
   let inter = 0;
   for (const t of a) if (b.has(t)) inter++;
   const union = a.size + b.size - inter;
-  return union === 0 ? 0 : inter / union;
+  if (union === 0) return 0;
+  return inter / union;
 }
 function approximateMatch(graph, query, options = {}) {
   const minScore = options.minScore ?? 0.34;
@@ -4980,7 +5017,7 @@ function approximateMatch(graph, query, options = {}) {
 }
 
 // src/index.ts
-var VERSION = "0.1.5";
+var VERSION = "0.1.6";
 
 export { COMPLEX_MAP_SOURCE_SYSTEM, DIAGNOSTIC_CODES, FATAL_CODES, HL7_V2_OID_ROOT, HL7_V2_URL_PREFIX, ICD10CM_ORDER_FILE_FIELDS, ICD10CM_SYSTEM, ICD9CM_SYSTEM, MAP_CATEGORIES, NO_MAP_CATEGORIES, RELA, RELA_INVERSE, RXNORM_SYSTEM, SNOMEDCT_SYSTEM, SYSTEM_IDENTITIES, TERM_TYPES, TerminologyError, VERSION, applyComplexMap, applyGem, approximateMatch, asTermType, brandsFor, buildSubsumption, codeableConcept, coding, consistsOf, defaultStatusMapper, doseFormsOf, expand, genericFor, getArray, getBoolean, getConcept, getNumber, getString, ingredientsOf, invertGem, isA, isJsonObject, isSynonymTermType, isUnknownSystem, loadCodeSystem, loadComplexMap, loadConceptMap, loadGems, loadRxNormGraph, loadUcumEssence, loadValueSet, lookup, makeStatus, matchesFilter, parseCsv, parseCsvSource, parseFhirCodeSystem, parseFixedWidth, parseRrf, parseRrfLine, parseUcum, reduce, relatedByRela, resolveNdc, resolveSystem, sliceField, translate, ucumEqual, unsupportedOps, validateCode, validateCodeInValueSet, validateUcum };
 //# sourceMappingURL=index.mjs.map