@openfn/language-fhir-4 0.3.2 → 0.4.0

package/dist/index.cjs

@@ -117,11 +117,11 @@ var logResponse = (response, query) => {
     }
     const message = `${method} ${urlWithQuery} - ${statusCode} in ${duration}ms`;
     if (response instanceof Error) {
-      console.error(message);
-      console.error("response body: ");
-      console.error(response.body || "[no body]");
+      logger.error(message);
+      logger.error("response body: ");
+      logger.error(response.body || "[no body]");
     } else {
-      console.log(message);
+      logger.log(message);
     }
   }
   return response;
@@ -129,7 +129,7 @@ var logResponse = (response, query) => {
 var request = (method, path, options) => {
   (0, import_util.assertRelativeUrl)(path);
   const { configuration, ...otherOptions } = options;
-  const fullPath = import_node_path.default.join(configuration.apiPath ?? "", path);
+  const fullPath = import_node_path.default.join(configuration.apiPath ?? "/fhir", path);
   const headers = addAuth(options);
   const opts = {
     ...otherOptions,
@@ -144,20 +144,65 @@ var request = (method, path, options) => {
     baseUrl: configuration.baseUrl,
     parseAs: "json"
   };
-  return (0, import_util.request)(method, fullPath, opts).then(logResponse).catch(async (e) => {
+  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/)) {
-      const error = JSON.parse(e.body);
-      e.body = error;
-      if (error.issue && error.issue.length) {
-        console.error("Error from FHIR server:");
-        error.issue.forEach((issue) => {
-          console.error(issue.diagnostics);
-        });
-      }
+      logValidationErrors(e);
     }
     throw e;
   });
 };
+function logValidationErrors(response, logger2 = 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:");
+    const errCount = error.issue.reduce(
+      (count, e) => e.severity === "error" ? count + 1 : count,
+      0
+    );
+    if (errCount) {
+      logger2.error(` - ${errCount} Errors`);
+    }
+    const warnCount = error.issue.reduce(
+      (count, e) => e.severity === "error" ? count + 1 : count,
+      0
+    );
+    if (warnCount) {
+      logger2.error(` - ${warnCount} Warnings`);
+    }
+    logger2.log();
+    const groups = {};
+    error.issue.forEach((issue) => {
+      var _a, _b;
+      try {
+        let id2 = issue.location[0];
+        if (id2.startsWith("Bundle")) {
+          id2 = id2.split("*").at(1);
+        }
+        groups[id2] ?? (groups[id2] = {});
+        (_a = groups[id2])[_b = issue.severity] ?? (_a[_b] = []);
+        groups[id2][issue.severity].push(issue.diagnostics);
+      } catch (e) {
+        logger2.log("error parsing issue at ", issue.location);
+      }
+    });
+    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);
+        }
+        logger2.log();
+      });
+    }
+    response.validationIssues = groups;
+  } else {
+    response.body = error;
+  }
+  return response;
+}
 function collectRefs(value2) {
   if (!value2 || typeof value2 !== "object")
     return [];

package/dist/index.js

@@ -75,11 +75,11 @@ var logResponse = (response, query) => {
     }
     const message = `${method} ${urlWithQuery} - ${statusCode} in ${duration}ms`;
     if (response instanceof Error) {
-      console.error(message);
-      console.error("response body: ");
-      console.error(response.body || "[no body]");
+      logger.error(message);
+      logger.error("response body: ");
+      logger.error(response.body || "[no body]");
     } else {
-      console.log(message);
+      logger.log(message);
     }
   }
   return response;
@@ -87,7 +87,7 @@ var logResponse = (response, query) => {
 var request = (method, path, options) => {
   assertRelativeUrl(path);
   const { configuration, ...otherOptions } = options;
-  const fullPath = nodepath.join(configuration.apiPath ?? "", path);
+  const fullPath = nodepath.join(configuration.apiPath ?? "/fhir", path);
   const headers = addAuth(options);
   const opts = {
     ...otherOptions,
@@ -102,20 +102,65 @@ var request = (method, path, options) => {
     baseUrl: configuration.baseUrl,
     parseAs: "json"
   };
-  return commonRequest(method, fullPath, opts).then(logResponse).catch(async (e) => {
+  return commonRequest(method, fullPath, opts).then(logResponse).then().catch(async (e) => {
     if (e.headers && "content-type" in e.headers && e.headers["content-type"].match(/fhir\+json/)) {
-      const error = JSON.parse(e.body);
-      e.body = error;
-      if (error.issue && error.issue.length) {
-        console.error("Error from FHIR server:");
-        error.issue.forEach((issue) => {
-          console.error(issue.diagnostics);
-        });
-      }
+      logValidationErrors(e);
     }
     throw e;
   });
 };
+function logValidationErrors(response, logger2 = 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:");
+    const errCount = error.issue.reduce(
+      (count, e) => e.severity === "error" ? count + 1 : count,
+      0
+    );
+    if (errCount) {
+      logger2.error(` - ${errCount} Errors`);
+    }
+    const warnCount = error.issue.reduce(
+      (count, e) => e.severity === "error" ? count + 1 : count,
+      0
+    );
+    if (warnCount) {
+      logger2.error(` - ${warnCount} Warnings`);
+    }
+    logger2.log();
+    const groups = {};
+    error.issue.forEach((issue) => {
+      var _a, _b;
+      try {
+        let id2 = issue.location[0];
+        if (id2.startsWith("Bundle")) {
+          id2 = id2.split("*").at(1);
+        }
+        groups[id2] ?? (groups[id2] = {});
+        (_a = groups[id2])[_b = issue.severity] ?? (_a[_b] = []);
+        groups[id2][issue.severity].push(issue.diagnostics);
+      } catch (e) {
+        logger2.log("error parsing issue at ", issue.location);
+      }
+    });
+    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);
+        }
+        logger2.log();
+      });
+    }
+    response.validationIssues = groups;
+  } else {
+    response.body = error;
+  }
+  return response;
+}
 function collectRefs(value2) {
   if (!value2 || typeof value2 !== "object")
     return [];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openfn/language-fhir-4",
   "label": "FHIR r4",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "OpenFn FHIR r4 adaptor",
   "author": "Open Function Group",
   "license": "LGPLv3",