fhirsmith 0.18.1 → 1.0.0

package/tx/cs/cs-icd11.js

@@ -22,6 +22,7 @@ const { ICD11Expression, parseExpression, axisLabel } = require('./icd11-express
 const { Issue } = require('../library/operation-outcome');
 const { DesignationUse } = require('../library/designations');
 const assert = require('assert');
+const { guarded } = require('../library/sqlite-utilities');
 
 // WHO's own vocabulary for the kinds of text an entity carries, used as designation.use.
 const SCHEMA_NS = 'http://id.who.int/icd/schema';
@@ -100,10 +101,7 @@ class ICD11Services extends BaseCSServices {
   }
 
   close() {
-    if (this.db) {
-      this.db.close();
-      this.db = null;
-    }
+    this.closeDb();
   }
 
   // -- small promise wrappers, so no query below carries callback boilerplate -----------
@@ -116,7 +114,7 @@ class ICD11Services extends BaseCSServices {
 
   #all(sql, params = []) {
     return new Promise((resolve, reject) => {
-      this.db.all(sql, params, (err, rows) => err ? reject(err) : resolve(rows || []));
+      this.db.all(sql, params, guarded(reject, (err, rows) => err ? reject(err) : resolve(rows || [])));
     });
   }
 
@@ -993,12 +991,22 @@ class ICD11ServicesFactory extends CodeSystemFactoryProvider {
 
   id() { return `icd11-${this.systemCode}`; }
 
+  /**
+   * The WHO browser page for the concept, as the ICD-API gives it (browserUrl, kept in the
+   * database: https://icd.who.int/browse/2026-01/mms/en#257068234). A postcoordinated
+   * expression links to its stem.
+   */
+  codeLink(context) {
+    const concept = context && context.tokens ? context.tokens[0]?.concept : context;
+    return concept && concept.browserUrl ? concept.browserUrl : undefined;
+  }
+
   async load() {
     if (this._loaded) return;
     const db = new sqlite3.Database(this.dbPath, sqlite3.OPEN_READONLY);
     try {
       const get = (sql, p) => new Promise((res, rej) =>
-        db.get(sql, p, (e, r) => e ? rej(e) : res(r)));
+        db.get(sql, p, guarded(rej, (e, r) => e ? rej(e) : res(r))));
       const sys = await get('SELECT * FROM system WHERE code = ?', [this.systemCode]);
       if (!sys) {
         throw new Error(`ICD-11 database ${this.dbPath} has no '${this.systemCode}' code system`);
@@ -1007,7 +1015,7 @@ class ICD11ServicesFactory extends CodeSystemFactoryProvider {
       const langs = await get("SELECT value FROM meta WHERE key = 'languages'", []);
       // per-language titles; a database built before system_title existed has none
       const all = (sql, p) => new Promise((res, rej) =>
-        db.all(sql, p, (e, r) => e ? rej(e) : res(r || [])));
+        db.all(sql, p, guarded(rej, (e, r) => e ? rej(e) : res(r || []))));
       const titles = {};
       const hasTitles = await get(
         "SELECT 1 x FROM sqlite_master WHERE type = 'table' AND name = 'system_title'", []);
@@ -1054,8 +1062,8 @@ class ICD11ServicesFactory extends CodeSystemFactoryProvider {
 
     const db = new sqlite3.Database(this.dbPath, sqlite3.OPEN_READONLY);
     try {
-      const get = (sql, p) => new Promise((res, rej) => db.get(sql, p, (e, r) => e ? rej(e) : res(r)));
-      const all = (sql, p) => new Promise((res, rej) => db.all(sql, p, (e, r) => e ? rej(e) : res(r || [])));
+      const get = (sql, p) => new Promise((res, rej) => db.get(sql, p, guarded(rej, (e, r) => e ? rej(e) : res(r))));
+      const all = (sql, p) => new Promise((res, rej) => db.all(sql, p, guarded(rej, (e, r) => e ? rej(e) : res(r || []))));
       const scale = await get(
         `SELECT ps.id, ps.axis, ps.axis_name, ps.required, ps.allow_multiple,
                 c.entity_id, c.code AS stem_code, c.uri AS stem_uri
@@ -1100,14 +1108,14 @@ class ICD11ServicesFactory extends CodeSystemFactoryProvider {
   /** Which code systems a given database holds, so the library can register one each. */
   static listSystems(dbPath) {
     return new Promise((resolve, reject) => {
-      const db = new sqlite3.Database(dbPath, sqlite3.OPEN_READONLY, (err) => {
+      const db = new sqlite3.Database(dbPath, sqlite3.OPEN_READONLY, guarded(reject, (err) => {
         if (err) { reject(new Error(`cannot open ICD-11 database ${dbPath}: ${err.message}`)); return; }
-        db.all('SELECT code, url, version, title FROM system ORDER BY code', (e, rows) => {
+        db.all('SELECT code, url, version, title FROM system ORDER BY code', guarded(reject, (e, rows) => {
           db.close();
           if (e) reject(new Error(`${dbPath} is not an ICD-11 database: ${e.message}`));
           else resolve(rows || []);
-        });
-      });
+        }));
+      }));
     });
   }
 }

package/tx/cs/cs-icf.js

@@ -195,9 +195,23 @@ class IcfCodeSystemProvider extends FhirCodeSystemProvider {
     return ctxt instanceof IcfQualifiedContext ? ctxt.qualifiedCode : super.code(ctxt);
   }
 
-  /** The category's display, then the qualifiers' displays, leaving out any 8 (not specified). */
+  /**
+   * A qualified code's display is the one an extension-codes supplement in scope gives it, if one
+   * does. Otherwise it is generated: the category's display, then the qualifiers' displays, leaving
+   * out any 8 (not specified).
+   */
   async display(context) {
     const ctxt = await this.#resolve(context);
+    if (ctxt instanceof IcfQualifiedContext) {
+      const ext = this._extensionCodeDisplay(ctxt.qualifiedCode);
+      if (ext) {
+        return ext;
+      }
+    }
+    return this.#generatedDisplay(ctxt);
+  }
+
+  async #generatedDisplay(ctxt) {
     const display = await super.display(ctxt);
     if (!(ctxt instanceof IcfQualifiedContext)) {
       return display;
@@ -207,14 +221,19 @@ class IcfCodeSystemProvider extends FhirCodeSystemProvider {
     return parts.length > 0 ? display + ': ' + parts.join(', ') : display;
   }
 
-  /** A qualified code has one designation: its display. The category's translations do not describe it. */
+  /**
+   * A qualified code's designations: the display an extension-codes supplement in scope gives it
+   * (first, so it is the preferred display), and its generated display, which stays a valid one. The
+   * category's translations do not describe it.
+   */
   async designations(context, displays) {
     const ctxt = await this.#resolve(context);
     if (!(ctxt instanceof IcfQualifiedContext)) {
       return super.designations(ctxt, displays);
     }
+    this._listSupplementDesignations(ctxt.qualifiedCode, displays, true);
     const lang = this.defaultLanguage ? this.defaultLanguage.toString() : null;
-    displays.addDesignation(true, 'active', lang, CodeSystem.makeUseForDisplay(), await this.display(ctxt));
+    displays.addDesignation(true, 'active', lang, CodeSystem.makeUseForDisplay(), await this.#generatedDisplay(ctxt));
   }
 
   /**

package/tx/cs/cs-lang.js

@@ -75,7 +75,7 @@ class IETFLanguageCodeFilter {
   }
 
   /** Why a code did not match, for the caller. @returns {string} */
-  describe(code, _lang) {
+  describe(code) {
     const action = this.status ? 'does not contain' : 'contains';
     const requirement = this.status ? 'required' : 'not allowed';
     return `The language code ${code} ${action} a ${this.component}, and it is ${requirement}`;
@@ -101,7 +101,7 @@ class IETFLanguageEqualityFilter {
     return value.toLowerCase() === this.value.toLowerCase();
   }
 
-  describe(code, _lang) {
+  describe(code) {
     return `The language code ${code} does not have a ${this.component} of '${this.value}'`;
   }
 }