@openfn/language-openhim 0.3.16 → 2.0.0

package/dist/index.cjs

@@ -1,8 +1,6 @@
-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)
@@ -16,84 +14,261 @@ 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
 var src_exports = {};
 __export(src_exports, {
-  dataPath: () => import_language_common2.dataPath,
-  dataValue: () => import_language_common2.dataValue,
+  as: () => import_language_common3.as,
+  createChannel: () => createChannel,
+  createClient: () => createClient,
+  createEncounter: () => createEncounter,
+  createTask: () => createTask,
+  cursor: () => import_language_common3.cursor,
+  dataPath: () => import_language_common3.dataPath,
+  dataValue: () => import_language_common3.dataValue,
+  dateFns: () => import_language_common3.dateFns,
   default: () => src_default,
-  encounter: () => encounter,
+  each: () => import_language_common3.each,
   execute: () => execute,
-  field: () => import_language_common2.field,
-  fields: () => import_language_common2.fields,
-  fn: () => import_language_common2.fn,
-  fnIf: () => import_language_common2.fnIf,
-  lastReferenceValue: () => import_language_common2.lastReferenceValue,
-  merge: () => import_language_common2.merge,
-  sourceValue: () => import_language_common2.sourceValue
+  field: () => import_language_common3.field,
+  fields: () => import_language_common3.fields,
+  fn: () => import_language_common3.fn,
+  fnIf: () => import_language_common3.fnIf,
+  getChannels: () => getChannels,
+  getClients: () => getClients,
+  getTasks: () => getTasks,
+  getTransactions: () => getTransactions,
+  http: () => http_exports,
+  lastReferenceValue: () => import_language_common3.lastReferenceValue,
+  map: () => import_language_common3.map,
+  merge: () => import_language_common3.merge,
+  sourceValue: () => import_language_common3.sourceValue
 });
 module.exports = __toCommonJS(src_exports);
 
 // src/Adaptor.js
 var Adaptor_exports = {};
 __export(Adaptor_exports, {
-  dataPath: () => import_language_common2.dataPath,
-  dataValue: () => import_language_common2.dataValue,
-  encounter: () => encounter,
+  as: () => import_language_common3.as,
+  createChannel: () => createChannel,
+  createClient: () => createClient,
+  createEncounter: () => createEncounter,
+  createTask: () => createTask,
+  cursor: () => import_language_common3.cursor,
+  dataPath: () => import_language_common3.dataPath,
+  dataValue: () => import_language_common3.dataValue,
+  dateFns: () => import_language_common3.dateFns,
+  each: () => import_language_common3.each,
   execute: () => execute,
-  field: () => import_language_common2.field,
-  fields: () => import_language_common2.fields,
-  fn: () => import_language_common2.fn,
-  fnIf: () => import_language_common2.fnIf,
-  lastReferenceValue: () => import_language_common2.lastReferenceValue,
-  merge: () => import_language_common2.merge,
-  sourceValue: () => import_language_common2.sourceValue
+  field: () => import_language_common3.field,
+  fields: () => import_language_common3.fields,
+  fn: () => import_language_common3.fn,
+  fnIf: () => import_language_common3.fnIf,
+  getChannels: () => getChannels,
+  getClients: () => getClients,
+  getTasks: () => getTasks,
+  getTransactions: () => getTransactions,
+  lastReferenceValue: () => import_language_common3.lastReferenceValue,
+  map: () => import_language_common3.map,
+  merge: () => import_language_common3.merge,
+  sourceValue: () => import_language_common3.sourceValue
 });
+var import_language_common2 = require("@openfn/language-common");
+var import_util2 = require("@openfn/language-common/util");
+
+// src/Util.js
 var import_language_common = require("@openfn/language-common");
 var import_util = require("@openfn/language-common/util");
-
-// src/Client.js
-var import_superagent = __toESM(require("superagent"), 1);
-function post({ username, password, body, url }) {
-  return new Promise((resolve, reject) => {
-    import_superagent.default.post(url).type("json").accept("json").auth(username, password).send(JSON.stringify(body)).end((error, res) => {
-      if (!!error || !res.ok) {
-        reject(error);
-      }
-      resolve(res);
-    });
-  });
-}
+var prepareNextState = (state, response) => {
+  const { body, ...responseWithoutBody } = response;
+  if (!state.references) {
+    state.references = [];
+  }
+  return {
+    ...(0, import_language_common.composeNextState)(state, body),
+    response: responseWithoutBody
+  };
+};
+var request = async (configuration = {}, method, path, options) => {
+  const { apiUrl, username, password } = configuration;
+  const { query = {}, body = {}, headers = {}, parseAs = "json" } = options;
+  const authHeaders = (0, import_util.makeBasicAuthHeader)(username, password);
+  const opts = {
+    parseAs,
+    baseUrl: `${apiUrl}`,
+    body,
+    query,
+    headers: {
+      "content-type": "application/json",
+      ...headers,
+      ...authHeaders
+    },
+    ...options
+  };
+  return (0, import_util.request)(method, path, opts).then(import_util.logResponse);
+};
 
 // src/Adaptor.js
-var import_url = require("url");
-var import_language_common2 = require("@openfn/language-common");
+var import_language_common3 = require("@openfn/language-common");
 function execute(...operations) {
   const initialState = {
     references: [],
     data: null
   };
   return (state) => {
-    return (0, import_language_common.execute)(...operations)({ ...initialState, ...state });
+    return (0, import_language_common2.execute)(...operations)({ ...initialState, ...state });
   };
 }
-function encounter(encounterData) {
-  return (state) => {
-    const [body] = (0, import_util.expandReferences)(state, encounterData);
-    const { username, password, apiUrl } = state.configuration;
-    const url = (0, import_url.resolve)(apiUrl + "/", "chw/encounter");
-    console.log("Posting encounter:");
-    console.log(JSON.stringify(body, null, 2));
-    return post({ username, password, body, url }).then((result) => {
-      console.log("Success:", result);
-      return { ...state, references: [result, ...state.references] };
+function createEncounter(encounterData) {
+  return async (state) => {
+    const [body] = (0, import_util2.expandReferences)(state, encounterData);
+    const response = await request(
+      state.configuration,
+      "POST",
+      "/chw/encounter",
+      {
+        body,
+        parseAs: "text"
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function getTransactions(options = {}) {
+  return async (state) => {
+    const [resolvedoptions] = (0, import_util2.expandReferences)(state, options);
+    const { transactionId } = resolvedoptions;
+    delete resolvedoptions.transactionId;
+    const response = await request(
+      state.configuration,
+      "GET",
+      transactionId ? `/transactions/${transactionId}` : "/transactions",
+      {
+        query: {
+          ...resolvedoptions
+        }
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function getClients(clientId) {
+  return async (state) => {
+    const [resolvedClientId] = (0, import_util2.expandReferences)(state, clientId);
+    const response = await request(
+      state.configuration,
+      "GET",
+      resolvedClientId ? `/clients/${resolvedClientId}` : "/clients",
+      {}
+    );
+    return prepareNextState(state, response);
+  };
+}
+function createClient(body) {
+  return async (state) => {
+    const [resolvedBody] = (0, import_util2.expandReferences)(state, body);
+    const response = await request(
+      state.configuration,
+      "POST",
+      "/clients",
+      {
+        body: resolvedBody,
+        parseAs: "text"
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function getChannels(channelId) {
+  return async (state) => {
+    const [resolvedChannelId] = (0, import_util2.expandReferences)(state, channelId);
+    const response = await request(
+      state.configuration,
+      "GET",
+      resolvedChannelId ? `/channels/${resolvedChannelId}` : "/channels",
+      {}
+    );
+    return prepareNextState(state, response);
+  };
+}
+function createChannel(body) {
+  return async (state) => {
+    const [resolvedBody] = (0, import_util2.expandReferences)(state, body);
+    const response = await request(
+      state.configuration,
+      "POST",
+      "/channels",
+      {
+        body: resolvedBody,
+        parseAs: "text"
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function getTasks(options) {
+  return async (state) => {
+    const [resolvedoptions] = (0, import_util2.expandReferences)(state, options);
+    const { taskId } = resolvedoptions;
+    delete resolvedoptions.taskId;
+    const response = await request(
+      state.configuration,
+      "GET",
+      taskId ? `/tasks/${taskId}` : "/tasks",
+      {
+        query: resolvedoptions
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function createTask(body) {
+  return async (state) => {
+    const [resolvedBody] = (0, import_util2.expandReferences)(state, body);
+    const response = await request(state.configuration, "POST", "/tasks", {
+      body: resolvedBody,
+      parseAs: "text"
     });
+    return prepareNextState(state, response);
+  };
+}
+
+// src/http.js
+var http_exports = {};
+__export(http_exports, {
+  _delete: () => _delete,
+  get: () => get,
+  post: () => post,
+  put: () => put,
+  request: () => request2
+});
+var import_util3 = require("@openfn/language-common/util");
+function get(path, options) {
+  return request2("GET", path, null, options);
+}
+function post(path, body, options) {
+  return request2("POST", path, body, options);
+}
+function put(path, body, options) {
+  return request2("PUT", path, body, options);
+}
+function _delete(path, options) {
+  return request2("DELETE", path, null, options);
+}
+function request2(method, path, body, options = {}) {
+  return async (state) => {
+    const [resolvedMethod, resolvedPath, resolvedBody, resolvedoptions] = (0, import_util3.expandReferences)(state, method, path, body, options);
+    const response = await request(
+      state.configuration,
+      resolvedMethod,
+      resolvedPath,
+      {
+        body: resolvedBody,
+        ...resolvedoptions
+      }
+    );
+    return prepareNextState(state, response);
   };
 }
 
@@ -101,15 +276,28 @@ function encounter(encounterData) {
 var src_default = Adaptor_exports;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  as,
+  createChannel,
+  createClient,
+  createEncounter,
+  createTask,
+  cursor,
   dataPath,
   dataValue,
-  encounter,
+  dateFns,
+  each,
   execute,
   field,
   fields,
   fn,
   fnIf,
+  getChannels,
+  getClients,
+  getTasks,
+  getTransactions,
+  http,
   lastReferenceValue,
+  map,
   merge,
   sourceValue
 });

package/dist/index.js

@@ -7,46 +7,85 @@ var __export = (target, all) => {
 // src/Adaptor.js
 var Adaptor_exports = {};
 __export(Adaptor_exports, {
+  as: () => as,
+  createChannel: () => createChannel,
+  createClient: () => createClient,
+  createEncounter: () => createEncounter,
+  createTask: () => createTask,
+  cursor: () => cursor,
   dataPath: () => dataPath,
   dataValue: () => dataValue,
-  encounter: () => encounter,
+  dateFns: () => dateFns,
+  each: () => each,
   execute: () => execute,
   field: () => field,
   fields: () => fields,
   fn: () => fn,
   fnIf: () => fnIf,
+  getChannels: () => getChannels,
+  getClients: () => getClients,
+  getTasks: () => getTasks,
+  getTransactions: () => getTransactions,
   lastReferenceValue: () => lastReferenceValue,
+  map: () => map,
   merge: () => merge,
   sourceValue: () => sourceValue
 });
 import { execute as commonExecute } from "@openfn/language-common";
 import { expandReferences } from "@openfn/language-common/util";
 
-// src/Client.js
-import request from "superagent";
-function post({ username, password, body, url }) {
-  return new Promise((resolve, reject) => {
-    request.post(url).type("json").accept("json").auth(username, password).send(JSON.stringify(body)).end((error, res) => {
-      if (!!error || !res.ok) {
-        reject(error);
-      }
-      resolve(res);
-    });
-  });
-}
+// src/Util.js
+import { composeNextState } from "@openfn/language-common";
+import {
+  request as commonRequest,
+  logResponse,
+  makeBasicAuthHeader
+} from "@openfn/language-common/util";
+var prepareNextState = (state, response) => {
+  const { body, ...responseWithoutBody } = response;
+  if (!state.references) {
+    state.references = [];
+  }
+  return {
+    ...composeNextState(state, body),
+    response: responseWithoutBody
+  };
+};
+var request = async (configuration = {}, method, path, options) => {
+  const { apiUrl, username, password } = configuration;
+  const { query = {}, body = {}, headers = {}, parseAs = "json" } = options;
+  const authHeaders = makeBasicAuthHeader(username, password);
+  const opts = {
+    parseAs,
+    baseUrl: `${apiUrl}`,
+    body,
+    query,
+    headers: {
+      "content-type": "application/json",
+      ...headers,
+      ...authHeaders
+    },
+    ...options
+  };
+  return commonRequest(method, path, opts).then(logResponse);
+};
 
 // src/Adaptor.js
-import { resolve as resolveUrl } from "url";
 import {
-  fn,
   fnIf,
+  dataPath,
+  dataValue,
+  dateFns,
+  cursor,
+  each,
   field,
   fields,
-  sourceValue,
+  fn,
+  lastReferenceValue,
   merge,
-  dataPath,
-  dataValue,
-  lastReferenceValue
+  sourceValue,
+  as,
+  map
 } from "@openfn/language-common";
 function execute(...operations) {
   const initialState = {
@@ -57,33 +96,184 @@ function execute(...operations) {
     return commonExecute(...operations)({ ...initialState, ...state });
   };
 }
-function encounter(encounterData) {
-  return (state) => {
+function createEncounter(encounterData) {
+  return async (state) => {
     const [body] = expandReferences(state, encounterData);
-    const { username, password, apiUrl } = state.configuration;
-    const url = resolveUrl(apiUrl + "/", "chw/encounter");
-    console.log("Posting encounter:");
-    console.log(JSON.stringify(body, null, 2));
-    return post({ username, password, body, url }).then((result) => {
-      console.log("Success:", result);
-      return { ...state, references: [result, ...state.references] };
+    const response = await request(
+      state.configuration,
+      "POST",
+      "/chw/encounter",
+      {
+        body,
+        parseAs: "text"
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function getTransactions(options = {}) {
+  return async (state) => {
+    const [resolvedoptions] = expandReferences(state, options);
+    const { transactionId } = resolvedoptions;
+    delete resolvedoptions.transactionId;
+    const response = await request(
+      state.configuration,
+      "GET",
+      transactionId ? `/transactions/${transactionId}` : "/transactions",
+      {
+        query: {
+          ...resolvedoptions
+        }
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function getClients(clientId) {
+  return async (state) => {
+    const [resolvedClientId] = expandReferences(state, clientId);
+    const response = await request(
+      state.configuration,
+      "GET",
+      resolvedClientId ? `/clients/${resolvedClientId}` : "/clients",
+      {}
+    );
+    return prepareNextState(state, response);
+  };
+}
+function createClient(body) {
+  return async (state) => {
+    const [resolvedBody] = expandReferences(state, body);
+    const response = await request(
+      state.configuration,
+      "POST",
+      "/clients",
+      {
+        body: resolvedBody,
+        parseAs: "text"
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function getChannels(channelId) {
+  return async (state) => {
+    const [resolvedChannelId] = expandReferences(state, channelId);
+    const response = await request(
+      state.configuration,
+      "GET",
+      resolvedChannelId ? `/channels/${resolvedChannelId}` : "/channels",
+      {}
+    );
+    return prepareNextState(state, response);
+  };
+}
+function createChannel(body) {
+  return async (state) => {
+    const [resolvedBody] = expandReferences(state, body);
+    const response = await request(
+      state.configuration,
+      "POST",
+      "/channels",
+      {
+        body: resolvedBody,
+        parseAs: "text"
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function getTasks(options) {
+  return async (state) => {
+    const [resolvedoptions] = expandReferences(state, options);
+    const { taskId } = resolvedoptions;
+    delete resolvedoptions.taskId;
+    const response = await request(
+      state.configuration,
+      "GET",
+      taskId ? `/tasks/${taskId}` : "/tasks",
+      {
+        query: resolvedoptions
+      }
+    );
+    return prepareNextState(state, response);
+  };
+}
+function createTask(body) {
+  return async (state) => {
+    const [resolvedBody] = expandReferences(state, body);
+    const response = await request(state.configuration, "POST", "/tasks", {
+      body: resolvedBody,
+      parseAs: "text"
     });
+    return prepareNextState(state, response);
+  };
+}
+
+// src/http.js
+var http_exports = {};
+__export(http_exports, {
+  _delete: () => _delete,
+  get: () => get,
+  post: () => post,
+  put: () => put,
+  request: () => request2
+});
+import { expandReferences as expandReferences2 } from "@openfn/language-common/util";
+function get(path, options) {
+  return request2("GET", path, null, options);
+}
+function post(path, body, options) {
+  return request2("POST", path, body, options);
+}
+function put(path, body, options) {
+  return request2("PUT", path, body, options);
+}
+function _delete(path, options) {
+  return request2("DELETE", path, null, options);
+}
+function request2(method, path, body, options = {}) {
+  return async (state) => {
+    const [resolvedMethod, resolvedPath, resolvedBody, resolvedoptions] = expandReferences2(state, method, path, body, options);
+    const response = await request(
+      state.configuration,
+      resolvedMethod,
+      resolvedPath,
+      {
+        body: resolvedBody,
+        ...resolvedoptions
+      }
+    );
+    return prepareNextState(state, response);
   };
 }
 
 // src/index.js
 var src_default = Adaptor_exports;
 export {
+  as,
+  createChannel,
+  createClient,
+  createEncounter,
+  createTask,
+  cursor,
   dataPath,
   dataValue,
+  dateFns,
   src_default as default,
-  encounter,
+  each,
   execute,
   field,
   fields,
   fn,
   fnIf,
+  getChannels,
+  getClients,
+  getTasks,
+  getTransactions,
+  http_exports as http,
   lastReferenceValue,
+  map,
   merge,
   sourceValue
 };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@openfn/language-openhim",
   "label": "OpenHIM",
-  "version": "0.3.16",
-  "description": "openhim Language Pack for OpenFn",
+  "version": "2.0.0",
+  "description": "OpenFn adaptor for OpenHIM",
   "main": "dist/index.cjs",
   "author": "Open Function Group",
   "license": "LGPLv3",
@@ -14,21 +14,20 @@
   ],
   "dependencies": {
     "JSONPath": "^0.10.0",
-    "lodash-fp": "^0.10.2",
-    "superagent": "^3.7.0",
-    "@openfn/language-common": "3.0.1"
+    "lodash-fp": "^0.10.4",
+    "@openfn/language-common": "3.0.2"
   },
   "devDependencies": {
-    "assertion-error": "^1.0.1",
+    "assertion-error": "^1.1.0",
     "babel-cli": "^6.26.0",
-    "babel-core": "^6.1.2",
-    "babel-preset-es2015": "^6.1.2",
-    "babel-preset-stage-0": "^6.3.13",
-    "chai": "^3.4.0",
+    "babel-core": "^6.26.3",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-stage-0": "^6.24.1",
+    "chai": "4.3.6",
     "deep-eql": "^0.1.3",
+    "mocha": "^10.8.2",
     "rimraf": "^3.0.2",
-    "sinon": "^1.17.2",
-    "superagent-mock": "^1.10.0"
+    "sinon": "^1.17.7"
   },
   "repository": {
     "type": "git",