@openfn/language-satusehat 1.1.3 → 2.0.1

package/ast.json

@@ -8,7 +8,7 @@
         "callback"
       ],
       "docs": {
-        "description": "Make a get request to any satusehat endpoint",
+        "description": "Make a GET request to Satusehat",
         "tags": [
           {
             "title": "public",
@@ -72,7 +72,7 @@
         "callback"
       ],
       "docs": {
-        "description": "Make a post request to satusehat",
+        "description": "Make a POST request to Satusehat",
         "tags": [
           {
             "title": "example",
@@ -148,7 +148,7 @@
         "callback"
       ],
       "docs": {
-        "description": "Make a put request to satusehat",
+        "description": "Make a PUT request to Satusehat",
         "tags": [
           {
             "title": "example",
@@ -224,7 +224,7 @@
         "callback"
       ],
       "docs": {
-        "description": "Make a patch request to satusehat",
+        "description": "Make a PATCH request to Satusehat",
         "tags": [
           {
             "title": "example",

package/dist/index.cjs

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.js
@@ -70,6 +76,7 @@ var import_util2 = require("@openfn/language-common/util");
 
 // src/Utils.js
 var import_language_common = require("@openfn/language-common");
+var import_node_path = __toESM(require("path"), 1);
 var import_util = require("@openfn/language-common/util");
 var generateUserAgent = () => {
   return `nodejs/${process.version} @openfn/language-satusehat`;
@@ -140,15 +147,17 @@ async function request(configuration, path, opts) {
     "User-Agent": generateUserAgent(),
     "content-type": contentType
   };
+  (0, import_util.assertRelativeUrl)(path);
+  const safePath = import_node_path.default.join("fhir-r4/v1", path);
   const options = {
     body: data,
     headers,
     query: params,
     parseAs,
     maxRedirections: 1,
-    baseUrl: `${baseUrl}/fhir-r4/v1/`
+    baseUrl
   };
-  return (0, import_util.request)(method, path, options).then(import_util.logResponse);
+  return (0, import_util.request)(method, safePath, options).then(import_util.logResponse);
 }
 
 // src/Adaptor.js
@@ -176,13 +185,12 @@ function get(path, params = {}, callback = (s) => s) {
       params
     );
     try {
-      const response = await request(state.configuration, `/${resolvedPath}`, {
+      const response = await request(state.configuration, resolvedPath, {
         method: "GET",
         params: resolvedParams
       });
       return prepareNextState(state, response, callback);
     } catch (e) {
-      console.error(JSON.stringify(e.body, null, 2));
       throw e;
     }
   };
@@ -196,14 +204,13 @@ function post(path, data, params = {}, callback = (s) => s) {
       params
     );
     try {
-      const response = await request(state.configuration, `/${resolvedPath}`, {
+      const response = await request(state.configuration, resolvedPath, {
         method: "POST",
         data: resolvedData,
         params: resolvedParams
       });
       return prepareNextState(state, response, callback);
     } catch (e) {
-      console.error(JSON.stringify(e.body, null, 2));
       throw e;
     }
   };
@@ -217,14 +224,13 @@ function put(path, data, params = {}, callback = (s) => s) {
       params
     );
     try {
-      const response = await request(state.configuration, `/${resolvedPath}`, {
+      const response = await request(state.configuration, resolvedPath, {
         method: "PUT",
         data: resolvedData,
         params: resolvedParams
       });
       return prepareNextState(state, response, callback);
     } catch (e) {
-      console.error(JSON.stringify(e.body, null, 2));
       throw e;
     }
   };
@@ -238,7 +244,7 @@ function patch(path, data, params = {}, callback = (s) => s) {
       params
     );
     try {
-      const response = await request(state.configuration, `/${resolvedPath}`, {
+      const response = await request(state.configuration, resolvedPath, {
         method: "PATCH",
         data: JSON.stringify(resolvedData),
         params: resolvedParams,
@@ -246,7 +252,6 @@ function patch(path, data, params = {}, callback = (s) => s) {
       });
       return prepareNextState(state, response, callback);
     } catch (e) {
-      console.error(JSON.stringify(e.body, null, 2));
       throw e;
     }
   };

package/dist/index.js

@@ -32,9 +32,11 @@ import { expandReferences } from "@openfn/language-common/util";
 
 // src/Utils.js
 import { composeNextState } from "@openfn/language-common";
+import nodepath from "path";
 import {
   request as commonRequest,
-  logResponse
+  logResponse,
+  assertRelativeUrl
 } from "@openfn/language-common/util";
 var generateUserAgent = () => {
   return `nodejs/${process.version} @openfn/language-satusehat`;
@@ -105,15 +107,17 @@ async function request(configuration, path, opts) {
     "User-Agent": generateUserAgent(),
     "content-type": contentType
   };
+  assertRelativeUrl(path);
+  const safePath = nodepath.join("fhir-r4/v1", path);
   const options = {
     body: data,
     headers,
     query: params,
     parseAs,
     maxRedirections: 1,
-    baseUrl: `${baseUrl}/fhir-r4/v1/`
+    baseUrl
   };
-  return commonRequest(method, path, options).then(logResponse);
+  return commonRequest(method, safePath, options).then(logResponse);
 }
 
 // src/Adaptor.js
@@ -156,13 +160,12 @@ function get(path, params = {}, callback = (s) => s) {
       params
     );
     try {
-      const response = await request(state.configuration, `/${resolvedPath}`, {
+      const response = await request(state.configuration, resolvedPath, {
         method: "GET",
         params: resolvedParams
       });
       return prepareNextState(state, response, callback);
     } catch (e) {
-      console.error(JSON.stringify(e.body, null, 2));
       throw e;
     }
   };
@@ -176,14 +179,13 @@ function post(path, data, params = {}, callback = (s) => s) {
       params
     );
     try {
-      const response = await request(state.configuration, `/${resolvedPath}`, {
+      const response = await request(state.configuration, resolvedPath, {
         method: "POST",
         data: resolvedData,
         params: resolvedParams
       });
       return prepareNextState(state, response, callback);
     } catch (e) {
-      console.error(JSON.stringify(e.body, null, 2));
       throw e;
     }
   };
@@ -197,14 +199,13 @@ function put(path, data, params = {}, callback = (s) => s) {
       params
     );
     try {
-      const response = await request(state.configuration, `/${resolvedPath}`, {
+      const response = await request(state.configuration, resolvedPath, {
         method: "PUT",
         data: resolvedData,
         params: resolvedParams
       });
       return prepareNextState(state, response, callback);
     } catch (e) {
-      console.error(JSON.stringify(e.body, null, 2));
       throw e;
     }
   };
@@ -218,7 +219,7 @@ function patch(path, data, params = {}, callback = (s) => s) {
       params
     );
     try {
-      const response = await request(state.configuration, `/${resolvedPath}`, {
+      const response = await request(state.configuration, resolvedPath, {
         method: "PATCH",
         data: JSON.stringify(resolvedData),
         params: resolvedParams,
@@ -226,7 +227,6 @@ function patch(path, data, params = {}, callback = (s) => s) {
       });
       return prepareNextState(state, response, callback);
     } catch (e) {
-      console.error(JSON.stringify(e.body, null, 2));
       throw e;
     }
   };

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@openfn/language-satusehat",
-  "version": "1.1.3",
-  "description": "OpenFn satusehat adaptor",
+  "version": "2.0.1",
+  "description": "OpenFn Satusehat adaptor",
   "type": "module",
   "exports": {
     ".": {
       "import": "./dist/index.js",
+      "types": "./types/index.d.ts",
       "require": "./dist/index.cjs"
     },
     "./package.json": "./package.json"
@@ -19,7 +20,7 @@
     "configuration-schema.json"
   ],
   "dependencies": {
-    "@openfn/language-common": "1.15.1"
+    "@openfn/language-common": "2.0.1"
   },
   "devDependencies": {
     "assertion-error": "2.0.0",

package/types/Adaptor.d.ts

@@ -12,7 +12,7 @@
  */
 export function execute(...operations: Operations): Operation;
 /**
- * Make a get request to any satusehat endpoint
+ * Make a GET request to Satusehat
  * @public
  * @example
  * get("Organization", {"name": "somename"})
@@ -24,7 +24,7 @@ export function execute(...operations: Operations): Operation;
  */
 export function get(path: string, params?: object, callback?: Function): Operation;
 /**
- * Make a post request to satusehat
+ * Make a POST request to Satusehat
  * @example
  * post(
  *   "Organization",
@@ -41,7 +41,7 @@ export function get(path: string, params?: object, callback?: Function): Operati
  */
 export function post(path: string, data: object, params?: any, callback?: Function): Operation;
 /**
- * Make a put request to satusehat
+ * Make a PUT request to Satusehat
  * @example
  * put(
  *   "Organization/123",
@@ -58,7 +58,7 @@ export function post(path: string, data: object, params?: any, callback?: Functi
  */
 export function put(path: string, data: object, params?: any, callback?: Function): Operation;
 /**
- * Make a patch request to satusehat
+ * Make a PATCH request to Satusehat
  * @example
  * patch(
  *   "Organization/123",