@openfn/language-dagu 1.1.2 → 1.2.1

package/ast.json

@@ -70,7 +70,13 @@
         "tags": [
           {
             "title": "example",
-            "description": "post(\"Patient/CheckPrescription\", { \"prescriptionRowGuid\": \"3fa85f64-5717-4562-b3fc-2c963f66afa6\" });"
+            "description": "post(\"Patient/CheckPrescription\", { \"prescriptionRowGuid\": \"3fa85f64-5717-4562-b3fc-2c963f66afa6\" });",
+            "caption": "Post JSON body"
+          },
+          {
+            "title": "example",
+            "description": "post(\"Patient/Prescription/History\", { start: 0, length: 10, draw: 1, additionalParameters: { filter: [] } }, { contentType: \"form\" });",
+            "caption": "Post as form data"
           },
           {
             "title": "function",

package/dist/index.cjs

@@ -112,18 +112,22 @@ var request = async (configuration = {}, method, path, options) => {
   const { baseUrl } = configuration;
   if (!access_token)
     access_token = await getAccessToken(configuration, options.headers);
-  const { query = {}, body = {} } = options;
+  const { query = {}, body = {}, contentType, headers = {} } = options;
+  let requestBody = body;
+  let requestHeaders = { ...headers };
+  if (contentType === "form") {
+    requestBody = (0, import_util.encodeFormBody)(body);
+  } else {
+    requestHeaders["content-type"] = "application/json";
+  }
+  requestHeaders["Authorization"] = `Bearer ${access_token}`;
   const opts = {
+    ...options,
     parseAs: "json",
     baseUrl,
-    headers: {
-      "content-type": "application/json",
-      Authorization: `Bearer ${access_token}`,
-      ...options.headers
-    },
-    body,
-    query,
-    ...options
+    headers: requestHeaders,
+    body: requestBody,
+    query
   };
   const safePath = import_node_path.default.join(path);
   return (0, import_util.request)(method, safePath, opts).then(import_util.logResponse);

package/dist/index.js

@@ -35,7 +35,8 @@ import { expandReferences } from "@openfn/language-common/util";
 import { composeNextState } from "@openfn/language-common";
 import {
   request as commonRequest,
-  logResponse
+  logResponse,
+  encodeFormBody
 } from "@openfn/language-common/util";
 import nodepath from "path";
 var access_token;
@@ -69,18 +70,22 @@ var request = async (configuration = {}, method, path, options) => {
   const { baseUrl } = configuration;
   if (!access_token)
     access_token = await getAccessToken(configuration, options.headers);
-  const { query = {}, body = {} } = options;
+  const { query = {}, body = {}, contentType, headers = {} } = options;
+  let requestBody = body;
+  let requestHeaders = { ...headers };
+  if (contentType === "form") {
+    requestBody = encodeFormBody(body);
+  } else {
+    requestHeaders["content-type"] = "application/json";
+  }
+  requestHeaders["Authorization"] = `Bearer ${access_token}`;
   const opts = {
+    ...options,
     parseAs: "json",
     baseUrl,
-    headers: {
-      "content-type": "application/json",
-      Authorization: `Bearer ${access_token}`,
-      ...options.headers
-    },
-    body,
-    query,
-    ...options
+    headers: requestHeaders,
+    body: requestBody,
+    query
   };
   const safePath = nodepath.join(path);
   return commonRequest(method, safePath, opts).then(logResponse);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/language-dagu",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "OpenFn dagu adaptor",
   "type": "module",
   "exports": {
@@ -20,7 +20,7 @@
     "configuration-schema.json"
   ],
   "dependencies": {
-    "@openfn/language-common": "3.2.3"
+    "@openfn/language-common": "3.3.1"
   },
   "devDependencies": {
     "assertion-error": "2.0.0",
@@ -28,7 +28,7 @@
     "deep-eql": "4.1.1",
     "mocha": "^10.7.3",
     "rimraf": "3.0.2",
-    "undici": "^7.19.2"
+    "undici": "^7.24.7"
   },
   "repository": {
     "type": "git",

package/types/Adaptor.d.ts

@@ -10,8 +10,8 @@
  * @typedef {Object} RequestOptions
  * @public
  * @property {object|string} body - body data to append to the request. JSON will be converted to a string (but a content-type header will not be attached to the request).
+ * @property {string} contentType - Set to `'form'` to send the body as multipart FormData instead of JSON. The `content-type` header will be set automatically (including the multipart boundary).
  * @property {object} errors - Map of errorCodes -> error messages, ie, `{ 404: 'Resource not found;' }`. Pass `false` to suppress errors for this code.
- * @property {object} form - Pass a JSON object to be serialised into a multipart HTML form (as FormData) in the body.
  * @property {object} query - An object of query parameters to be encoded into the URL.
  * @property {object} headers - An object of headers to append to the request.
  * @property {string} parseAs - Parse the response body as json, text or stream. By default will use the response headers.
@@ -32,8 +32,10 @@
 export function get(path: string, options: RequestOptions): Operation;
 /**
  * Make a POST request
- * @example
+ * @example <caption>Post JSON body</caption>
  * post("Patient/CheckPrescription", { "prescriptionRowGuid": "3fa85f64-5717-4562-b3fc-2c963f66afa6" });
+ * @example <caption>Post as form data</caption>
+ * post("Patient/Prescription/History", { start: 0, length: 10, draw: 1, additionalParameters: { filter: [] } }, { contentType: "form" });
  * @function
  * @public
  * @param {string} path - Path to resource