fhirsmith 0.13.4 → 0.14.1

package/tx/workers/worker.js

@@ -7,6 +7,7 @@ const {Issue} = require("../library/operation-outcome");
 const {Languages} = require("../../library/languages");
 const {ConceptMap} = require("../library/conceptmap");
 const {Renderer} = require("../library/renderer");
+const {editionName} = require("../sct/editions");
 
 // The cache-id travels as an HTTP header (not an operation parameter) so proxies /
 // load-balancers can act on it and the server can reject it before parsing the body.
@@ -33,6 +34,15 @@ class TerminologyWorker {
   foundParameters = [];
   renderer;
 
+  // ValueSetChecker reads both of these off whatever worker it is given, so they belong to
+  // every worker that can construct one - not just the validate and expand workers that
+  // happen to have declared them first. A worker without them fails inside the checker with
+  // "Cannot read properties of undefined (reading 'size')", a long way from the cause.
+  // ValidateWorker and ExpandWorker redeclare them; a subclass field initialiser overrides
+  // the base one, so their behaviour is unchanged.
+  requiredSupplements = new Set();
+  usedSupplements = new Set();
+
   /**
    * @param {OperationContext} opContext - Operation context
    * @param {Logger} log - Provider for code systems and resources
@@ -1091,42 +1101,9 @@ function Unknown_Code_in_VersionSCT(url, version) {
 function SCTVersion(url, ver) {
   if (url !== 'http://snomed.info/sct' || !ver) {
     return '';
-  } else {
-    let result = 'unknown';
-    let s = ver.split('/');
-    if (s.length >= 5) {
-      if (s[4] === '900000000000207008') result = 'International Edition';
-      else if (s[4] === '449081005') result = 'International Spanish Edition';
-      else if (s[4] === '11000221109') result = 'Argentinian Edition';
-      else if (s[4] === '32506021000036107') result = 'Australian Edition (with drug extension)';
-      else if (s[4] === '11000234105') result = 'Austrian Edition';
-      else if (s[4] === '11000172109') result = 'Belgian Edition';
-      else if (s[4] === '20621000087109') result = 'Canadian English Edition';
-      else if (s[4] === '20611000087101') result = 'Canadian Canadian French Edition';
-      else if (s[4] === '11000279109') result = 'Czech Edition';
-      else if (s[4] === '554471000005108') result = 'Danish Edition';
-      else if (s[4] === '11000181102') result = 'Estonian Edition';
-      else if (s[4] === '11000229106') result = 'Finnish Edition';
-      else if (s[4] === '11000274103') result = 'German Edition';
-      else if (s[4] === '1121000189102') result = 'Indian Edition';
-      else if (s[4] === '827022005') result = 'IPS Terminology';
-      else if (s[4] === '11000220105') result = 'Irish Edition';
-      else if (s[4] === '11000146104') result = 'Netherlands Edition';
-      else if (s[4] === '21000210109') result = 'New Zealand Edition';
-      else if (s[4] === '51000202101') result = 'Norwegian Edition';
-      else if (s[4] === '11000267109') result = 'Republic of Korea Edition (South Korea)';
-      else if (s[4] === '900000001000122104') result = 'Spanish National Edition';
-      else if (s[4] === '45991000052106') result = 'Swedish Edition';
-      else if (s[4] === '2011000195101') result = 'Swiss Edition';
-      else if (s[4] === '83821000000107') result = 'UK Edition';
-      else if (s[4] === '999000021000000109') result = 'UK Clinical Edition';
-      else if (s[4] === '5631000179106') result = 'Uruguay Edition';
-      else if (s[4] === '21000325107') result = 'Chilean Edition';
-      else if (s[4] === '731000124108') result = 'US Edition';
-      else if (s[4] === '5991000124107') result = 'US Edition (with ICD-10-CM maps)';
-    }
-    return result;
   }
+  const s = ver.split('/');
+  return (s.length >= 5 && editionName(s[4])) || 'unknown';
 }
 
 module.exports = {

package/tx/xversion/xv-conceptmap.js

@@ -263,16 +263,23 @@ function conceptMapR5ToR3(r5Obj) {
  * @returns {string} R5 relationship value
  * @private
  */
+// The two vocabularies name the relationship from opposite ends. R3/R4 equivalence
+// describes the TARGET ('wider' = the target is wider than the source); R5 relationship
+// describes the SOURCE ('source-is-narrower-than-target'). So wider <-> narrower-than-
+// target, and narrower <-> broader-than-target. These tables follow the Java convertors
+// (ConceptMap30_50 / ConceptMap40_50), which are the reference.
 function convertEquivalenceToRelationship(equivalence) {
   const equivalenceToRelationship = {
     'relatedto': 'related-to',
     'equivalent': 'equivalent',
     'equal': 'equivalent',
-    'wider': 'source-is-broader-than-target',
-    'subsumes': 'source-is-broader-than-target',
-    'narrower': 'source-is-narrower-than-target',
-    'specializes': 'source-is-narrower-than-target',
-    'inexact': 'not-related-to',
+    'wider': 'source-is-narrower-than-target',
+    'subsumes': 'source-is-narrower-than-target',
+    'narrower': 'source-is-broader-than-target',
+    'specializes': 'source-is-broader-than-target',
+    'inexact': 'related-to',
+    // Java gives no relationship for 'unmatched' (a target-less 'unmatched' is lifted to
+    // element.noMap before this is reached); R5 requires one, so not-related-to it is
     'unmatched': 'not-related-to',
     'disjoint': 'not-related-to'
   };
@@ -289,9 +296,11 @@ function convertRelationshipToEquivalence(relationship) {
   const relationshipToEquivalence = {
     'related-to': 'relatedto',
     'equivalent': 'equivalent',
-    'source-is-broader-than-target': 'wider',
-    'source-is-narrower-than-target': 'narrower',
-    'not-related-to': 'unmatched'
+    'source-is-narrower-than-target': 'wider',
+    'source-is-broader-than-target': 'narrower',
+    // 'unmatched' is reserved for "no map" (see conceptMapToR5); a real not-related-to
+    // target is disjoint, as in the Java convertors
+    'not-related-to': 'disjoint'
   };
   return relationshipToEquivalence[relationship] || 'relatedto';
 }

package/utilities/submit-test-report.js

@@ -0,0 +1,150 @@
+#!/usr/bin/env node
+//
+// Copyright 2026, Health Intersections Pty Ltd (http://www.healthintersections.com.au)
+//
+// Licensed under BSD-3: https://opensource.org/license/bsd-3-clause
+//
+
+/**
+ * Submit the tx test report (test-cases-report.json, written by the tx test run) to a
+ * FHIRsmith /testing server.
+ *
+ *   node utilities/submit-test-report.js [-server url] [-file path] [-token token] [-header name]
+ *
+ *   -server  the /testing base; default https://testing.fhir.org/testing
+ *   -file    default test-cases-report.json in the FHIRsmith root
+ *   -token   if the server requires one; or set FHIRSMITH_TESTING_TOKEN
+ *   -header  the header the token goes in; default Authorization (sent as "Bearer <token>")
+ *
+ * Exits 0 when the server accepted the report, 1 otherwise.
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+const DEFAULT_SERVER = 'https://npm.fhir.org/testing';
+const DEFAULT_FILE = path.join(__dirname, '..', 'test-cases-report.json');
+
+function usage(msg) {
+  if (msg) {
+    console.error(msg);
+  }
+  console.error('Usage: node utilities/submit-test-report.js [-server url] [-file path] [-token token] [-header name]');
+  process.exit(1);
+}
+
+function parseArgs(argv) {
+  const opts = {
+    server: DEFAULT_SERVER,
+    file: DEFAULT_FILE,
+    token: process.env.FHIRSMITH_TESTING_TOKEN || null,
+    header: 'Authorization'
+  };
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i].replace(/^--?/, '');
+    if (a === 'help' || a === 'h') {
+      usage();
+    }
+    if (!['server', 'file', 'token', 'header'].includes(a)) {
+      usage(`Unknown parameter: ${argv[i]}`);
+    }
+    if (i + 1 >= argv.length) {
+      usage(`Missing value for ${argv[i]}`);
+    }
+    opts[a] = argv[++i];
+  }
+  return opts;
+}
+
+/** The TestReport endpoint for a server base, whether or not it was given with /TestReport. */
+function endpoint(server) {
+  const base = server.replace(/\/+$/, '');
+  return /\/TestReport$/.test(base) ? base : base + '/TestReport';
+}
+
+/** Warn if the report doesn't describe the version being released. */
+function checkVersion(report) {
+  const pkg = require('../package.json');
+  const fhirsmith = (report.participant || []).find(p => p && p.uri === 'https://github.com/HealthIntersections/FHIRsmith');
+  const reported = fhirsmith && typeof fhirsmith.version === 'string' ? fhirsmith.version : null;
+  if (reported && reported !== pkg.version) {
+    console.warn(`Warning: the report is from FHIRsmith v${reported}, but package.json is v${pkg.version}`);
+  } else if (reported && /snapshot/i.test(reported)) {
+    console.warn(`Warning: the report is from a snapshot (v${reported}), not a release`);
+  }
+}
+
+function describeOutcome(text) {
+  try {
+    const oo = JSON.parse(text);
+    if (oo.resourceType === 'OperationOutcome' && Array.isArray(oo.issue)) {
+      return oo.issue.map(i => `  ${i.severity}: ${(i.details && i.details.text) || i.diagnostics || i.code}`).join('\n');
+    }
+  } catch {
+    // not JSON - fall through to the raw text
+  }
+  return '  ' + text.substring(0, 1000);
+}
+
+async function main() {
+  const opts = parseArgs(process.argv.slice(2));
+
+  if (!fs.existsSync(opts.file)) {
+    console.error(`No report at ${opts.file} - run the tx tests first (npx jest tests/tx/test-cases.test.js)`);
+    process.exit(1);
+  }
+  const body = fs.readFileSync(opts.file, 'utf8');
+  let report;
+  try {
+    report = JSON.parse(body);
+  } catch (e) {
+    console.error(`${opts.file} is not valid JSON: ${e.message}`);
+    process.exit(1);
+  }
+  if (report.resourceType !== 'TestReport') {
+    console.error(`${opts.file} is not a TestReport`);
+    process.exit(1);
+  }
+  checkVersion(report);
+
+  const url = endpoint(opts.server);
+  const headers = {
+    'Content-Type': 'application/fhir+json',
+    'Accept': 'application/fhir+json',
+    'Prefer': 'return=minimal'
+  };
+  if (opts.token) {
+    headers[opts.header] = opts.header.toLowerCase() === 'authorization' ? `Bearer ${opts.token}` : opts.token;
+  }
+
+  console.log(`Submitting ${path.basename(opts.file)} (${report.result}, ${Array.isArray(report.test) ? report.test.length : 0} tests) to ${url}`);
+  let res;
+  try {
+    res = await fetch(url, { method: 'POST', headers, body });
+  } catch (e) {
+    console.error(`Could not reach ${url}: ${e.cause ? e.cause.message : e.message}`);
+    process.exit(1);
+  }
+  const text = await res.text();
+  if (res.status !== 201) {
+    console.error(`The server refused the report: HTTP ${res.status}`);
+    if (text) {
+      console.error(describeOutcome(text));
+    }
+    if (res.status === 401 && !opts.token) {
+      console.error('The server requires a token: use -token, or set FHIRSMITH_TESTING_TOKEN');
+    }
+    process.exit(1);
+  }
+  const location = res.headers.get('location');
+  console.log(`Accepted: ${location || '(no Location returned)'}`);
+}
+
+if (require.main === module) {
+  main().catch(e => {
+    console.error(e.stack || e.message);
+    process.exit(1);
+  });
+}
+
+module.exports = { parseArgs, endpoint };