@openfn/language-fhir-4 0.4.0 → 0.4.2

package/dist/index.cjs

@@ -79,6 +79,7 @@ var import_util2 = require("@openfn/language-common/util");
 
 // src/util.ts
 var import_node_path = __toESM(require("path"), 1);
+var import_lodash_es = __toESM(require("lodash-es"), 1);
 var import_language_common = require("@openfn/language-common");
 var import_util = require("@openfn/language-common/util");
 function assertValidResourceId(id2) {
@@ -102,7 +103,7 @@ function addAuth(options) {
   return {};
 }
 var prepareNextState = (state, response) => {
-  const { body, ...responseWithoutBody } = response;
+  const { body, validationErrors, ...responseWithoutBody } = response;
   return {
     ...(0, import_language_common.composeNextState)(state, body),
     response: responseWithoutBody
@@ -117,11 +118,11 @@ var logResponse = (response, query) => {
     }
     const message = `${method} ${urlWithQuery} - ${statusCode} in ${duration}ms`;
     if (response instanceof Error) {
-      logger.error(message);
-      logger.error("response body: ");
-      logger.error(response.body || "[no body]");
+      console.error(message);
+      console.error("response body: ");
+      console.error(response.body || "[no body]");
     } else {
-      logger.log(message);
+      console.log(message);
     }
   }
   return response;
@@ -146,63 +147,102 @@ var request = (method, path, options) => {
   };
   return (0, import_util.request)(method, fullPath, opts).then(logResponse).then().catch(async (e) => {
     if (e.headers && "content-type" in e.headers && e.headers["content-type"].match(/fhir\+json/)) {
-      logValidationErrors(e);
+      logValidationErrors(e, opts.body);
     }
     throw e;
   });
 };
-function logValidationErrors(response, logger2 = console) {
+function logValidationErrors(response, payload, logger = console) {
   const error = JSON.parse(response.body);
   if (error.issue && error.issue.length) {
     delete response.body;
-    logger2.log();
-    logger2.error("FHIR server reports validation issues:");
+    logger.log();
+    logger.error("FHIR server reports validation issues:");
     const errCount = error.issue.reduce(
       (count, e) => e.severity === "error" ? count + 1 : count,
       0
     );
     if (errCount) {
-      logger2.error(` - ${errCount} Errors`);
+      logger.error(` - ${errCount} Errors`);
     }
     const warnCount = error.issue.reduce(
       (count, e) => e.severity === "error" ? count + 1 : count,
       0
     );
     if (warnCount) {
-      logger2.error(` - ${warnCount} Warnings`);
+      logger.error(` - ${warnCount} Warnings`);
     }
-    logger2.log();
+    logger.log();
     const groups = {};
     error.issue.forEach((issue) => {
-      var _a, _b;
+      var _a, _b, _c;
       try {
-        let id2 = issue.location[0];
-        if (id2.startsWith("Bundle")) {
-          id2 = id2.split("*").at(1);
+        let resourceId = "unidentified resource";
+        if (issue.location) {
+          let idx = issue.location[0].match(/Bundle.entry\[(\d+)\]/);
+          if (idx && idx.length >= 2) {
+            idx = idx[1];
+            const resource = (_a = import_lodash_es.default.get(payload, `entry[${idx}]`)) == null ? void 0 : _a.resource;
+            if (resource) {
+              resourceId = `${resource.resourceType}/${resource.id}`;
+            }
+          } else {
+            if (payload.resourceType && payload.id) {
+              resourceId = `${payload.resourceType}/${payload.id}`;
+            }
+          }
+        }
+        const type = `${issue.severity}s`;
+        groups[resourceId] ?? (groups[resourceId] = {});
+        let path = "*";
+        if (issue.location[0].match(/\.resource\./)) {
+          path = issue.location[0].split(/\.resource\./)[1];
+        } else if (issue.location.includes(`*${resourceId}*`)) {
+          const suffix = issue.location[0].split(/\.resource\./)[1];
+          if (suffix && suffix.length > 1) {
+            path = suffix;
+          }
         }
-        groups[id2] ?? (groups[id2] = {});
-        (_a = groups[id2])[_b = issue.severity] ?? (_a[_b] = []);
-        groups[id2][issue.severity].push(issue.diagnostics);
+        (_b = groups[resourceId])[type] ?? (_b[type] = {});
+        (_c = groups[resourceId][type])[path] ?? (_c[path] = []);
+        groups[resourceId][type][path].push(issue.diagnostics);
       } catch (e) {
-        logger2.log("error parsing issue at ", issue.location);
+        logger.log("error parsing issue at ", issue.location);
+        console.log(e);
       }
     });
     for (const resource in groups) {
-      logger2.log(`${resource} issues:`);
-      ["error", "warning"].forEach((type) => {
-        logger2.log(`  ${type}s:`.toUpperCase());
-        for (const e of groups[resource][type]) {
-          logger2.log("    -", e);
+      logger.log(`${resource} issues:`);
+      ["errors", "warnings"].forEach((type) => {
+        if (type in groups[resource]) {
+          logger.log(`  ${type}:`.toUpperCase());
+          for (const path in groups[resource][type]) {
+            logger.log();
+            logger.log("  ", path);
+            for (const message of groups[resource][type][path]) {
+              const fn2 = type === "error" ? console.error : console.warn;
+              fn2("    -", message);
+            }
+          }
+          logger.log();
         }
-        logger2.log();
       });
     }
-    response.validationIssues = groups;
+    logger.log("Issues will be written to state.fhirValidationIssues");
+    response.$validationIssues = groups;
   } else {
     response.body = error;
   }
   return response;
 }
+function cleanResponseObject(state, response) {
+  if (response.$validationIssues) {
+    state.fhirValidationIssues ?? (state.fhirValidationIssues = {});
+    Object.assign(state.fhirValidationIssues, response.$validationIssues);
+    delete response.$validationIssues;
+  }
+  return state;
+}
 function collectRefs(value2) {
   if (!value2 || typeof value2 !== "object")
     return [];
@@ -369,6 +409,9 @@ function create(resource) {
     const response = await request("POST", $resource.resourceType, {
       configuration: state.configuration,
       body: $resource
+    }).catch((e) => {
+      cleanResponseObject(state, e);
+      throw e;
     });
     console.log(`Created ${response.body.id}`);
     return prepareNextState(state, response);
@@ -433,6 +476,9 @@ function uploadBundle(bundle = "bundle") {
     const response = await request("POST", "/", {
       configuration: state.configuration,
       body: data
+    }).catch((e) => {
+      cleanResponseObject(state, e);
+      throw e;
     });
     return prepareNextState(state, response);
   };
@@ -785,6 +831,9 @@ var composite = (object, key, value2) => {
     k.push("CodeableConcept");
   } else if (value2.reference) {
     k.push("Reference");
+  }
+  if (value2.value && typeof value2.value === "number") {
+    k.push("Quantity");
   } else if (value2.id && value2.meta && value2.resourceType) {
     k.push("Reference");
     value2 = reference(value2);