@openfn/language-fhir-4 0.2.6 → 0.2.8

package/dist/index.cjs

@@ -32,6 +32,7 @@ __export(src_exports, {
   cursor: () => import_language_common3.cursor,
   dataPath: () => import_language_common3.dataPath,
   dataValue: () => import_language_common3.dataValue,
+  datatypes: () => datatypes_exports,
   dateFns: () => import_language_common3.dateFns,
   default: () => src_default,
   delete: () => _delete,
@@ -368,6 +369,7 @@ __export(builders_exports, {
   explanationOfBenefit: () => explanationOfBenefit,
   ext: () => ext,
   extendSystemMap: () => extendSystemMap,
+  extendValues: () => extendValues,
   extension: () => extension,
   familyMemberHistory: () => familyMemberHistory,
   findExtension: () => findExtension,
@@ -388,8 +390,10 @@ __export(builders_exports, {
   library: () => library,
   list: () => list,
   location: () => location,
+  lookupValue: () => lookupValue,
   manufacturedItemDefinition: () => manufacturedItemDefinition,
   mapSystems: () => mapSystems,
+  mapValues: () => mapValues,
   measure: () => measure,
   measureReport: () => measureReport,
   media: () => media,
@@ -431,6 +435,7 @@ __export(builders_exports, {
   schedule: () => schedule,
   serviceRequest: () => serviceRequest,
   setSystemMap: () => setSystemMap,
+  setValues: () => setValues,
   slot: () => slot,
   specimen: () => specimen,
   specimenDefinition: () => specimenDefinition,
@@ -445,10 +450,64 @@ __export(builders_exports, {
   visionPrescription: () => visionPrescription
 });
 
+// src/profiles/Account.ts
+var import_lodash2 = __toESM(require("lodash"), 1);
+
 // src/datatypes.ts
+var datatypes_exports = {};
+__export(datatypes_exports, {
+  addExtension: () => addExtension,
+  c: () => c,
+  cc: () => cc,
+  coding: () => coding,
+  composite: () => composite,
+  concept: () => concept,
+  ext: () => ext,
+  extendSystemMap: () => extendSystemMap,
+  extendValues: () => extendValues,
+  extension: () => extension,
+  findExtension: () => findExtension,
+  id: () => id,
+  identifier: () => identifier,
+  lookupValue: () => lookupValue,
+  mapSystems: () => mapSystems,
+  mapValues: () => mapValues,
+  ref: () => ref,
+  reference: () => reference,
+  setSystemMap: () => setSystemMap,
+  setValues: () => setValues,
+  value: () => value
+});
 var import_lodash = __toESM(require("lodash"), 1);
 var systemMap = {};
 var datetimeregex = /^([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1])(T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00)))?)?)?$/;
+var defaultValues = {};
+var userValues = {};
+var setValues = (url, values, type = "user") => {
+  if (type === "default") {
+    defaultValues[url] ?? (defaultValues[url] = {});
+    defaultValues[url] = values;
+  } else {
+    userValues[url] ?? (userValues[url] = {});
+    userValues[url] = values;
+  }
+};
+var extendValues = (url, values, type = "user") => {
+  if (type === "default") {
+    defaultValues[url] ?? (defaultValues[url] = {});
+    Object.assign(defaultValues[url], values);
+  } else {
+    userValues[url] ?? (userValues[url] = {});
+    Object.assign(userValues[url], values);
+  }
+};
+var lookupValue = (url, code) => {
+  var _a, _b;
+  let value2;
+  value2 = ((_a = userValues[url]) == null ? void 0 : _a[code]) ?? code;
+  value2 = ((_b = defaultValues[url]) == null ? void 0 : _b[value2]) ?? value2;
+  return value2;
+};
 var mapSystems = (obj) => {
   if (Array.isArray(obj)) {
     return obj.map(mapSystems);
@@ -461,6 +520,13 @@ var mapSystems = (obj) => {
   }
   return obj;
 };
+var mapValues = (obj, hints) => {
+  const newObj = { ...obj };
+  for (const key in obj) {
+    newObj[key] = key in hints ? lookupValue(hints[key], obj[key]) : newObj[key];
+  }
+  return newObj;
+};
 var setSystemMap = (newMappings) => (state) => {
   systemMap = newMappings;
   return state;
@@ -468,20 +534,19 @@ var setSystemMap = (newMappings) => (state) => {
 var extendSystemMap = (newMappings) => {
   Object.assign(systemMap, newMappings);
 };
-var identifier = (id2, ...ext2) => {
+var identifier = (id2, ext2 = [], valueHints = {}) => {
   if (Array.isArray(id2)) {
-    return id2.map((i2) => identifier(i2));
+    return id2.map((i2) => identifier(i2, ext2, valueHints));
   }
-  const i = {};
+  const i = mapValues(id2, valueHints);
   if (typeof id2 === "string") {
     i.value = id2;
   } else {
-    if (id2.type) {
-      id2.type = concept(id2.type);
+    if (i.type) {
+      i.type = concept(i.type);
     }
-    Object.assign(i, id2);
   }
-  ext2.forEach((e) => {
+  ext2 == null ? void 0 : ext2.forEach((e) => {
     addExtension(i, e.url, e.value);
   });
   return mapSystems(i);
@@ -511,11 +576,20 @@ var findExtension = (obj, targetUrl, path) => {
   }
   return result;
 };
-var coding = (code, system, extra = {}) => mapSystems({
-  code,
-  system,
-  ...extra
-});
+function coding(code, system, extra = {}) {
+  if (arguments.length === 1) {
+    if (Array.isArray(arguments[0])) {
+      const [code2, system2, extra2] = arguments[0];
+      return coding(code2, system2, extra2);
+    }
+    return mapSystems(arguments[0]);
+  }
+  return mapSystems({
+    code,
+    system,
+    ...extra
+  });
+}
 var c = coding;
 var value = (value2, system, ...extra) => mapSystems({
   value: value2,
@@ -596,7 +670,6 @@ var composite = (object, key, value2) => {
 };
 
 // src/profiles/Account.ts
-var import_lodash2 = __toESM(require("lodash"), 1);
 function Account_default(props) {
   const resource = {
     resourceType: "Account",
@@ -3183,6 +3256,13 @@ function Encounter_default(props) {
       resource.statusHistory.push(_statusHistory);
     }
   }
+  if (!import_lodash33.default.isNil(props.class)) {
+    let src = props.class;
+    if (typeof src === "string") {
+      src = lookupValue("http://terminology.hl7.org/ValueSet/v3-ActEncounterCode", src);
+    }
+    resource.class = coding(src);
+  }
   if (!import_lodash33.default.isNil(props.classHistory)) {
     let src = props.classHistory;
     if (!Array.isArray(src)) {
@@ -4271,6 +4351,13 @@ function ImagingStudy_default(props) {
     }
     resource.identifier = identifier(props.identifier);
   }
+  if (!import_lodash48.default.isNil(props.modality)) {
+    let src = props.modality;
+    if (typeof src === "string") {
+      src = lookupValue("http://dicom.nema.org/medical/dicom/current/output/chtml/part16/sect_CID_29.html", src);
+    }
+    resource.modality = coding(src);
+  }
   if (!import_lodash48.default.isNil(props.subject)) {
     resource.subject = reference(props.subject);
   }
@@ -4829,6 +4916,13 @@ function Location_default(props) {
     }
     resource.identifier = identifier(props.identifier);
   }
+  if (!import_lodash57.default.isNil(props.operationalStatus)) {
+    let src = props.operationalStatus;
+    if (typeof src === "string") {
+      src = lookupValue("http://terminology.hl7.org/ValueSet/v2-0116", src);
+    }
+    resource.operationalStatus = coding(src);
+  }
   if (!import_lodash57.default.isNil(props.type)) {
     if (!Array.isArray(props.type)) {
       props.type = [props.type];
@@ -5803,6 +5897,13 @@ function MedicinalProductDefinition_default(props) {
     }
     resource.clinicalTrial = reference(props.clinicalTrial);
   }
+  if (!import_lodash68.default.isNil(props.code)) {
+    let src = props.code;
+    if (typeof src === "string") {
+      src = lookupValue("http://hl7.org/fhir/ValueSet/medication-codes", src);
+    }
+    resource.code = coding(src);
+  }
   if (!import_lodash68.default.isNil(props.name)) {
     let src = props.name;
     if (!Array.isArray(src)) {
@@ -6969,6 +7070,13 @@ function Questionnaire_default(props) {
     }
     resource.jurisdiction = concept(props.jurisdiction);
   }
+  if (!import_lodash85.default.isNil(props.code)) {
+    let src = props.code;
+    if (typeof src === "string") {
+      src = lookupValue("http://hl7.org/fhir/ValueSet/questionnaire-questions", src);
+    }
+    resource.code = coding(src);
+  }
   if (!import_lodash85.default.isNil(props.item)) {
     let src = props.item;
     if (!Array.isArray(src)) {
@@ -9820,6 +9928,7 @@ var src_default = Adaptor_exports;
   cursor,
   dataPath,
   dataValue,
+  datatypes,
   dateFns,
   delete: null,
   each,

package/dist/index.js

@@ -340,6 +340,7 @@ __export(builders_exports, {
   explanationOfBenefit: () => explanationOfBenefit,
   ext: () => ext,
   extendSystemMap: () => extendSystemMap,
+  extendValues: () => extendValues,
   extension: () => extension,
   familyMemberHistory: () => familyMemberHistory,
   findExtension: () => findExtension,
@@ -360,8 +361,10 @@ __export(builders_exports, {
   library: () => library,
   list: () => list,
   location: () => location,
+  lookupValue: () => lookupValue,
   manufacturedItemDefinition: () => manufacturedItemDefinition,
   mapSystems: () => mapSystems,
+  mapValues: () => mapValues,
   measure: () => measure,
   measureReport: () => measureReport,
   media: () => media,
@@ -403,6 +406,7 @@ __export(builders_exports, {
   schedule: () => schedule,
   serviceRequest: () => serviceRequest,
   setSystemMap: () => setSystemMap,
+  setValues: () => setValues,
   slot: () => slot,
   specimen: () => specimen,
   specimenDefinition: () => specimenDefinition,
@@ -417,10 +421,64 @@ __export(builders_exports, {
   visionPrescription: () => visionPrescription
 });
 
+// src/profiles/Account.ts
+import _2 from "lodash";
+
 // src/datatypes.ts
+var datatypes_exports = {};
+__export(datatypes_exports, {
+  addExtension: () => addExtension,
+  c: () => c,
+  cc: () => cc,
+  coding: () => coding,
+  composite: () => composite,
+  concept: () => concept,
+  ext: () => ext,
+  extendSystemMap: () => extendSystemMap,
+  extendValues: () => extendValues,
+  extension: () => extension,
+  findExtension: () => findExtension,
+  id: () => id,
+  identifier: () => identifier,
+  lookupValue: () => lookupValue,
+  mapSystems: () => mapSystems,
+  mapValues: () => mapValues,
+  ref: () => ref,
+  reference: () => reference,
+  setSystemMap: () => setSystemMap,
+  setValues: () => setValues,
+  value: () => value
+});
 import _ from "lodash";
 var systemMap = {};
 var datetimeregex = /^([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1])(T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00)))?)?)?$/;
+var defaultValues = {};
+var userValues = {};
+var setValues = (url, values, type = "user") => {
+  if (type === "default") {
+    defaultValues[url] ?? (defaultValues[url] = {});
+    defaultValues[url] = values;
+  } else {
+    userValues[url] ?? (userValues[url] = {});
+    userValues[url] = values;
+  }
+};
+var extendValues = (url, values, type = "user") => {
+  if (type === "default") {
+    defaultValues[url] ?? (defaultValues[url] = {});
+    Object.assign(defaultValues[url], values);
+  } else {
+    userValues[url] ?? (userValues[url] = {});
+    Object.assign(userValues[url], values);
+  }
+};
+var lookupValue = (url, code) => {
+  var _a, _b;
+  let value2;
+  value2 = ((_a = userValues[url]) == null ? void 0 : _a[code]) ?? code;
+  value2 = ((_b = defaultValues[url]) == null ? void 0 : _b[value2]) ?? value2;
+  return value2;
+};
 var mapSystems = (obj) => {
   if (Array.isArray(obj)) {
     return obj.map(mapSystems);
@@ -433,6 +491,13 @@ var mapSystems = (obj) => {
   }
   return obj;
 };
+var mapValues = (obj, hints) => {
+  const newObj = { ...obj };
+  for (const key in obj) {
+    newObj[key] = key in hints ? lookupValue(hints[key], obj[key]) : newObj[key];
+  }
+  return newObj;
+};
 var setSystemMap = (newMappings) => (state) => {
   systemMap = newMappings;
   return state;
@@ -440,20 +505,19 @@ var setSystemMap = (newMappings) => (state) => {
 var extendSystemMap = (newMappings) => {
   Object.assign(systemMap, newMappings);
 };
-var identifier = (id2, ...ext2) => {
+var identifier = (id2, ext2 = [], valueHints = {}) => {
   if (Array.isArray(id2)) {
-    return id2.map((i2) => identifier(i2));
+    return id2.map((i2) => identifier(i2, ext2, valueHints));
   }
-  const i = {};
+  const i = mapValues(id2, valueHints);
   if (typeof id2 === "string") {
     i.value = id2;
   } else {
-    if (id2.type) {
-      id2.type = concept(id2.type);
+    if (i.type) {
+      i.type = concept(i.type);
     }
-    Object.assign(i, id2);
   }
-  ext2.forEach((e) => {
+  ext2 == null ? void 0 : ext2.forEach((e) => {
     addExtension(i, e.url, e.value);
   });
   return mapSystems(i);
@@ -483,11 +547,20 @@ var findExtension = (obj, targetUrl, path) => {
   }
   return result;
 };
-var coding = (code, system, extra = {}) => mapSystems({
-  code,
-  system,
-  ...extra
-});
+function coding(code, system, extra = {}) {
+  if (arguments.length === 1) {
+    if (Array.isArray(arguments[0])) {
+      const [code2, system2, extra2] = arguments[0];
+      return coding(code2, system2, extra2);
+    }
+    return mapSystems(arguments[0]);
+  }
+  return mapSystems({
+    code,
+    system,
+    ...extra
+  });
+}
 var c = coding;
 var value = (value2, system, ...extra) => mapSystems({
   value: value2,
@@ -568,7 +641,6 @@ var composite = (object, key, value2) => {
 };
 
 // src/profiles/Account.ts
-import _2 from "lodash";
 function Account_default(props) {
   const resource = {
     resourceType: "Account",
@@ -3155,6 +3227,13 @@ function Encounter_default(props) {
       resource.statusHistory.push(_statusHistory);
     }
   }
+  if (!_33.isNil(props.class)) {
+    let src = props.class;
+    if (typeof src === "string") {
+      src = lookupValue("http://terminology.hl7.org/ValueSet/v3-ActEncounterCode", src);
+    }
+    resource.class = coding(src);
+  }
   if (!_33.isNil(props.classHistory)) {
     let src = props.classHistory;
     if (!Array.isArray(src)) {
@@ -4243,6 +4322,13 @@ function ImagingStudy_default(props) {
     }
     resource.identifier = identifier(props.identifier);
   }
+  if (!_48.isNil(props.modality)) {
+    let src = props.modality;
+    if (typeof src === "string") {
+      src = lookupValue("http://dicom.nema.org/medical/dicom/current/output/chtml/part16/sect_CID_29.html", src);
+    }
+    resource.modality = coding(src);
+  }
   if (!_48.isNil(props.subject)) {
     resource.subject = reference(props.subject);
   }
@@ -4801,6 +4887,13 @@ function Location_default(props) {
     }
     resource.identifier = identifier(props.identifier);
   }
+  if (!_57.isNil(props.operationalStatus)) {
+    let src = props.operationalStatus;
+    if (typeof src === "string") {
+      src = lookupValue("http://terminology.hl7.org/ValueSet/v2-0116", src);
+    }
+    resource.operationalStatus = coding(src);
+  }
   if (!_57.isNil(props.type)) {
     if (!Array.isArray(props.type)) {
       props.type = [props.type];
@@ -5775,6 +5868,13 @@ function MedicinalProductDefinition_default(props) {
     }
     resource.clinicalTrial = reference(props.clinicalTrial);
   }
+  if (!_68.isNil(props.code)) {
+    let src = props.code;
+    if (typeof src === "string") {
+      src = lookupValue("http://hl7.org/fhir/ValueSet/medication-codes", src);
+    }
+    resource.code = coding(src);
+  }
   if (!_68.isNil(props.name)) {
     let src = props.name;
     if (!Array.isArray(src)) {
@@ -6941,6 +7041,13 @@ function Questionnaire_default(props) {
     }
     resource.jurisdiction = concept(props.jurisdiction);
   }
+  if (!_85.isNil(props.code)) {
+    let src = props.code;
+    if (typeof src === "string") {
+      src = lookupValue("http://hl7.org/fhir/ValueSet/questionnaire-questions", src);
+    }
+    resource.code = coding(src);
+  }
   if (!_85.isNil(props.item)) {
     let src = props.item;
     if (!Array.isArray(src)) {
@@ -9791,6 +9898,7 @@ export {
   cursor,
   dataPath,
   dataValue,
+  datatypes_exports as datatypes,
   dateFns,
   src_default as default,
   _delete as delete,

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@openfn/language-fhir-4",
   "label": "FHIR r4",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "OpenFn FHIR r4 adaptor",
   "author": "Open Function Group",
   "license": "LGPLv3",
   "type": "module",
   "fhir": {
     "specUrl": "https://hl7.org/fhir/R4B/definitions.json.zip",
-    "adaptorGeneratedDate": "2025-11-04T12:57:02.139Z",
-    "generatorVersion": "0.4.1",
+    "adaptorGeneratedDate": "2026-02-19T17:52:48.093Z",
+    "generatorVersion": "0.6.0",
     "options": {
       "simpleBuilders": true
     }