@openfn/language-fhir-4 0.2.9 → 0.3.0

package/dist/index.cjs

@@ -29,6 +29,7 @@ __export(src_exports, {
   b: () => builders_exports,
   builders: () => builders_exports,
   create: () => create,
+  createBundle: () => createBundle,
   cursor: () => import_language_common3.cursor,
   dataPath: () => import_language_common3.dataPath,
   dataValue: () => import_language_common3.dataValue,
@@ -55,6 +56,7 @@ var Adaptor_exports = {};
 __export(Adaptor_exports, {
   addToBundle: () => addToBundle,
   create: () => create,
+  createBundle: () => createBundle,
   cursor: () => import_language_common3.cursor,
   dataPath: () => import_language_common3.dataPath,
   dataValue: () => import_language_common3.dataValue,
@@ -156,6 +158,67 @@ var request = (method, path, options) => {
     throw e;
   });
 };
+function collectRefs(value2) {
+  if (!value2 || typeof value2 !== "object")
+    return [];
+  if (Array.isArray(value2))
+    return value2.flatMap(collectRefs);
+  const refs = [];
+  if (typeof value2.reference === "string") {
+    refs.push(value2.reference);
+  }
+  for (const v of Object.values(value2)) {
+    refs.push(...collectRefs(v));
+  }
+  return refs;
+}
+function sortBundle(entries) {
+  const indexByRef = /* @__PURE__ */ new Map();
+  for (let i = 0; i < entries.length; i++) {
+    const { resourceType, id: id2 } = entries[i].resource;
+    if (resourceType && id2) {
+      indexByRef.set(`${resourceType}/${id2}`, i);
+    }
+  }
+  const n = entries.length;
+  const inDegree = new Array(n).fill(0);
+  const adj = Array.from({ length: n }, () => []);
+  for (let i = 0; i < n; i++) {
+    const deps = /* @__PURE__ */ new Set();
+    for (const ref2 of collectRefs(entries[i].resource)) {
+      const j = indexByRef.get(ref2);
+      if (j !== void 0 && j !== i)
+        deps.add(j);
+    }
+    for (const j of deps) {
+      adj[j].push(i);
+      inDegree[i]++;
+    }
+  }
+  const queue = [];
+  for (let i = 0; i < n; i++) {
+    if (inDegree[i] === 0)
+      queue.push(i);
+  }
+  const result = [];
+  while (queue.length > 0) {
+    const idx = queue.shift();
+    result.push(entries[idx]);
+    for (const dep of adj[idx]) {
+      if (--inDegree[dep] === 0) {
+        let k = 0;
+        while (k < queue.length && queue[k] < dep)
+          k++;
+        queue.splice(k, 0, dep);
+      }
+    }
+  }
+  for (let i = 0; i < n; i++) {
+    if (inDegree[i] > 0)
+      result.push(entries[i]);
+  }
+  return result;
+}
 
 // src/Adaptor.ts
 var import_language_common3 = require("@openfn/language-common");
@@ -266,6 +329,18 @@ function create(resource) {
     return prepareNextState(state, response);
   };
 }
+function createBundle(options, props = {}) {
+  return (state) => {
+    const [{ name = "bundle", type = "transaction" }, $props] = (0, import_util2.expandReferences)(state, options, props);
+    state[name] = {
+      resourceType: "Bundle",
+      type,
+      entry: [],
+      ...props
+    };
+    return state;
+  };
+}
 function addToBundle(resources, name = "bundle") {
   return (state) => {
     let [$resources, $name] = (0, import_util2.expandReferences)(state, resources, name);
@@ -309,6 +384,7 @@ function uploadBundle(bundle = "bundle") {
         bundle: $bundle ?? "bundle (default)"
       });
     }
+    data.entry = sortBundle(data.entry);
     const response = await request("POST", "/", {
       configuration: state.configuration,
       body: data
@@ -361,6 +437,7 @@ __export(builders_exports, {
   encounter: () => encounter,
   enrollmentRequest: () => enrollmentRequest,
   enrollmentResponse: () => enrollmentResponse,
+  ensureConceptText: () => ensureConceptText,
   episodeOfCare: () => episodeOfCare,
   eventDefinition: () => eventDefinition,
   evidence: () => evidence,
@@ -462,6 +539,7 @@ __export(datatypes_exports, {
   coding: () => coding,
   composite: () => composite,
   concept: () => concept,
+  ensureConceptText: () => ensureConceptText,
   ext: () => ext,
   extendSystemMap: () => extendSystemMap,
   extendValues: () => extendValues,
@@ -483,7 +561,25 @@ 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 mapExtraKeys = (values, keys = ["display"]) => {
+  const result = { ...values };
+  try {
+    for (const code in values) {
+      const v = values[code];
+      if (typeof v !== "string") {
+        for (const key of keys) {
+          if (key in v) {
+            result[v[key]] = v;
+          }
+        }
+      }
+    }
+  } catch (e) {
+  }
+  return result;
+};
 var setValues = (url, values, type = "user") => {
+  values = mapExtraKeys(values);
   if (type === "default") {
     defaultValues[url] ?? (defaultValues[url] = {});
     defaultValues[url] = values;
@@ -493,6 +589,7 @@ var setValues = (url, values, type = "user") => {
   }
 };
 var extendValues = (url, values, type = "user") => {
+  values = mapExtraKeys(values);
   if (type === "default") {
     defaultValues[url] ?? (defaultValues[url] = {});
     Object.assign(defaultValues[url], values);
@@ -538,13 +635,9 @@ var identifier = (id2, ext2 = [], valueHints = {}) => {
   if (Array.isArray(id2)) {
     return id2.map((i2) => identifier(i2, ext2, valueHints));
   }
-  const i = mapValues(id2, valueHints);
-  if (typeof id2 === "string") {
-    i.value = id2;
-  } else {
-    if (i.type) {
-      i.type = concept(i.type);
-    }
+  const i = typeof id2 === "string" ? mapValues({ value: id2 }, valueHints) : mapValues(id2, valueHints);
+  if (i.type) {
+    i.type = concept(i.type);
   }
   ext2 == null ? void 0 : ext2.forEach((e) => {
     addExtension(i, e.url, e.value);
@@ -615,6 +708,12 @@ var concept = (codings, extra = {}) => {
   };
 };
 var cc = concept;
+var ensureConceptText = (concept2) => {
+  var _a;
+  if (!concept2.text && ((_a = concept2.coding) == null ? void 0 : _a.length)) {
+    concept2.text = concept2.coding[0].display;
+  }
+};
 var reference = (ref2, opts = {}) => {
   if (Array.isArray(ref2)) {
     return ref2.map(reference, opts);
@@ -9925,6 +10024,7 @@ var src_default = Adaptor_exports;
   b,
   builders,
   create,
+  createBundle,
   cursor,
   dataPath,
   dataValue,

package/dist/index.js

@@ -9,6 +9,7 @@ var Adaptor_exports = {};
 __export(Adaptor_exports, {
   addToBundle: () => addToBundle,
   create: () => create,
+  createBundle: () => createBundle,
   cursor: () => cursor,
   dataPath: () => dataPath,
   dataValue: () => dataValue,
@@ -115,6 +116,67 @@ var request = (method, path, options) => {
     throw e;
   });
 };
+function collectRefs(value2) {
+  if (!value2 || typeof value2 !== "object")
+    return [];
+  if (Array.isArray(value2))
+    return value2.flatMap(collectRefs);
+  const refs = [];
+  if (typeof value2.reference === "string") {
+    refs.push(value2.reference);
+  }
+  for (const v of Object.values(value2)) {
+    refs.push(...collectRefs(v));
+  }
+  return refs;
+}
+function sortBundle(entries) {
+  const indexByRef = /* @__PURE__ */ new Map();
+  for (let i = 0; i < entries.length; i++) {
+    const { resourceType, id: id2 } = entries[i].resource;
+    if (resourceType && id2) {
+      indexByRef.set(`${resourceType}/${id2}`, i);
+    }
+  }
+  const n = entries.length;
+  const inDegree = new Array(n).fill(0);
+  const adj = Array.from({ length: n }, () => []);
+  for (let i = 0; i < n; i++) {
+    const deps = /* @__PURE__ */ new Set();
+    for (const ref2 of collectRefs(entries[i].resource)) {
+      const j = indexByRef.get(ref2);
+      if (j !== void 0 && j !== i)
+        deps.add(j);
+    }
+    for (const j of deps) {
+      adj[j].push(i);
+      inDegree[i]++;
+    }
+  }
+  const queue = [];
+  for (let i = 0; i < n; i++) {
+    if (inDegree[i] === 0)
+      queue.push(i);
+  }
+  const result = [];
+  while (queue.length > 0) {
+    const idx = queue.shift();
+    result.push(entries[idx]);
+    for (const dep of adj[idx]) {
+      if (--inDegree[dep] === 0) {
+        let k = 0;
+        while (k < queue.length && queue[k] < dep)
+          k++;
+        queue.splice(k, 0, dep);
+      }
+    }
+  }
+  for (let i = 0; i < n; i++) {
+    if (inDegree[i] > 0)
+      result.push(entries[i]);
+  }
+  return result;
+}
 
 // src/Adaptor.ts
 import {
@@ -237,6 +299,18 @@ function create(resource) {
     return prepareNextState(state, response);
   };
 }
+function createBundle(options, props = {}) {
+  return (state) => {
+    const [{ name = "bundle", type = "transaction" }, $props] = expandReferences(state, options, props);
+    state[name] = {
+      resourceType: "Bundle",
+      type,
+      entry: [],
+      ...props
+    };
+    return state;
+  };
+}
 function addToBundle(resources, name = "bundle") {
   return (state) => {
     let [$resources, $name] = expandReferences(state, resources, name);
@@ -280,6 +354,7 @@ function uploadBundle(bundle = "bundle") {
         bundle: $bundle ?? "bundle (default)"
       });
     }
+    data.entry = sortBundle(data.entry);
     const response = await request("POST", "/", {
       configuration: state.configuration,
       body: data
@@ -332,6 +407,7 @@ __export(builders_exports, {
   encounter: () => encounter,
   enrollmentRequest: () => enrollmentRequest,
   enrollmentResponse: () => enrollmentResponse,
+  ensureConceptText: () => ensureConceptText,
   episodeOfCare: () => episodeOfCare,
   eventDefinition: () => eventDefinition,
   evidence: () => evidence,
@@ -433,6 +509,7 @@ __export(datatypes_exports, {
   coding: () => coding,
   composite: () => composite,
   concept: () => concept,
+  ensureConceptText: () => ensureConceptText,
   ext: () => ext,
   extendSystemMap: () => extendSystemMap,
   extendValues: () => extendValues,
@@ -454,7 +531,25 @@ 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 mapExtraKeys = (values, keys = ["display"]) => {
+  const result = { ...values };
+  try {
+    for (const code in values) {
+      const v = values[code];
+      if (typeof v !== "string") {
+        for (const key of keys) {
+          if (key in v) {
+            result[v[key]] = v;
+          }
+        }
+      }
+    }
+  } catch (e) {
+  }
+  return result;
+};
 var setValues = (url, values, type = "user") => {
+  values = mapExtraKeys(values);
   if (type === "default") {
     defaultValues[url] ?? (defaultValues[url] = {});
     defaultValues[url] = values;
@@ -464,6 +559,7 @@ var setValues = (url, values, type = "user") => {
   }
 };
 var extendValues = (url, values, type = "user") => {
+  values = mapExtraKeys(values);
   if (type === "default") {
     defaultValues[url] ?? (defaultValues[url] = {});
     Object.assign(defaultValues[url], values);
@@ -509,13 +605,9 @@ var identifier = (id2, ext2 = [], valueHints = {}) => {
   if (Array.isArray(id2)) {
     return id2.map((i2) => identifier(i2, ext2, valueHints));
   }
-  const i = mapValues(id2, valueHints);
-  if (typeof id2 === "string") {
-    i.value = id2;
-  } else {
-    if (i.type) {
-      i.type = concept(i.type);
-    }
+  const i = typeof id2 === "string" ? mapValues({ value: id2 }, valueHints) : mapValues(id2, valueHints);
+  if (i.type) {
+    i.type = concept(i.type);
   }
   ext2 == null ? void 0 : ext2.forEach((e) => {
     addExtension(i, e.url, e.value);
@@ -586,6 +678,12 @@ var concept = (codings, extra = {}) => {
   };
 };
 var cc = concept;
+var ensureConceptText = (concept2) => {
+  var _a;
+  if (!concept2.text && ((_a = concept2.coding) == null ? void 0 : _a.length)) {
+    concept2.text = concept2.coding[0].display;
+  }
+};
 var reference = (ref2, opts = {}) => {
   if (Array.isArray(ref2)) {
     return ref2.map(reference, opts);
@@ -9895,6 +9993,7 @@ export {
   builders_exports as b,
   builders_exports as builders,
   create,
+  createBundle,
   cursor,
   dataPath,
   dataValue,

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@openfn/language-fhir-4",
   "label": "FHIR r4",
-  "version": "0.2.9",
+  "version": "0.3.0",
   "description": "OpenFn FHIR r4 adaptor",
   "author": "Open Function Group",
   "license": "LGPLv3",
   "type": "module",
   "fhir": {
     "specUrl": "https://hl7.org/fhir/R4B/definitions.json.zip",
-    "adaptorGeneratedDate": "2026-02-19T17:52:48.093Z",
-    "generatorVersion": "0.6.0",
+    "adaptorGeneratedDate": "2026-02-24T16:33:46.057Z",
+    "generatorVersion": "0.7.0",
     "options": {
       "simpleBuilders": true
     }