@openfn/language-mailchimp 0.5.0 → 0.6.0

package/dist/index.cjs

@@ -38,6 +38,7 @@ __export(src_exports, {
   field: () => import_language_common3.field,
   fields: () => import_language_common3.fields,
   fn: () => import_language_common3.fn,
+  get: () => get,
   lastReferenceValue: () => import_language_common3.lastReferenceValue,
   listAudienceInfo: () => listAudienceInfo,
   listAudiences: () => listAudiences,
@@ -45,6 +46,8 @@ __export(src_exports, {
   listMembers: () => listMembers,
   md5: () => import_md5.default,
   merge: () => import_language_common3.merge,
+  post: () => post,
+  request: () => request,
   sourceValue: () => import_language_common3.sourceValue,
   startBatch: () => startBatch,
   tagMembers: () => tagMembers,
@@ -69,6 +72,7 @@ __export(Adaptor_exports, {
   field: () => import_language_common3.field,
   fields: () => import_language_common3.fields,
   fn: () => import_language_common3.fn,
+  get: () => get,
   lastReferenceValue: () => import_language_common3.lastReferenceValue,
   listAudienceInfo: () => listAudienceInfo,
   listAudiences: () => listAudiences,
@@ -76,6 +80,8 @@ __export(Adaptor_exports, {
   listMembers: () => listMembers,
   md5: () => import_md5.default,
   merge: () => import_language_common3.merge,
+  post: () => post,
+  request: () => request,
   sourceValue: () => import_language_common3.sourceValue,
   startBatch: () => startBatch,
   tagMembers: () => tagMembers,
@@ -91,6 +97,14 @@ var import_language_common2 = require("@openfn/language-common");
 
 // src/Utils.js
 var import_language_common = require("@openfn/language-common");
+var import_undici = require("undici");
+var client;
+var getClient = (baseUrl) => {
+  if (client) {
+    return client;
+  }
+  return new import_undici.Client(baseUrl);
+};
 function handleResponse(response, state, callback) {
   const nextState = {
     ...(0, import_language_common.composeNextState)(state, response),
@@ -121,22 +135,27 @@ function execute(...operations) {
 }
 function createClient(state) {
   const { apiKey, server } = state.configuration;
+  const baseUrl = `https://${server}.api.mailchimp.com`;
+  const apiClient = getClient(baseUrl);
   import_mailchimp_marketing.default.setConfig({ apiKey, server });
-  return { ...state, client: import_mailchimp_marketing.default };
+  return { ...state, apiClient, client: import_mailchimp_marketing.default };
 }
 function cleanupState(state) {
-  delete state.client;
+  if (state == null ? void 0 : state.apiClient)
+    delete state.apiClient;
+  if (state == null ? void 0 : state.client)
+    delete state.client;
   return state;
 }
 function upsertMembers(params, callback = (s) => s) {
   return (state) => {
     const [resolvedParams] = (0, import_util.expandReferences)(state, params);
-    const defaultOptions = {
+    const defaultOptions2 = {
       update_existing: true,
       sync_tags: false
     };
     const { listId: listId2, users, options } = resolvedParams;
-    const opts = { ...defaultOptions, ...options };
+    const opts = { ...defaultOptions2, ...options };
     const membersList = users.map((member2) => ({
       email_address: member2.email,
       status: member2.status,
@@ -226,6 +245,58 @@ function listAudienceInfo(query, callback = (s) => s) {
     return state.client.lists.getList(listId2, queries).then((response) => handleResponse(response, state, callback));
   };
 }
+var defaultOptions = {
+  query: {},
+  body: void 0
+};
+var assertOK = (response, fullUrl) => {
+  if (response.statusCode >= 400) {
+    const defaultErrorMesssage = `Request to ${fullUrl} failed with status: ${response.statusCode}`;
+    const error = new Error(defaultErrorMesssage);
+    error.code = response.statusCode;
+    error.url = fullUrl;
+    throw error;
+  }
+};
+var request = (method, path, options, callback) => {
+  return async (state) => {
+    const apiVersion = "3.0";
+    const { apiKey, server } = state.configuration;
+    const [resolvedMethod, resolvedPath, resolvedOptions] = (0, import_util.expandReferences)(
+      state,
+      method,
+      path,
+      options
+    );
+    const { query, body } = { ...defaultOptions, ...resolvedOptions };
+    const apiToken = Buffer.from(`openfn:${apiKey}`, "utf-8").toString(
+      "base64"
+    );
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: `Basic ${apiToken}`
+    };
+    const urlPath = `/${apiVersion}${resolvedPath}`;
+    const response = await state.apiClient.request({
+      method: resolvedMethod,
+      path: urlPath,
+      headers,
+      query,
+      body: body ? JSON.stringify(body) : void 0
+    });
+    assertOK(response, `https://${server}.api.mailchimp.com${urlPath}`);
+    const responseBody = await response.body.json();
+    const nextState = {
+      data: responseBody,
+      response: responseBody
+    };
+    if (callback)
+      return callback(nextState);
+    return nextState;
+  };
+};
+var get = (path, query, callback) => request("GET", path, { query }, callback);
+var post = (path, body, query, callback) => request("POST", path, { body, query }, callback);
 
 // src/index.js
 var src_default = Adaptor_exports;
@@ -243,6 +314,7 @@ var src_default = Adaptor_exports;
   field,
   fields,
   fn,
+  get,
   lastReferenceValue,
   listAudienceInfo,
   listAudiences,
@@ -250,6 +322,8 @@ var src_default = Adaptor_exports;
   listMembers,
   md5,
   merge,
+  post,
+  request,
   sourceValue,
   startBatch,
   tagMembers,

package/dist/index.js

@@ -19,6 +19,7 @@ __export(Adaptor_exports, {
   field: () => field,
   fields: () => fields,
   fn: () => fn,
+  get: () => get,
   lastReferenceValue: () => lastReferenceValue,
   listAudienceInfo: () => listAudienceInfo,
   listAudiences: () => listAudiences,
@@ -26,6 +27,8 @@ __export(Adaptor_exports, {
   listMembers: () => listMembers,
   md5: () => md5,
   merge: () => merge,
+  post: () => post,
+  request: () => request,
   sourceValue: () => sourceValue,
   startBatch: () => startBatch,
   tagMembers: () => tagMembers,
@@ -35,12 +38,20 @@ __export(Adaptor_exports, {
 });
 import md5 from "md5";
 import axios from "axios";
-import client from "@mailchimp/mailchimp_marketing";
+import client2 from "@mailchimp/mailchimp_marketing";
 import { expandReferences } from "@openfn/language-common/util";
 import { execute as commonExecute } from "@openfn/language-common";
 
 // src/Utils.js
 import { composeNextState } from "@openfn/language-common";
+import { Client, MockAgent } from "undici";
+var client;
+var getClient = (baseUrl) => {
+  if (client) {
+    return client;
+  }
+  return new Client(baseUrl);
+};
 function handleResponse(response, state, callback) {
   const nextState = {
     ...composeNextState(state, response),
@@ -82,22 +93,27 @@ function execute(...operations) {
 }
 function createClient(state) {
   const { apiKey, server } = state.configuration;
-  client.setConfig({ apiKey, server });
-  return { ...state, client };
+  const baseUrl = `https://${server}.api.mailchimp.com`;
+  const apiClient = getClient(baseUrl);
+  client2.setConfig({ apiKey, server });
+  return { ...state, apiClient, client: client2 };
 }
 function cleanupState(state) {
-  delete state.client;
+  if (state == null ? void 0 : state.apiClient)
+    delete state.apiClient;
+  if (state == null ? void 0 : state.client)
+    delete state.client;
   return state;
 }
 function upsertMembers(params, callback = (s) => s) {
   return (state) => {
     const [resolvedParams] = expandReferences(state, params);
-    const defaultOptions = {
+    const defaultOptions2 = {
       update_existing: true,
       sync_tags: false
     };
     const { listId: listId2, users, options } = resolvedParams;
-    const opts = { ...defaultOptions, ...options };
+    const opts = { ...defaultOptions2, ...options };
     const membersList = users.map((member2) => ({
       email_address: member2.email,
       status: member2.status,
@@ -187,6 +203,58 @@ function listAudienceInfo(query, callback = (s) => s) {
     return state.client.lists.getList(listId2, queries).then((response) => handleResponse(response, state, callback));
   };
 }
+var defaultOptions = {
+  query: {},
+  body: void 0
+};
+var assertOK = (response, fullUrl) => {
+  if (response.statusCode >= 400) {
+    const defaultErrorMesssage = `Request to ${fullUrl} failed with status: ${response.statusCode}`;
+    const error = new Error(defaultErrorMesssage);
+    error.code = response.statusCode;
+    error.url = fullUrl;
+    throw error;
+  }
+};
+var request = (method, path, options, callback) => {
+  return async (state) => {
+    const apiVersion = "3.0";
+    const { apiKey, server } = state.configuration;
+    const [resolvedMethod, resolvedPath, resolvedOptions] = expandReferences(
+      state,
+      method,
+      path,
+      options
+    );
+    const { query, body } = { ...defaultOptions, ...resolvedOptions };
+    const apiToken = Buffer.from(`openfn:${apiKey}`, "utf-8").toString(
+      "base64"
+    );
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: `Basic ${apiToken}`
+    };
+    const urlPath = `/${apiVersion}${resolvedPath}`;
+    const response = await state.apiClient.request({
+      method: resolvedMethod,
+      path: urlPath,
+      headers,
+      query,
+      body: body ? JSON.stringify(body) : void 0
+    });
+    assertOK(response, `https://${server}.api.mailchimp.com${urlPath}`);
+    const responseBody = await response.body.json();
+    const nextState = {
+      data: responseBody,
+      response: responseBody
+    };
+    if (callback)
+      return callback(nextState);
+    return nextState;
+  };
+};
+var get = (path, query, callback) => request("GET", path, { query }, callback);
+var post = (path, body, query, callback) => request("POST", path, { body, query }, callback);
 
 // src/index.js
 var src_default = Adaptor_exports;
@@ -204,6 +272,7 @@ export {
   field,
   fields,
   fn,
+  get,
   lastReferenceValue,
   listAudienceInfo,
   listAudiences,
@@ -211,6 +280,8 @@ export {
   listMembers,
   md5,
   merge,
+  post,
+  request,
   sourceValue,
   startBatch,
   tagMembers,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/language-mailchimp",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "An OpenFn adaptor for use with Mailchimp",
   "main": "dist/index.cjs",
   "author": "Open Function Group",
@@ -15,17 +15,17 @@
     "@mailchimp/mailchimp_marketing": "^3.0.80",
     "@openfn/language-common": "^1.8.1",
     "axios": "^0.21.2",
-    "md5": "^2.3.0"
+    "md5": "^2.3.0",
+    "undici": "^5.22.1"
   },
   "devDependencies": {
     "@openfn/buildtools": "^1.0.2",
     "@openfn/simple-ast": "0.4.1",
     "assertion-error": "^1.1.0",
-    "chai": "^3.5.0",
+    "chai": "^4.3.6",
     "deep-eql": "^0.1.3",
     "esno": "^0.16.3",
     "mocha": "^7.2.0",
-    "nock": "^12.0.3",
     "rimraf": "^3.0.2"
   },
   "repository": {

package/types/Adaptor.d.ts

@@ -133,6 +133,9 @@ export function listAudiences(query: object, callback?: Function): Operation;
  * @returns {Operation}
  */
 export function listAudienceInfo(query: object, callback?: Function): Operation;
+export function request(method: string, path: string, options: any, callback?: Function): Operation;
+export function get(path: string, query: object, callback?: Function): Operation;
+export function post(path: string, body: object, query: object, callback?: Function): Operation;
 import axios from "axios";
 export { axios, md5 };
 export { fn, alterState, dataPath, dataValue, each, field, fields, lastReferenceValue, merge, sourceValue } from "@openfn/language-common";

package/types/Utils.d.ts

@@ -1 +1,3 @@
 export function handleResponse(response: any, state: any, callback: any): any;
+export function getClient(baseUrl: any): any;
+export function enableMockClient(baseUrl: any): import("undici/types/mock-interceptor").Interceptable;