@openfn/language-fhir-4 0.4.0 → 0.4.1

package/dist/index.cjs

@@ -117,11 +117,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;
@@ -151,50 +151,64 @@ var request = (method, path, options) => {
     throw e;
   });
 };
-function logValidationErrors(response, logger2 = console) {
+function logValidationErrors(response, 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 id2 = "unidentified resource";
+        if (issue.location) {
+          id2 = issue.location[0];
+          if (id2.startsWith("Bundle")) {
+            id2 = id2.split("*").at(1) ?? id2;
+          }
+        } else {
+          console.log({ issue });
         }
         groups[id2] ?? (groups[id2] = {});
         (_a = groups[id2])[_b = issue.severity] ?? (_a[_b] = []);
-        groups[id2][issue.severity].push(issue.diagnostics);
+        const path = issue.location[0];
+        (_c = groups[id2][issue.severity])[path] ?? (_c[path] = []);
+        groups[id2][issue.severity][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:`);
+      logger.log(`${resource} issues:`);
       ["error", "warning"].forEach((type) => {
-        logger2.log(`  ${type}s:`.toUpperCase());
-        for (const e of groups[resource][type]) {
-          logger2.log("    -", e);
+        if (type in groups[resource]) {
+          logger.log(`  ${type}s:`.toUpperCase());
+          for (const path in groups[resource][type]) {
+            logger.log();
+            logger.log("  ", path);
+            for (const message of groups[resource][type][path]) {
+              logger.log("    -", message);
+            }
+          }
+          logger.log();
         }
-        logger2.log();
       });
     }
     response.validationIssues = groups;
@@ -785,6 +799,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);

package/dist/index.js

@@ -75,11 +75,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;
@@ -109,50 +109,64 @@ var request = (method, path, options) => {
     throw e;
   });
 };
-function logValidationErrors(response, logger2 = console) {
+function logValidationErrors(response, 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 id2 = "unidentified resource";
+        if (issue.location) {
+          id2 = issue.location[0];
+          if (id2.startsWith("Bundle")) {
+            id2 = id2.split("*").at(1) ?? id2;
+          }
+        } else {
+          console.log({ issue });
         }
         groups[id2] ?? (groups[id2] = {});
         (_a = groups[id2])[_b = issue.severity] ?? (_a[_b] = []);
-        groups[id2][issue.severity].push(issue.diagnostics);
+        const path = issue.location[0];
+        (_c = groups[id2][issue.severity])[path] ?? (_c[path] = []);
+        groups[id2][issue.severity][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:`);
+      logger.log(`${resource} issues:`);
       ["error", "warning"].forEach((type) => {
-        logger2.log(`  ${type}s:`.toUpperCase());
-        for (const e of groups[resource][type]) {
-          logger2.log("    -", e);
+        if (type in groups[resource]) {
+          logger.log(`  ${type}s:`.toUpperCase());
+          for (const path in groups[resource][type]) {
+            logger.log();
+            logger.log("  ", path);
+            for (const message of groups[resource][type][path]) {
+              logger.log("    -", message);
+            }
+          }
+          logger.log();
         }
-        logger2.log();
       });
     }
     response.validationIssues = groups;
@@ -755,6 +769,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);

package/package.json

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