fhirsmith 0.13.4 → 0.14.1

package/translations/Messages.properties

@@ -161,6 +161,7 @@ CODESYSTEM_THO_CHECK = Most code systems defined in HL7 IGs will need to move to
 CODESYSTEM_TOO_COSTLY_TIME = The operation ''{1}'' took too long to process (>{0}sec) (at {2})
 CODESYSTEM_NOT_ENUMERABLE = The code system ''{0}'' cannot be expanded because its codes cannot be iterated or enumerated in any meaningful sense
 Coding_has_no_system__cannot_validate = Coding has no system. A code with no system has no defined meaning, and it cannot be validated. A system should be provided
+Coding_has_no_system_or_code__cannot_validate = Coding has neither a system nor a code, so it cannot be validated. A system and a code should be provided
 CONCEPTMAP_GROUP_SOURCE_CODE_INVALID = The source code ''{0}'' is not valid in the code system {1}
 CONCEPTMAP_GROUP_SOURCE_CODE_INVALID_VS = The source code ''{0}'' is not valid in the value set {1}
 CONCEPTMAP_GROUP_SOURCE_DISPLAY_INVALID = The source display ''{0}'' for the code ''{2}'' is not valid. Possible displays: {1}
@@ -514,6 +515,7 @@ MSG_DEPRECATED = Reference to deprecated {2} {0}
 MSG_DEPRECATED_SRC = Reference to deprecated {2} {0} from {1}
 MSG_DRAFT = Reference to draft {2} {0}
 MSG_DRAFT_SRC = Reference to draft {2} {0} from {1}
+MSG_DRAFT_SRC_STATUS = Reference to draft {2} {0} from {3} {4} {1}
 MSG_EXPERIMENTAL = Reference to experimental {2} {0}
 MSG_EXPERIMENTAL_SRC = Reference to experimental {2} {0} from {1}
 MSG_RETIRED = Reference to retired {2} {0}
@@ -1106,6 +1108,36 @@ CACHE_ID_UNKNOWN = The cache ''{0}'' was never issued by this server, and this s
 CACHE_ID_CLOSED = The cache ''{0}'' was closed {1} ago by the client, using $cache-control?mode=end (it had been open for {2}). It did not expire and it was not idle: something in the client released this cache while this request was still using it
 CACHE_ID_EXPIRED = The cache ''{0}'' expired: it went {1} without being used, and this server closes caches that have been idle for more than {2} (this one was dropped {3} ago). Every request that uses a cache resets its idle clock, so a client that keeps using a cache will not see this
 CACHE_ID_CLEARED = The cache ''{0}'' was dropped {1} ago, when this server cleared all of its caches
+CACHE_ID_OTHER_INSTANCE = The cache ''{0}'' was issued by the server instance ''{1}'', but this is instance ''{2}''. A cache only exists on the instance that issued it, so this request reached the wrong server: either the proxy in front of these servers is not routing on the cache-id, or instance ''{1}'' is unavailable
+CACHE_ID_OTHER_INSTANCE_UNNAMED = The cache ''{0}'' was issued by the server instance ''{1}'', but this server has no instance code, so it cannot have issued it. A cache only exists on the instance that issued it, so this request reached the wrong server: either the proxy in front of these servers is not routing on the cache-id, or instance ''{1}'' is unavailable
+CLOSURE_NOT_SUPPORTED = This server does not support $closure (it has to be turned on by the administrator)
+CLOSURE_POST_ONLY = $closure changes the closure table held on the server, so it must be invoked with POST
+CLOSURE_NAME_REQUIRED = $closure requires a ''name'' parameter naming the closure table
+CLOSURE_NAME_INVALID = The closure table name ''{0}'' is not valid: it must not contain white space, and must be no more than 64 characters long
+CLOSURE_NAME_NOT_UUID = The closure table name ''{0}'' is not valid: this server requires closure table names to be UUIDs
+CLOSURE_PARAM_UNKNOWN = The parameter ''{0}'' is not supported by $closure on this server
+CLOSURE_CONCEPT_AND_VERSION = A $closure request can add concepts or resynchronise from a version, but not both at once
+CLOSURE_RESET_AND_VERSION = A $closure request can reset the closure table or resynchronise from a version, but not both at once
+CLOSURE_TABLE_EXISTS = The closure table ''{0}'' already exists. To discard its content and start again, include the parameter reset = true
+CLOSURE_TABLE_UNKNOWN = The closure table ''{0}'' does not exist on this server. Initialise it first, with a $closure request that names it and has no concepts
+CLOSURE_CONFIG_NOT_ALLOWED = The parameter ''{0}'' configures a closure table, so it can only be supplied when the table is initialised (or reset)
+CLOSURE_VERSION_INVALID = The version ''{0}'' is not valid for the closure table ''{1}'': it must be a whole number between 0 and the table''s current version, {2}
+CLOSURE_CONCEPT_INVALID = Each concept added to a closure table must be a Coding with a system and a code
+CLOSURE_TOO_MANY_TABLES = This server holds at most {0} closure tables, and has no room for another
+CLOSURE_TOO_MANY_CONCEPTS = The closure table ''{0}'' can hold at most {1} concepts on this server
+CLOSURE_TOO_MANY_REQUEST_CONCEPTS = A single $closure request can add at most {0} concepts on this server
+CLOSURE_TOO_MANY_ENTRIES = Adding these concepts would put more entries into the closure table ''{0}'' than this server allows, in one request or in total
+CLOSURE_CONFIG_TOO_LARGE = The configuration supplied for this closure table (mostly the tx-resource parameters) is larger than this server will keep, which is {0} bytes
+CLOSURE_TABLE_BUSY = The closure table ''{0}'' is busy with other requests. Try again shortly
+SUBSUMPTION_CS_HIERARCHY_MEANING = The CodeSystem ''{0}'' has hierarchyMeaning = {1}, so its hierarchy does not describe subsumption, and subsumption cannot be tested
+SUBSUMPTION_CS_NOT_COMPLETE = The CodeSystem ''{0}'' has content = {1}, so subsumption cannot be tested (subsumption can only be tested against a code system with content = complete)
+SUBSUMPTION_CS_NOT_FOUND = A definition for the CodeSystem ''{0}'' could not be found, so subsumption cannot be tested
+SUBSUMPTION_CS_NOT_FOUND_VERSION = A definition for the CodeSystem ''{0}'' version ''{1}'' could not be found, so subsumption cannot be tested
+SUBSUMPTION_NO_CODE = No code is provided for {0}, so subsumption cannot be tested
+SUBSUMPTION_NO_CODING = No value is provided for {0}, so subsumption cannot be tested
+SUBSUMPTION_NO_SYSTEM = No code system is provided for {0}, so subsumption cannot be tested
+SUBSUMPTION_SYSTEM_MISMATCH = Subsumption can only be tested between two codes in the same code system, but the code systems are ''{0}'' and ''{1}''
+SUBSUMPTION_VERSION_MISMATCH = Subsumption can only be tested between two codes in the same version of ''{0}'', but the versions are ''{1}'' and ''{2}''
 Unable_to_validate_code_without_using_server = Unable to validate code without using server because: {0}
 Undefined_attribute__on__for_type__properties__ = Undefined attribute ''@{0}'' on {1} for type {2}
 Undefined_element_ = Undefined element ''{0}'' at {1}

package/tx/closure/closure-store.js

@@ -0,0 +1,396 @@
+//
+// ClosureStore - persistent storage for $closure tables
+//
+// A closure table is named by the client, lives across sessions (and server restarts),
+// and is shared across FHIR versions: the same name reaches the same table from /r4 and
+// /r5. What's held for each table:
+//
+//   closure_table   the name, the current version, when it was created / last used, and
+//                   how many concepts and entries it holds (kept up to date as it grows,
+//                   so the server's home page can report totals without counting rows)
+//   closure_param   the parameters the table was initialised with, as an ordered series
+//                   of name = value pairs (value is the JSON of the Parameters.parameter
+//                   entry, so tx-resource resources and typed values survive). These are
+//                   replayed on every later call: they are how the table remembers the
+//                   code systems a client supplied, and the version / supplement rules
+//   closure_concept every concept added, and the version it was added in
+//   closure_entry   one row per related pair (narrower -> broader, or equivalent), and the
+//                   version it was added in - which is what makes resync work
+//
+// better-sqlite3 on purpose: every write is synchronous, so a write transaction can never
+// be interleaved with another request's. The only thing that needs a lock is the span of
+// one $closure call on one table - read the table, compute (which awaits, and yields),
+// write - and that is the per-table lock below.
+//
+// Synchronous also means every statement blocks the event loop while it runs, so nothing
+// here reads or writes an unbounded amount in one go: reads that can be large are paged
+// (entriesPage), and the size of what one call can write is capped by the worker.
+//
+
+const path = require('path');
+const fs = require('fs');
+const Database = require('better-sqlite3');
+const folders = require('../../library/folder-setup');
+
+const NARROWER = 'source-is-narrower-than-target';
+const EQUIVALENT = 'equivalent';
+
+class ClosureStore {
+
+  /**
+   * @param {Object} config - modules.tx.closure
+   * @param {Object} [log]
+   */
+  constructor(config, log) {
+    this.config = config || {};
+    this.log = log || console;
+    this.db = null;
+    this.path = ClosureStore.resolvePath(this.config);
+    this.locks = new Map(); // table name -> { tail: Promise, count: holder + waiters }
+  }
+
+  /**
+   * config.database if given (relative paths resolve under the data folder's databases
+   * directory), otherwise closure.db there. ':memory:' is passed through, for tests.
+   */
+  static resolvePath(config) {
+    const configured = config && config.database;
+    if (!configured) {
+      return path.join(folders.databasesDir(), 'closure.db');
+    }
+    if (configured === ':memory:' || path.isAbsolute(configured)) {
+      return configured;
+    }
+    return path.join(folders.databasesDir(), configured);
+  }
+
+  open() {
+    if (this.path !== ':memory:') {
+      fs.mkdirSync(path.dirname(this.path), {recursive: true});
+    }
+    this.db = new Database(this.path);
+    this.db.pragma('journal_mode = WAL');
+    this.db.pragma('foreign_keys = ON');
+    this.db.exec(`
+      CREATE TABLE IF NOT EXISTS closure_table (
+        id        INTEGER PRIMARY KEY,
+        name      TEXT NOT NULL UNIQUE,
+        version   INTEGER NOT NULL DEFAULT 0,
+        created   TEXT NOT NULL,
+        last_used TEXT NOT NULL,
+        concept_count INTEGER NOT NULL DEFAULT 0,
+        entry_count   INTEGER NOT NULL DEFAULT 0
+      );
+      CREATE TABLE IF NOT EXISTS closure_param (
+        table_id  INTEGER NOT NULL REFERENCES closure_table(id) ON DELETE CASCADE,
+        seq       INTEGER NOT NULL,
+        name      TEXT NOT NULL,
+        value     TEXT NOT NULL,
+        PRIMARY KEY (table_id, seq)
+      );
+      CREATE TABLE IF NOT EXISTS closure_concept (
+        id            INTEGER PRIMARY KEY,
+        table_id      INTEGER NOT NULL REFERENCES closure_table(id) ON DELETE CASCADE,
+        system        TEXT NOT NULL,
+        code          TEXT NOT NULL,
+        display       TEXT,
+        added_version INTEGER NOT NULL,
+        UNIQUE (table_id, system, code)
+      );
+      CREATE TABLE IF NOT EXISTS closure_entry (
+        table_id      INTEGER NOT NULL REFERENCES closure_table(id) ON DELETE CASCADE,
+        source_id     INTEGER NOT NULL REFERENCES closure_concept(id) ON DELETE CASCADE,
+        target_id     INTEGER NOT NULL REFERENCES closure_concept(id) ON DELETE CASCADE,
+        relationship  TEXT NOT NULL,
+        added_version INTEGER NOT NULL,
+        PRIMARY KEY (table_id, source_id, target_id)
+      );
+      CREATE INDEX IF NOT EXISTS closure_entry_version ON closure_entry (table_id, added_version);
+    `);
+    // databases made before the counts were kept: add them, and fill them in once
+    const columns = this.db.prepare('PRAGMA table_info(closure_table)').all().map(c => c.name);
+    if (!columns.includes('concept_count')) {
+      this.db.exec(`
+        ALTER TABLE closure_table ADD COLUMN concept_count INTEGER NOT NULL DEFAULT 0;
+        ALTER TABLE closure_table ADD COLUMN entry_count INTEGER NOT NULL DEFAULT 0;
+        UPDATE closure_table SET
+          concept_count = (SELECT count(*) FROM closure_concept c WHERE c.table_id = closure_table.id),
+          entry_count = (SELECT count(*) FROM closure_entry e WHERE e.table_id = closure_table.id);
+      `);
+    }
+    this.stmt = {
+      getTable: this.db.prepare('SELECT id, name, version, created, last_used FROM closure_table WHERE name = ?'),
+      countTables: this.db.prepare('SELECT count(*) AS n FROM closure_table'),
+      insertTable: this.db.prepare('INSERT INTO closure_table (name, version, created, last_used) VALUES (?, 0, ?, ?)'),
+      deleteTable: this.db.prepare('DELETE FROM closure_table WHERE id = ?'),
+      touchTable: this.db.prepare('UPDATE closure_table SET last_used = ? WHERE id = ?'),
+      setVersion: this.db.prepare(`UPDATE closure_table SET version = ?, last_used = ?,
+        concept_count = concept_count + ?, entry_count = entry_count + ? WHERE id = ?`),
+      totals: this.db.prepare(`SELECT count(*) AS tables, coalesce(sum(concept_count), 0) AS concepts,
+        coalesce(sum(entry_count), 0) AS entries FROM closure_table`),
+      insertParam: this.db.prepare('INSERT INTO closure_param (table_id, seq, name, value) VALUES (?, ?, ?, ?)'),
+      getParams: this.db.prepare('SELECT name, value FROM closure_param WHERE table_id = ? ORDER BY seq'),
+      getConcepts: this.db.prepare('SELECT id, system, code, display FROM closure_concept WHERE table_id = ?'),
+      countConcepts: this.db.prepare('SELECT count(*) AS n FROM closure_concept WHERE table_id = ?'),
+      insertConcept: this.db.prepare('INSERT INTO closure_concept (table_id, system, code, display, added_version) VALUES (?, ?, ?, ?, ?)'),
+      insertEntry: this.db.prepare('INSERT OR IGNORE INTO closure_entry (table_id, source_id, target_id, relationship, added_version) VALUES (?, ?, ?, ?, ?)'),
+      countEntries: this.db.prepare('SELECT count(*) AS n FROM closure_entry WHERE table_id = ?'),
+      entriesPage: this.db.prepare(`
+        SELECT e.rowid AS rowid,
+               s.system AS source_system, s.code AS source_code, s.display AS source_display,
+               t.system AS target_system, t.code AS target_code, t.display AS target_display,
+               e.relationship
+          FROM closure_entry e
+          JOIN closure_concept s ON s.id = e.source_id
+          JOIN closure_concept t ON t.id = e.target_id
+         WHERE e.table_id = ? AND e.added_version > ? AND e.rowid > ?
+         ORDER BY e.rowid
+         LIMIT ?`),
+      entriesSince: this.db.prepare(`
+        SELECT s.system AS source_system, s.code AS source_code, s.display AS source_display,
+               t.system AS target_system, t.code AS target_code, t.display AS target_display,
+               e.relationship
+          FROM closure_entry e
+          JOIN closure_concept s ON s.id = e.source_id
+          JOIN closure_concept t ON t.id = e.target_id
+         WHERE e.table_id = ? AND e.added_version > ?`),
+      staleTables: this.db.prepare('SELECT id, name FROM closure_table WHERE last_used < ?')
+    };
+  }
+
+  close() {
+    if (this.db) {
+      this.db.close();
+      this.db = null;
+    }
+  }
+
+  /**
+   * Run fn with exclusive use of the named table. Calls on different tables run in
+   * parallel; calls on the same table queue, in arrival order. fn may await (and yield)
+   * as much as it likes - nothing else touches that table until it settles.
+   *
+   * The queue is bounded, and so is the wait, so a flood of calls on one table can't pile
+   * up requests (and their sockets) without limit. A caller that gives up - timeout, or
+   * opts.waitFor throwing because the client went away - never runs fn, and passes its
+   * turn on to the next in line as soon as it comes.
+   *
+   * @param {string} name
+   * @param {Function} fn - async () => result
+   * @param {Object} [opts]
+   * @param {number} [opts.maxQueue] - most calls allowed in the queue, counting the one
+   *   running; beyond that the call fails at once. 0/absent = no limit
+   * @param {number} [opts.timeoutMs] - longest to wait for the lock. 0/absent = no limit
+   * @param {Function} [opts.waitFor] - (promise) => promise; wraps the wait (the worker
+   *   uses OperationContext.waitFor, so the wait isn't charged to the compute deadline and
+   *   a disconnected client stops waiting)
+   * @throws {Error} with .closureBusy = 'queue' | 'timeout' when the lock isn't got
+   */
+  async withLock(name, fn, opts = {}) {
+    let q = this.locks.get(name);
+    if (!q) {
+      q = { tail: Promise.resolve(), count: 0 };
+      this.locks.set(name, q);
+    }
+    if (opts.maxQueue && q.count >= opts.maxQueue) {
+      const error = new Error(`closure table '${name}' is busy`);
+      error.closureBusy = 'queue';
+      throw error;
+    }
+    const prior = q.tail;
+    let release;
+    const mine = new Promise(resolve => { release = resolve; });
+    q.tail = prior.then(() => mine);
+    q.count++;
+
+    let timer = null;
+    let acquired = false;
+    try {
+      let wait = prior;
+      if (opts.timeoutMs) {
+        wait = Promise.race([prior, new Promise((resolve, reject) => {
+          timer = setTimeout(() => {
+            const error = new Error(`timed out waiting for closure table '${name}'`);
+            error.closureBusy = 'timeout';
+            reject(error);
+          }, opts.timeoutMs);
+        })]);
+      }
+      await (opts.waitFor ? opts.waitFor(wait) : wait);
+      acquired = true;
+      return await fn();
+    } finally {
+      if (timer) {
+        clearTimeout(timer);
+      }
+      if (acquired) {
+        release();
+      } else {
+        prior.then(release); // hand the turn on when it comes
+      }
+      q.count--;
+      if (q.count === 0 && this.locks.get(name) === q) {
+        this.locks.delete(name);
+      }
+    }
+  }
+
+  /**
+   * @param {string} name
+   * @returns {{id, name, version, created, last_used}|null}
+   */
+  getTable(name) {
+    return this.stmt.getTable.get(name) || null;
+  }
+
+  tableCount() {
+    return this.stmt.countTables.get().n;
+  }
+
+  conceptCount(tableId) {
+    return this.stmt.countConcepts.get(tableId).n;
+  }
+
+  entryCount(tableId) {
+    return this.stmt.countEntries.get(tableId).n;
+  }
+
+  /**
+   * One page of the entries added after the given version, in the order they were
+   * written. Page through with the last row's rowid as afterRowid (start with 0).
+   * @returns {Array<{rowid, source_system, source_code, source_display, target_system, target_code, target_display, relationship}>}
+   */
+  entriesPage(tableId, version, afterRowid, limit) {
+    return this.stmt.entriesPage.all(tableId, version, afterRowid, limit);
+  }
+
+  /**
+   * Create a table, replacing any table of the same name (the caller has already decided
+   * whether that's allowed). Its parameters are fixed here, for the life of the table.
+   * @param {string} name
+   * @param {Array<Object>} params - Parameters.parameter entries that configure the table
+   * @returns {Object} the new table row
+   */
+  createTable(name, params) {
+    const now = new Date().toISOString();
+    const tx = this.db.transaction(() => {
+      const existing = this.stmt.getTable.get(name);
+      if (existing) {
+        this.stmt.deleteTable.run(existing.id);
+      }
+      const info = this.stmt.insertTable.run(name, now, now);
+      const id = info.lastInsertRowid;
+      params.forEach((p, i) => this.stmt.insertParam.run(id, i, p.name, JSON.stringify(p)));
+      return this.stmt.getTable.get(name);
+    });
+    return tx();
+  }
+
+  /**
+   * The parameters the table was initialised with, as Parameters.parameter entries.
+   */
+  getParams(tableId) {
+    return this.stmt.getParams.all(tableId).map(r => JSON.parse(r.value));
+  }
+
+  /**
+   * @returns {Array<{id, system, code, display}>}
+   */
+  getConcepts(tableId) {
+    return this.stmt.getConcepts.all(tableId);
+  }
+
+  touch(tableId) {
+    this.stmt.touchTable.run(new Date().toISOString(), tableId);
+  }
+
+  /**
+   * Record the outcome of an add, all at once: the new concepts, the new entries, and the
+   * table's new version. Nothing is written unless everything is.
+   *
+   * @param {Object} table - the table row (id, version)
+   * @param {Array<{key, system, code, display}>} concepts - new concepts; key identifies
+   *   the concept in the entries below
+   * @param {Array<{source, target, relationship}>} entries - source/target are either the
+   *   id of an existing concept (number) or the key of a new one (string)
+   * @returns {number} the table's version after the add
+   */
+  recordAdd(table, concepts, entries) {
+    if (concepts.length === 0) {
+      this.touch(table.id);
+      return table.version;
+    }
+    const version = table.version + 1;
+    const now = new Date().toISOString();
+    const tx = this.db.transaction(() => {
+      const ids = new Map();
+      for (const c of concepts) {
+        const info = this.stmt.insertConcept.run(table.id, c.system, c.code, c.display || null, version);
+        ids.set(c.key, info.lastInsertRowid);
+      }
+      const id = ref => (typeof ref === 'string' ? ids.get(ref) : ref);
+      let added = 0;
+      for (const e of entries) {
+        added += this.stmt.insertEntry.run(table.id, id(e.source), id(e.target), e.relationship, version).changes;
+      }
+      this.stmt.setVersion.run(version, now, concepts.length, added, table.id);
+    });
+    tx();
+    return version;
+  }
+
+  /**
+   * Every entry added after the given version.
+   * @returns {Array<{source_system, source_code, source_display, target_system, target_code, target_display, relationship}>}
+   */
+  entriesSince(tableId, version) {
+    return this.stmt.entriesSince.all(tableId, version);
+  }
+
+  /**
+   * Totals across every table, and the size of the database on disk (the main file plus
+   * the write-ahead log; null for an in-memory database). Cheap: the counts are kept on
+   * each table row, so this reads at most maxTables rows.
+   * @returns {{tables: number, concepts: number, entries: number, bytes: number|null}}
+   */
+  totals() {
+    const t = this.stmt.totals.get();
+    let bytes = null;
+    if (this.path !== ':memory:') {
+      bytes = 0;
+      for (const f of [this.path, this.path + '-wal']) {
+        try {
+          bytes += fs.statSync(f).size;
+        } catch (e) {
+          // no WAL file yet
+        }
+      }
+    }
+    return { tables: t.tables, concepts: t.concepts, entries: t.entries, bytes };
+  }
+
+  /**
+   * Drop tables that nobody has used for the given number of days. Each table is dropped
+   * under its lock (a table in use is not pulled out from under the call using it - it is
+   * checked again once the lock is held), one at a time, yielding in between.
+   * @returns {Promise<Array<string>>} the names dropped
+   */
+  async pruneUnused(days) {
+    const cutoff = new Date(Date.now() - days * 24 * 60 * 60 * 1000).toISOString();
+    const stale = this.stmt.staleTables.all(cutoff);
+    const dropped = [];
+    for (const t of stale) {
+      await this.withLock(t.name, async () => {
+        const now = this.db ? this.stmt.getTable.get(t.name) : null;
+        if (now && now.id === t.id && now.last_used < cutoff) {
+          this.stmt.deleteTable.run(t.id);
+          dropped.push(t.name);
+        }
+      });
+      await new Promise(resolve => setImmediate(resolve));
+    }
+    return dropped;
+  }
+}
+
+module.exports = { ClosureStore, NARROWER, EQUIVALENT };

package/tx/cs/cs-api.js

@@ -67,7 +67,12 @@ class CodeSystemProvider {
    */
 
   /**
-   * @returns {string} uri for the code system
+   * The display name of the code system - what $lookup reports as its name parameter, and
+   * what a person reads. Every provider should override this; the fallback is the
+   * versioned uri, which is not a name, and a provider that forgets ends up reporting
+   * "http://snomed.info/sct|http://snomed.info/sct/731000124108/version/20230301" where
+   * the others report "LOINC".
+   * @returns {string} display name for the code system
    */
   name() { return this.system() + (this.version() ? "|"+this.version() : "") }
 

package/tx/cs/cs-rxnorm.js

@@ -428,6 +428,20 @@ class RxNormServices extends CodeSystemProvider {
     filterContext.filters.push(filter);
   }
 
+  /**
+   * Whether RXNSTEMS can hold this stem at all.
+   *
+   * The importer only stems words that are longer than two characters and start with a
+   * letter (see extractWords), so the table has nothing that begins with a digit. Every
+   * token of a search is ANDed, so a token the table cannot hold takes the whole search
+   * to nothing: "acetaminophen" found thousands of codes while "acetaminophen 500" found
+   * none, which is not a result anyone would expect from adding a dose.
+   * @private
+   */
+  #stemIsIndexed(stem) {
+    return stem.length > 2 && /^[a-z]/.test(stem);
+  }
+
   async searchFilter(filterContext, filter, sort) {
 
     if (!filter || !filter.stems || filter.stems.length === 0) {
@@ -437,9 +451,18 @@ class RxNormServices extends CodeSystemProvider {
     for (let i = 0; i < filter.stems.length; i++) {
       const stem = filter.stems[i];
       const rxnormFilter = new RxNormFilterHolder();
-      rxnormFilter.text = true;
-      rxnormFilter.sql = ` AND (${this.getCodeField()} = s${i}.CUI AND s${i}.stem LIKE $stem${i})`;
-      rxnormFilter.params[`stem${i}`] = this.#sqlWrapString(stem) + '%';
+      if (this.#stemIsIndexed(stem)) {
+        rxnormFilter.text = true;
+        rxnormFilter.sql = ` AND (${this.getCodeField()} = s${i}.CUI AND s${i}.stem LIKE $stem${i})`;
+        rxnormFilter.params[`stem${i}`] = stem + '%';
+      } else {
+        // Not in the stem table, so match the token against the text itself. Left as a
+        // plain (non-text) filter so that executeFilters does not join RXNSTEMS for it.
+        // Unindexed, but it only ever narrows rows the other tokens have already found,
+        // and the tokens are alphanumeric, so there are no LIKE wildcards to escape.
+        rxnormFilter.sql = ` AND STR LIKE $text${i}`;
+        rxnormFilter.params[`text${i}`] = '%' + ((filter.words && filter.words[i]) || stem) + '%';
+      }
 
       filterContext.filters.push(rxnormFilter);
     }
@@ -470,17 +493,21 @@ class RxNormServices extends CodeSystemProvider {
       }
     }
 
-    // Add text search joins and filters
+    // Add text search joins and filters. Each one is renumbered to its position among the
+    // text filters, which is not its position among the filters - searchFilter leaves gaps
+    // where a token went to a plain STR match instead. The alias, the placeholder and the
+    // parameter key all carry that number and have to move together: renaming the key but
+    // not the placeholder leaves the query asking for a parameter that is not there.
     for (const filter of filterContext.filters) {
       if (filter.text) {
         sql2 += `, rxnstems as s${stemIndex}`;
-        const stemSql = filter.sql.replace(/s\d+/g, `s${stemIndex}`);
+        const stemSql = filter.sql
+          .replace(/\bs\d+\./g, `s${stemIndex}.`)
+          .replace(/\$stem\d+/g, `$stem${stemIndex}`);
         sql1 += ' ' + stemSql;
 
-        // Update parameter keys to match stem index
         for (const [key, value] of Object.entries(filter.params)) {
-          const newKey = key.replace(/\d+/, stemIndex.toString());
-          allParams[newKey] = value;
+          allParams[key.replace(/\d+$/, stemIndex.toString())] = value;
         }
         stemIndex++;
       }

package/tx/cs/cs-snomed.js

@@ -16,6 +16,7 @@ const {ConceptMap} = require("../library/conceptmap");
 const {ECLLexer, ECLParser, ECLNodeType, ECLTokenType} = require("../sct/ecl");
 const {Issue} = require("../library/operation-outcome");
 const {debugLog} = require("../operation-context");
+const {editionName, editionCode} = require("../sct/editions");
 const {SnomedTextIndex, rankMatches, filterTokens} = require("../sct/text-index");
 const Logger = require("../../library/logger");
 
@@ -1676,6 +1677,19 @@ class SnomedProvider extends BaseCSServices {
     return actualVersion && actualVersion.startsWith(checkVersion);
   }
 
+  /**
+   * The display name of the code system, as $lookup reports it.
+   *
+   * Without this, CodeSystemProvider's fallback applies, which returns the versioned uri -
+   * so a SNOMED lookup answered "http://snomed.info/sct|http://snomed.info/sct/731000124108
+   * /version/20230301" where every other code system answers something like "LOINC". The
+   * edition is named because for SNOMED that is the part worth knowing; the version
+   * parameter carries the uri.
+   */
+  name() {
+    return this.sct.getDescription();
+  }
+
   description() {
     return this.sct.getDescription();
   }
@@ -2787,7 +2801,7 @@ class SnomedServicesFactory extends CodeSystemFactoryProvider {
 
     if (url.startsWith('http://snomed.info/sct?fhir_vs') ||
         url.startsWith(`http://snomed.info/sct/${this.edition}?fhir_vs`) ||
-        url.startsWith(`http://snomed.info/sct/${this.edition}/version/${this.version}?fhir_vs`)) {
+        url.startsWith(`http://snomed.info/sct/${this.edition}/version/${this.version()}?fhir_vs`)) {
       id = url.substring(qIdx);
     } else {
       return null;
@@ -3005,8 +3019,8 @@ class SnomedServicesFactory extends CodeSystemFactoryProvider {
         description: `The concept map implicitly defined by the ${name} Association Reference Set`,
         copyright: 'This value set includes content from SNOMED CT, which is copyright © 2002+ International Health Terminology Standards Development Organisation (SNOMED International), and distributed by agreement between SNOMED International and HL7',
         status: 'active',
-        sourceUri: `${this.system}?fhir_vs`,
-        targetUri: `${this.system}?fhir_vs`,
+        sourceUri: `${this.system()}?fhir_vs`,
+        targetUri: `${this.system()}?fhir_vs`,
         group: [{
           source: 'http://snomed.info/sct',
           target: 'http://snomed.info/sct'
@@ -3025,75 +3039,11 @@ class SnomedServicesFactory extends CodeSystemFactoryProvider {
 }
 
 function getEditionName(edition) {
-  const editionMap = {
-    '900000000000207008': 'International Edition',
-    '449081005': 'International Spanish Edition',
-    '11000221109': 'Argentinian Edition',
-    '32506021000036107': 'Australian Edition (with drug extension)',
-    '11000234105': 'Austrian Edition',
-    '11000172109': 'Belgian Edition',
-    '20621000087109': 'Canadian English Edition',
-    '20611000087101': 'Canadian Canadian French Edition',
-    '554471000005108': 'Danish Edition',
-    '11000279109': 'Czech Edition',
-    '11000181102': 'Estonian Edition',
-    '11000229106': 'Finnish Edition',
-    '11000274103': 'German Edition',
-    '1121000189102': 'Indian Edition',
-    '827022005': 'IPS Terminology',
-    '11000220105': 'Irish Edition',
-    '11000146104': 'Netherlands Edition',
-    '21000210109': 'New Zealand Edition',
-    '51000202101': 'Norwegian Edition',
-    '11000267109': 'Republic of Korea Edition (South Korea)',
-    '900000001000122104': 'Spanish National Edition',
-    '45991000052106': 'Swedish Edition',
-    '2011000195101': 'Swiss Edition',
-    '83821000000107': 'UK Edition',
-    '999000021000000109': 'UK Clinical Edition',
-    '5631000179106': 'Uruguay Edition',
-    '731000124108': 'US Edition',
-    '21000325107': 'Chilean Edition',
-    '5991000124107': 'US Edition (with ICD-10-CM maps)'
-  };
-
-  return editionMap[edition] || 'Unknown Edition';
+  return editionName(edition) || 'Unknown Edition';
 }
 
 function getEditionCode(edition) {
-  const editionMap = {
-    '900000000000207008': 'Intl',
-    '449081005': 'es',
-    '11000221109': 'AR-es',
-    '32506021000036107': 'AU+',
-    '11000234105': 'AT',
-    '11000172109': 'BE',
-    '20621000087109': 'CA-en',
-    '20611000087101': 'CA-fr',
-    '554471000005108': 'DK',
-    '11000279109': 'CZ',
-    '11000181102': 'ES',
-    '11000229106': 'FI',
-    '11000274103': 'DE',
-    '1121000189102': 'IN',
-    '827022005': 'IPS',
-    '11000220105': 'IE',
-    '11000146104': 'NL',
-    '21000210109': 'NZ',
-    '51000202101': 'NO',
-    '11000267109': 'KR',
-    '900000001000122104': 'ES-es',
-    '45991000052106': 'SW',
-    '2011000195101': 'CH',
-    '83821000000107': 'UK',
-    '999000021000000109': 'UK-Clinical',
-    '5631000179106': 'UR',
-    '731000124108': 'US',
-    '21000325107': 'CL',
-    '5991000124107': 'US+)'
-  };
-
-  return editionMap[edition] || 'Unknown Edition';
+  return editionCode(edition) || 'Unknown Edition';
 }